瀏覽代碼

Replaced 3d model example resources

Cat replaced by dwarf
pull/25/head
raysan5 9 年之前
父節點
當前提交
8745d733f9
共有 6 個文件被更改,包括 54981 次插入4744 次删除
  1. +15
    -13
      examples/models_obj_loading.c
  2. +0
    -4731
      examples/resources/cat.obj
  3. 二進制
      examples/resources/catsham.png
  4. 二進制
      examples/resources/catwhite.png
  5. +54966
    -0
      examples/resources/model/dwarf.obj
  6. 二進制
      examples/resources/model/dwarf_diffuse.png

+ 15
- 13
examples/models_obj_loading.c 查看文件

@ -5,7 +5,7 @@
* This example has been created using raylib 1.0 (www.raylib.com) * 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) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
* *
* Copyright (c) 2014 Ramon Santamaria (n">Ray San - raysan@raysanweb.com)
* Copyright (c) 2014 Ramon Santamaria (err">@raysan5)
* *
********************************************************************************************/ ********************************************************************************************/
@ -21,12 +21,12 @@ int main()
InitWindow(screenWidth, screenHeight, "raylib [models] example - obj model loading"); InitWindow(screenWidth, screenHeight, "raylib [models] example - obj model loading");
// Define the camera to look into our 3d world // 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 SetTargetFPS(60); // Set our game to run at 60 frames-per-second
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -36,10 +36,10 @@ int main()
{ {
// Update // 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 // Draw
@ -50,13 +50,15 @@ int main()
Begin3dMode(camera); 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 DrawGrid(10.0, 1.0); // Draw a grid
DrawGizmo(catPosition); // Draw gizmo
DrawGizmo(position); // Draw gizmo
End3dMode(); End3dMode();
DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
DrawFPS(10, 10); DrawFPS(10, 10);
@ -67,7 +69,7 @@ int main()
// De-Initialization // De-Initialization
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
UnloadTexture(texture); // Unload texture UnloadTexture(texture); // Unload texture
UnloadModel(cat); // Unload model
UnloadModel(dwarf); // Unload model
CloseWindow(); // Close window and OpenGL context CloseWindow(); // Close window and OpenGL context
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------

+ 0
- 4731
examples/resources/cat.obj
文件差異過大導致無法顯示
查看文件


二進制
examples/resources/catsham.png 查看文件

Before After
Width: 512  |  Height: 512  |  Size: 308 KiB

二進制
examples/resources/catwhite.png 查看文件

Before After
Width: 512  |  Height: 512  |  Size: 302 KiB

+ 54966
- 0
examples/resources/model/dwarf.obj
文件差異過大導致無法顯示
查看文件


二進制
examples/resources/model/dwarf_diffuse.png 查看文件

Before After
Width: 2048  |  Height: 2048  |  Size: 1.2 MiB

Loading…
取消
儲存