aboutsummaryrefslogtreecommitdiff
path: root/examples/models_heightmap.c
diff options
context:
space:
mode:
authorRay <raysan5@gmail.com>2015-01-08 20:32:30 +0100
committerRay <raysan5@gmail.com>2015-01-08 20:32:30 +0100
commite37ef10595867e4f189fff0f87db5e6fdfcfc4d0 (patch)
tree0410f5604cc3cfc036f6c1f3ac4333ac33726660 /examples/models_heightmap.c
parentfad81f36e4cfd37901caad8555c49c41ac65aaee (diff)
parent4a7e522d4bb376d2277895d1d99eb0382f8bbefb (diff)
downloadraylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.tar.gz
raylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.zip
Merge pull request #14 from raysan5/master
Integrate master into develop branch
Diffstat (limited to 'examples/models_heightmap.c')
-rw-r--r--examples/models_heightmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/models_heightmap.c b/examples/models_heightmap.c
index 6e807b8c..7121c261 100644
--- a/examples/models_heightmap.c
+++ b/examples/models_heightmap.c
@@ -23,11 +23,11 @@ int main()
// Define the camera to look into our 3d world
Camera camera = {{ 10.0, 12.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }};
- Image img = LoadImage("resources/heightmap.png"); // Load heightmap image (RAM)
- Texture2D texture = CreateTexture(img, false); // Convert image to texture (VRAM)
- Model map = LoadHeightmap(img, 4); // Load heightmap model
- SetModelTexture(&map, texture); // Bind texture to model
- Vector3 mapPosition = { -4, 0.0, -4 }; // Set model position
+ Image img = LoadImage("resources/heightmap.png"); // Load heightmap image (RAM)
+ Texture2D texture = LoadTextureFromImage(img, false); // Convert image to texture (VRAM)
+ Model map = LoadHeightmap(img, 4); // Load heightmap model
+ SetModelTexture(&map, texture); // Bind texture to model
+ Vector3 mapPosition = { -4, 0.0, -4 }; // Set model position
UnloadImage(img); // Unload heightmap image from RAM, already uploaded to VRAM