Skip to content

Commit

Permalink
Review OBJ loading example
Browse files Browse the repository at this point in the history
Replaced old dwarf model
  • Loading branch information
raysan5 committed Jun 21, 2018
1 parent 1ff8947 commit 1630597
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions examples/models/models_obj_loading.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ int main()

// Define the camera to look into our 3d world
Camera camera = { 0 };
camera.position = (Vector3){ 3.0f, 3.0f, 3.0f }; // Camera position
camera.target = (Vector3){ 0.0f, 1.5f, 0.0f }; // Camera looking at point
camera.position = (Vector3){ 8.0f, 8.0f, 8.0f }; // Camera position
camera.target = (Vector3){ 0.0f, 2.5f, 0.0f }; // Camera looking at point
camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target)
camera.fovy = 45.0f; // Camera field-of-view Y
camera.type = CAMERA_PERSPECTIVE; // Camera mode type

Model dwarf = LoadModel("resources/model/dwarf.obj"); // Load OBJ model
Texture2D texture = LoadTexture("resources/model/dwarf_diffuse.png"); // Load model texture
Model dwarf = LoadModel("resources/medieval/castle.obj"); // Load OBJ model
Texture2D texture = LoadTexture("resources/medieval/castle_diffuse.png"); // Load model texture
dwarf.material.maps[MAP_DIFFUSE].texture = texture; // Set map diffuse texture
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position

Expand All @@ -52,15 +52,15 @@ int main()

BeginMode3D(camera);

DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
DrawModel(dwarf, position, 0.2f, WHITE); // Draw 3d model with texture

DrawGrid(10, 1.0f); // Draw a grid

DrawGizmo(position); // Draw gizmo

EndMode3D();

DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
DrawText("(c) Castle 3D model by Alberto Cano", screenWidth - 200, screenHeight - 20, 10, GRAY);

DrawFPS(10, 10);

Expand Down
Binary file modified examples/models/models_obj_loading.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1630597

Please sign in to comment.