Browse Source

Replaced 3d model example resources

Cat replaced by dwarf
pull/25/head
raysan5 9 years ago
parent
commit
8745d733f9
6 changed files with 54981 additions and 4744 deletions
  1. +15
    -13
      examples/models_obj_loading.c
  2. +0
    -4731
      examples/resources/cat.obj
  3. BIN
      examples/resources/catsham.png
  4. BIN
      examples/resources/catwhite.png
  5. +54966
    -0
      examples/resources/model/dwarf.obj
  6. BIN
      examples/resources/model/dwarf_diffuse.png

+ 15
- 13
examples/models_obj_loading.c View File

@ -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 (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");
// 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
//--------------------------------------------------------------------------------------

+ 0
- 4731
examples/resources/cat.obj
File diff suppressed because it is too large
View File


BIN
examples/resources/catsham.png View File

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

BIN
examples/resources/catwhite.png View File

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

+ 54966
- 0
examples/resources/model/dwarf.obj
File diff suppressed because it is too large
View File


BIN
examples/resources/model/dwarf_diffuse.png View File

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

Loading…
Cancel
Save