diff options
| author | Ray <raysan5@gmail.com> | 2015-07-28 17:38:37 +0200 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2015-07-28 17:38:37 +0200 |
| commit | 8b3a82688e82922819d24494c08e24570c03bdc4 (patch) | |
| tree | 1df1379dfc4948477b664023d2ce0100d83d1783 /examples/models_heightmap.c | |
| parent | a59433e7a3b22d5ded7505689fb44f1927194077 (diff) | |
| parent | 067b884f395b7b6d4c179cb3d58b0d17a02950ec (diff) | |
| download | raylib-8b3a82688e82922819d24494c08e24570c03bdc4.tar.gz raylib-8b3a82688e82922819d24494c08e24570c03bdc4.zip | |
Merge pull request #24 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'examples/models_heightmap.c')
| -rw-r--r-- | examples/models_heightmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/models_heightmap.c b/examples/models_heightmap.c index 7121c261..a23656a5 100644 --- a/examples/models_heightmap.c +++ b/examples/models_heightmap.c @@ -23,13 +23,13 @@ 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 = LoadTextureFromImage(img, false); // Convert image to texture (VRAM) - Model map = LoadHeightmap(img, 4); // Load heightmap model + Image image = LoadImage("resources/heightmap.png"); // Load heightmap image (RAM) + Texture2D texture = LoadTextureFromImage(image); // Convert image to texture (VRAM) + Model map = LoadHeightmap(image, 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 + UnloadImage(image); // Unload heightmap image from RAM, already uploaded to VRAM SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- |