Updated examples

8 files changed, 85 insertions, 68 deletions

diff --git a/examples/src/models/models_billboard.c b/examples/src/models/models_billboard.c
index bca9faf..8ce6a44 100644
--- a/examples/src/models/models_billboard.c
+++ b/examples/src/models/models_billboard.c
@@ -21,7 +21,13 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - drawing billboards");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 5.0f, 4.0f, 5.0f }, { 0.0f, 2.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = { 0 };
+    camera.position = (Vector3){ 5.0f, 4.0f, 5.0f };
+    camera.target = (Vector3){ 0.0f, 2.0f, 0.0f };
+    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };
+    camera.fovy = 45.0f;
+    camera.type = CAMERA_PERSPECTIVE;
+    
 
     Texture2D bill = LoadTexture("resources/billboard.png");     // Our texture billboard
     Vector3 billPosition = { 0.0f, 2.0f, 0.0f };                 // Position where draw billboard
@@ -45,13 +51,13 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
             
                 DrawBillboard(camera, bill, billPosition, 2.0f, WHITE);
                 
                 DrawGrid(10, 1.0f);        // Draw a grid
 
-            End3dMode();
+            EndMode3D();
 
             DrawFPS(10, 10);
 
diff --git a/examples/src/models/models_box_collisions.c b/examples/src/models/models_box_collisions.c
index 69cec41..41f6056 100644
--- a/examples/src/models/models_box_collisions.c
+++ b/examples/src/models/models_box_collisions.c
@@ -21,7 +21,7 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - box collisions");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 0.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = {{ 0.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
     
     Vector3 playerPosition = { 0.0f, 1.0f, 2.0f };
     Vector3 playerSize = { 1.0f, 2.0f, 1.0f };
@@ -87,7 +87,7 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 // Draw enemy-box
                 DrawCube(enemyBoxPos, enemyBoxSize.x, enemyBoxSize.y, enemyBoxSize.z, GRAY);
@@ -102,7 +102,7 @@ int main()
 
                 DrawGrid(10, 1.0f);        // Draw a grid
 
-            End3dMode();
+            EndMode3D();
             
             DrawText("Move player with cursors to collide", 220, 40, 20, GRAY);
 
diff --git a/examples/src/models/models_cubicmap.c b/examples/src/models/models_cubicmap.c
index d8be932..c8d62c4 100644
--- a/examples/src/models/models_cubicmap.c
+++ b/examples/src/models/models_cubicmap.c
@@ -21,7 +21,7 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - cubesmap loading and drawing");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 16.0f, 14.0f, 16.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = {{ 16.0f, 14.0f, 16.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
 
     Image image = LoadImage("resources/cubicmap.png");      // Load cubicmap image (RAM)
     Texture2D cubicmap = LoadTextureFromImage(image);       // Convert image to texture to display (VRAM)
@@ -56,11 +56,11 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 DrawModel(model, mapPosition, 1.0f, WHITE);
 
-            End3dMode();
+            EndMode3D();
             
             DrawTextureEx(cubicmap, (Vector2){ screenWidth - cubicmap.width*4 - 20, 20 }, 0.0f, 4.0f, WHITE);
             DrawRectangleLines(screenWidth - cubicmap.width*4 - 20, 20, cubicmap.width*4, cubicmap.height*4, GREEN);
