mirror of
				https://github.com/raysan5/raylib.git
				synced 2025-11-04 01:34:19 +00:00 
			
		
		
		
	Replaced 3d model example resources
Cat replaced by dwarf
This commit is contained in:
		@@ -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
 | 
			
		||||
    //--------------------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 308 KiB  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 302 KiB  | 
							
								
								
									
										54966
									
								
								examples/resources/model/dwarf.obj
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54966
									
								
								examples/resources/model/dwarf.obj
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								examples/resources/model/dwarf_diffuse.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								examples/resources/model/dwarf_diffuse.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 1.2 MiB  | 
		Reference in New Issue
	
	Block a user