From 0b03431c95c3c348aa686c1a3df68a51bd7761a6 Mon Sep 17 00:00:00 2001
From: raysan5 <raysan5@gmail.com>
Date: Wed, 23 Jul 2014 00:06:24 +0200
Subject: Update to version 1.1.1

Check CHANGELOG for a detailed list of changes
---
 tests/resources/cubesmap.png | Bin 0 -> 173 bytes
 tests/test_cubesmap.c        |  83 +++++++++++++++++++++++++++++++++++++++++++
 tests/test_heightmap.c       |   8 ++---
 3 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 tests/resources/cubesmap.png
 create mode 100644 tests/test_cubesmap.c

(limited to 'tests')

diff --git a/tests/resources/cubesmap.png b/tests/resources/cubesmap.png
new file mode 100644
index 00000000..87b95d50
Binary files /dev/null and b/tests/resources/cubesmap.png differ
diff --git a/tests/test_cubesmap.c b/tests/test_cubesmap.c
new file mode 100644
index 00000000..a44abbbc
--- /dev/null
+++ b/tests/test_cubesmap.c
@@ -0,0 +1,83 @@
+/*******************************************************************************************
+*
+*   raylib test - Testing Heightmap Loading and Drawing
+*
+*   This test has been created using raylib 1.0 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
+*
+********************************************************************************************/
+
+#include "../raylib.h"
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    Vector3 position = { 0.5, 0.0, 0.5 };
+    
+    // Define the camera to look into our 3d world
+    Camera camera = {{ 7.0, 6.0, 7.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }};
+    
+    InitWindow(screenWidth, screenHeight, "raylib test - Heightmap loading and drawing");
+    
+    Image img = LoadImage("resources/cubesmap.png");
+    Model map = LoadCubesmap(img);
+    Texture2D texture = CreateTexture(img, false);
+    UnloadImage(img);
+    
+    SetModelTexture(&map, texture);  
+    
+    SetTargetFPS(60);   // Set our game to run at 60 frames-per-second
+    //--------------------------------------------------------------------------------------
+    
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        if (IsKeyDown(KEY_UP)) camera.position.y += 0.2f;
+        else if (IsKeyDown(KEY_DOWN)) camera.position.y -= 0.2f;
+        
+        if (IsKeyDown(KEY_RIGHT)) camera.position.z += 0.2f;
+        else if (IsKeyDown(KEY_LEFT)) camera.position.z -= 0.2f;
+        //----------------------------------------------------------------------------------
+        
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+        
+            ClearBackground(RAYWHITE);
+            
+            Begin3dMode(camera);
+            
+                //DrawCube(position, 1.0f, 1.0f, 1.0f, RED);
+            
+                DrawModel(map, position, 1.0f, MAROON);
+                
+                DrawGrid(10.0, 1.0);        // Draw a grid
+                
+                DrawGizmo(position); 
+                
+            End3dMode();
+            
+            DrawFPS(10, 10);
+        
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    UnloadTexture(texture);     // Unload texture
+    UnloadModel(map);       // Unload model
+    
+    CloseWindow();          // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+    
+    return 0;
+}
\ No newline at end of file
diff --git a/tests/test_heightmap.c b/tests/test_heightmap.c
index 2da5e432..d0193637 100644
--- a/tests/test_heightmap.c
+++ b/tests/test_heightmap.c
@@ -30,7 +30,7 @@ int main()
     Texture2D texture = CreateTexture(img, false);
     UnloadImage(img);
     
-    SetModelTexture(&map, texture);  
+    SetModelTexture(&map, texture);
     
     SetTargetFPS(60);   // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -51,11 +51,11 @@ int main()
             
             Begin3dMode(camera);
             
-                DrawModel(map, position, 0.5f, MAROON);   
+                DrawModel(map, position, 0.5f, MAROON);
                 
                 DrawGrid(10.0, 1.0);        // Draw a grid
                 
-                DrawGizmo(position, false); 
+                DrawGizmo(position); 
                 
             End3dMode();
             
@@ -67,7 +67,7 @@ int main()
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    UnloadTexture(tex);     // Unload texture
+    UnloadTexture(texture); // Unload texture
     UnloadModel(map);       // Unload model
     
     CloseWindow();          // Close window and OpenGL context
-- 
cgit v1.2.3