diff --git a/examples/src/models/models_geometric_shapes.c b/examples/src/models/models_geometric_shapes.c
index a13a1f3..82ca4c6 100644
--- a/examples/src/models/models_geometric_shapes.c
+++ b/examples/src/models/models_geometric_shapes.c
@@ -21,7 +21,12 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - geometric shapes");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 0.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = { 0 };
+    camera.position = (Vector3){ 0.0f, 10.0f, 10.0f };
+    camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };
+    camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };
+    camera.fovy = 45.0f;
+    camera.type = CAMERA_PERSPECTIVE;
 
     SetTargetFPS(60);   // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -40,7 +45,7 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 DrawCube((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, RED);
                 DrawCubeWires((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, GOLD);
@@ -58,7 +63,7 @@ int main()
 
                 DrawGrid(10, 1.0f);        // Draw a grid
 
-            End3dMode();
+            EndMode3D();
 
             DrawFPS(10, 10);
 
diff --git a/examples/src/models/models_heightmap.c b/examples/src/models/models_heightmap.c
index e476d1b..d131b12 100644
--- a/examples/src/models/models_heightmap.c
+++ b/examples/src/models/models_heightmap.c
@@ -21,7 +21,7 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - heightmap loading and drawing");
 
     // Define our custom camera to look into our 3d world
-    Camera camera = {{ 18.0f, 16.0f, 18.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = {{ 18.0f, 16.0f, 18.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
 
     Image image = LoadImage("resources/heightmap.png");             // Load heightmap image (RAM)
     Texture2D texture = LoadTextureFromImage(image);                // Convert image to texture (VRAM)
@@ -53,13 +53,13 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 DrawModel(model, mapPosition, 1.0f, RED);
 
                 DrawGrid(20, 1.0f);
 
-            End3dMode();
+            EndMode3D();
             
             DrawTexture(texture, screenWidth - texture.width - 20, 20, WHITE);
             DrawRectangleLines(screenWidth - texture.width - 20, 20, texture.width, texture.height, GREEN);
diff --git a/examples/src/models/models_mesh_generation.c b/examples/src/models/models_mesh_generation.c
index 7222215..c02bd91 100644
--- a/examples/src/models/models_mesh_generation.c
+++ b/examples/src/models/models_mesh_generation.c
@@ -41,7 +41,7 @@ int main()
     for (int i = 0; i < NUM_MODELS; i++) models[i].material.maps[MAP_DIFFUSE].texture = texture;
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 5.0f, 5.0f, 5.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = {{ 5.0f, 5.0f, 5.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
 
     // Model drawing position
     Vector3 position = { 0.0f, 0.0f, 0.0f };
@@ -72,13 +72,13 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 DrawModel(models[currentModel], position, 1.0f, WHITE);
 
                 DrawGrid(10, 1.0);
 
-            End3dMode();
+            EndMode3D();
             
             DrawRectangle(30, 400, 310, 30, Fade(SKYBLUE, 0.5f));
             DrawRectangleLines(30, 400, 310, 30, Fade(DARKBLUE, 0.5f));
diff --git a/examples/src/models/models_skybox.c b/examples/src/models/models_skybox.c
index 46297e4..6f6002b 100644
--- a/examples/src/models/models_skybox.c
+++ b/examples/src/models/models_skybox.c
@@ -21,7 +21,7 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - skybox loading and drawing");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 1.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f };
+    Camera camera = {{ 1.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f, 0 };
 
     // Load skybox model   
     Mesh cube = GenMeshCube(1.0f, 1.0f, 1.0f);
@@ -36,12 +36,17 @@ int main()
     Shader shdrCubemap = LoadShader("resources/shaders/cubemap.vs", "resources/shaders/cubemap.fs");
     SetShaderValuei(shdrCubemap, GetShaderLocation(shdrCubemap, "equirectangularMap"), (int[1]){ 0 }, 1);
     
-    Texture2D texHDR = LoadTexture("resources/pinetree.hdr");
+    // Load HDR panorama (sphere) texture
+    Texture2D texHDR = LoadTexture("resources/dresden_square.hdr");
+    
+    // Generate cubemap (texture with 6 quads-cube-mapping) from panorama HDR texture
+    // NOTE: New texture is generated rendering to texture, shader computes the sphre->cube coordinates mapping
     skybox.material.maps[MAP_CUBEMAP].texture = GenTextureCubemap(shdrCubemap, texHDR, 512);
     
-    UnloadShader(shdrCubemap);  // Cubemap generation shader not required any more
+    UnloadTexture(texHDR);      // Texture not required anymore, cubemap already generated
+    UnloadShader(shdrCubemap);  // Unload cubemap generation shader, not required anymore
     
-    SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode
+    SetCameraMode(camera, CAMERA_FIRST_PERSON);  // Set a first person camera mode
 
     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -60,13 +65,13 @@ int main()
 
             ClearBackground(RAYWHITE);
 
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
-                DrawModel(skybox, Vector3Zero(), 1.0f, WHITE);
+                DrawModel(skybox, (Vector3){0, 0, 0}, 1.0f, WHITE);
                 
                 DrawGrid(10, 1.0f);
 
-            End3dMode();
+            EndMode3D();
 
             DrawFPS(10, 10);
 
@@ -76,7 +81,7 @@ int main()
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    UnloadModel(skybox);        // Unload skybox model
+    UnloadModel(skybox);        // Unload skybox model (and textures)
 
     CloseWindow();              // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
diff --git a/examples/src/models/models_yaw_pitch_roll.c b/examples/src/models/models_yaw_pitch_roll.c
index 2bae2bf..0dcf8c7 100644
--- a/examples/src/models/models_yaw_pitch_roll.c
+++ b/examples/src/models/models_yaw_pitch_roll.c
@@ -5,7 +5,7 @@
 *   This example has been created using raylib 1.8 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Example based on Berni work on Raspberry Pi: 
+*   Example based on Berni work on Raspberry Pi:
 *   http://forum.raylib.com/index.php?p=/discussion/124/line-versus-triangle-drawing-order
 *
 *   Copyright (c) 2017 Ramon Santamaria (@raysan5)
@@ -30,25 +30,26 @@ int main()
 
     InitWindow(screenWidth, screenHeight, "raylib [models] example - plane rotations (yaw, pitch, roll)");
 
-    Texture2D texAngleGauge = LoadTexture("resources/angle_gauge.png"); 
+    Texture2D texAngleGauge = LoadTexture("resources/angle_gauge.png");
     Texture2D texBackground = LoadTexture("resources/background.png");
-    Texture2D texPitch = LoadTexture("resources/pitch.png");   
+    Texture2D texPitch = LoadTexture("resources/pitch.png");
     Texture2D texPlane = LoadTexture("resources/plane.png");
 
     RenderTexture2D framebuffer = LoadRenderTexture(192, 192);
-    
+
     // Model loading
     Model model = LoadModel("resources/plane.obj");      // Load OBJ model
     model.material.maps[MAP_DIFFUSE].texture = LoadTexture("resources/plane_diffuse.png"); // Set map diffuse texture
-    
+
     GenTextureMipmaps(&model.material.maps[MAP_DIFFUSE].texture);
-    
+
     Camera camera = { 0 };
     camera.position = (Vector3){ 0.0f, 60.0f, -120.0f };// Camera position perspective
     camera.target = (Vector3){ 0.0f, 12.0f, 0.0f };     // Camera looking at point
     camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
     camera.fovy = 30.0f;                                // Camera field-of-view Y
-    
+    camera.type = CAMERA_PERSPECTIVE;                   // Camera type
+
     float pitch = 0.0f;
     float roll = 0.0f;
     float yaw = 0.0f;
@@ -61,7 +62,7 @@ int main()
     {
         // Update
         //----------------------------------------------------------------------------------
-        
+
         // Plane roll (x-axis) controls
         if (IsKeyDown(KEY_LEFT)) roll += 1.0f;
         else if (IsKeyDown(KEY_RIGHT)) roll -= 1.0f;
@@ -70,7 +71,7 @@ int main()
             if (roll > 0.0f) roll -= 0.5f;
             else if (roll < 0.0f) roll += 0.5f;
         }
-        
+
         // Plane yaw (y-axis) controls
         if (IsKeyDown(KEY_S)) yaw += 1.0f;
         else if (IsKeyDown(KEY_A)) yaw -= 1.0f;
@@ -79,7 +80,7 @@ int main()
             if (yaw > 0.0f) yaw -= 0.5f;
             else if (yaw < 0.0f) yaw += 0.5f;
         }
-        
+
         // Plane pitch (z-axis) controls
         if (IsKeyDown(KEY_DOWN)) pitch += 0.6f;
         else if (IsKeyDown(KEY_UP)) pitch -= 0.6f;
@@ -88,7 +89,7 @@ int main()
             if (pitch > 0.3f) pitch -= 0.3f;
             else if (pitch < -0.3f) pitch += 0.3f;
         }
-        
+
         // Wraps the phase of an angle to fit between -180 and +180 degrees
         int pitchOffset = pitch;
         while (pitchOffset > 180) pitchOffset -= 360;
@@ -96,20 +97,20 @@ int main()
         pitchOffset *= 10;
 
         Matrix transform = MatrixIdentity();
-    
+
         transform = MatrixMultiply(transform, MatrixRotateZ(DEG2RAD*roll));
         transform = MatrixMultiply(transform, MatrixRotateX(DEG2RAD*pitch));
         transform = MatrixMultiply(transform, MatrixRotateY(DEG2RAD*yaw));
-        
+
         model.transform = transform;
         //----------------------------------------------------------------------------------
 
         // Draw
         //----------------------------------------------------------------------------------
         BeginDrawing();
-        
+
             ClearBackground(RAYWHITE);
-        
+
             // Draw framebuffer texture (Ahrs Display)
             int centerX = framebuffer.texture.width/2;
             int centerY = framebuffer.texture.height/2;
@@ -119,35 +120,35 @@ int main()
 
                 BeginBlendMode(BLEND_ALPHA);
 
-                DrawTexturePro(texBackground, (Rectangle){0,0,texBackground.width, texBackground.height},
+                DrawTexturePro(texBackground, (Rectangle){ 0, 0, texBackground.width, texBackground.height },
                                (Rectangle){ centerX, centerY, texBackground.width*scaleFactor, texBackground.height*scaleFactor},
-                               (Vector2){texBackground.width/2*scaleFactor, texBackground.height/2*scaleFactor + pitchOffset*scaleFactor}, roll, WHITE);
+                               (Vector2){ texBackground.width/2*scaleFactor, texBackground.height/2*scaleFactor + pitchOffset*scaleFactor }, roll, WHITE);
 
                 DrawTexturePro(texPitch, (Rectangle){ 0, 0, texPitch.width, texPitch.height },
                                (Rectangle){ centerX, centerY, texPitch.width*scaleFactor, texPitch.height*scaleFactor },
                                (Vector2){ texPitch.width/2*scaleFactor, texPitch.height/2*scaleFactor + pitchOffset*scaleFactor }, roll, WHITE);
-            
-                DrawTexturePro(texPlane, (Rectangle){0,0,texPlane.width, texPlane.height },
-                               (Rectangle){ centerX, centerY, texPlane.width*scaleFactor, texPlane.height*scaleFactor }, 
-                               (Vector2){texPlane.width/2*scaleFactor, texPlane.height/2*scaleFactor }, 0, WHITE);
-                                
+
+                DrawTexturePro(texPlane, (Rectangle){ 0, 0, texPlane.width, texPlane.height },
+                               (Rectangle){ centerX, centerY, texPlane.width*scaleFactor, texPlane.height*scaleFactor },
+                               (Vector2){ texPlane.width/2*scaleFactor, texPlane.height/2*scaleFactor }, 0, WHITE);
+
                 EndBlendMode();
 
             EndTextureMode();
 
             // Draw 3D model (recomended to draw 3D always before 2D)
-            Begin3dMode(camera);
+            BeginMode3D(camera);
 
                 DrawModel(model, (Vector3){ 0, 6.0f, 0 }, 1.0f, WHITE);   // Draw 3d model with texture
                 DrawGrid(10, 10.0f);
 
-            End3dMode();
+            EndMode3D();
 
             // Draw 2D GUI stuff
-            DrawAngleGauge(texAngleGauge, 80, 80, roll, "roll", RED);
-            DrawAngleGauge(texAngleGauge, 190, 80, pitch, "pitch", GREEN);
-            DrawAngleGauge(texAngleGauge, 300, 80, yaw, "yaw", SKYBLUE);
-            
+            DrawAngleGauge(texAngleGauge, 80, 70, roll, "roll", RED);
+            DrawAngleGauge(texAngleGauge, 190, 70, pitch, "pitch", GREEN);
+            DrawAngleGauge(texAngleGauge, 300, 70, yaw, "yaw", SKYBLUE);
+
             DrawRectangle(30, 360, 260, 70, Fade(SKYBLUE, 0.5f));
             DrawRectangleLines(30, 360, 260, 70, Fade(DARKBLUE, 0.5f));
             DrawText("Pitch controlled with: KEY_UP / KEY_DOWN", 40, 370, 10, DARKGRAY);
@@ -155,31 +156,31 @@ int main()
             DrawText("Yaw controlled with: KEY_A / KEY_S", 40, 410, 10, DARKGRAY);
 
             // Draw framebuffer texture
-            DrawTextureRec(framebuffer.texture, (Rectangle){ 0, 0, framebuffer.texture.width, -framebuffer.texture.height }, 
+            DrawTextureRec(framebuffer.texture, (Rectangle){ 0, 0, framebuffer.texture.width, -framebuffer.texture.height },
                            (Vector2){ screenWidth - framebuffer.texture.width - 20, 20 }, Fade(WHITE, 0.8f));
-            
+
             DrawRectangleLines(screenWidth - framebuffer.texture.width - 20, 20, framebuffer.texture.width, framebuffer.texture.height, DARKGRAY);
-        
+
         EndDrawing();
         //----------------------------------------------------------------------------------
     }
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
-    
+
     // Unload all loaded data
     UnloadModel(model);
-    
+
     UnloadRenderTexture(framebuffer);
-    
-    UnloadTexture(texAngleGauge); 
+
+    UnloadTexture(texAngleGauge);
     UnloadTexture(texBackground);
-    UnloadTexture(texPitch);  
+    UnloadTexture(texPitch);
     UnloadTexture(texPlane);
-    
+
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-    
+
     return 0;
 }
 
@@ -192,7 +193,7 @@ void DrawAngleGauge(Texture2D angleGauge, int x, int y, float angle, char title[
     int textSize = 20;
 
     DrawTexturePro(angleGauge, srcRec, dstRec, origin, angle, color);
-  
-    DrawText(FormatText("%5.1f�", angle), x - MeasureText(FormatText("%5.1f�", angle), textSize) / 2, y + 10, textSize, DARKGRAY); 
-    DrawText(title, x - MeasureText(title, textSize) / 2, y + 60, textSize, DARKGRAY);  
-}
\ No newline at end of file
+
+    DrawText(FormatText("%5.1f", angle), x - MeasureText(FormatText("%5.1f", angle), textSize) / 2, y + 10, textSize, DARKGRAY);
+    DrawText(title, x - MeasureText(title, textSize) / 2, y + 60, textSize, DARKGRAY);
+}