Merged master fixed conflict.

1 files changed, 15 insertions, 13 deletions

diff --git a/examples/models_obj_loading.c b/examples/models_obj_loading.c
index fd3b6959..55501f65 100644
--- a/examples/models_obj_loading.c
+++ b/examples/models_obj_loading.c
@@ -5,7 +5,7 @@
 *   This example 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)
+*   Copyright (c) 2014 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
@@ -21,12 +21,12 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [models] example - obj model loading");
 
     // Define the camera to look into our 3d world
-    Camera camera = {{ 10.0, 8.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }};
+    Camera camera = {{ 3.0, 3.0, 3.0 }, { 0.0, 1.5, 0.0 }, { 0.0, 1.0, 0.0 }};
 
-    Texture2D texture = LoadTexture("resources/catsham.png");   // Load model texture
-    Model cat = LoadModel("resources/cat.obj");                 // Load OBJ model
-    SetModelTexture(&cat, texture);                             // Bind texture to model
-    Vector3 catPosition = { 0.0, 0.0, 0.0 };                    // Set model position
+    Texture2D texture = LoadTexture("resources/model/dwarf_diffuse.png");   // Load model texture
+    Model dwarf = LoadModel("resources/model/dwarf.obj");                   // Load OBJ model
+    SetModelTexture(&dwarf, texture);                             // Bind texture to model
+    Vector3 position = { 0.0, 0.0, 0.0 };                         // Set model position
 
     SetTargetFPS(60);   // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
@@ -36,10 +36,10 @@ int main()
     {
         // Update
         //----------------------------------------------------------------------------------
-        if (IsKeyDown(KEY_LEFT)) catPosition.x -= 0.2;
-        if (IsKeyDown(KEY_RIGHT)) catPosition.x += 0.2;
-        if (IsKeyDown(KEY_UP)) catPosition.z -= 0.2;
-        if (IsKeyDown(KEY_DOWN)) catPosition.z += 0.2;
+        if (IsKeyDown(KEY_LEFT)) position.x -= 0.2;
+        if (IsKeyDown(KEY_RIGHT)) position.x += 0.2;
+        if (IsKeyDown(KEY_UP)) position.z -= 0.2;
+        if (IsKeyDown(KEY_DOWN)) position.z += 0.2;
         //----------------------------------------------------------------------------------
 
         // Draw
@@ -50,13 +50,15 @@ int main()
 
             Begin3dMode(camera);
 
-                DrawModel(cat, catPosition, 0.1f, WHITE);   // Draw 3d model with texture
+                DrawModel(dwarf, position, 2.0f, WHITE);   // Draw 3d model with texture
 
                 DrawGrid(10.0, 1.0);        // Draw a grid
 
-                DrawGizmo(catPosition);     // Draw gizmo
+                DrawGizmo(position);     // Draw gizmo
 
             End3dMode();
+            
+            DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
 
             DrawFPS(10, 10);
 
@@ -67,7 +69,7 @@ int main()
     // De-Initialization
     //--------------------------------------------------------------------------------------
     UnloadTexture(texture);     // Unload texture
-    UnloadModel(cat);           // Unload model
+    UnloadModel(dwarf);         // Unload model
 
     CloseWindow();              // Close window and OpenGL context
     //--------------------------------------------------------------------------------------