diff options
| author | raysan5 <raysan5@gmail.com> | 2013-11-28 19:59:56 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2013-11-28 19:59:56 +0100 |
| commit | e9143b8a8d2eb439b01b94c00518db2b59ffb1e7 (patch) | |
| tree | 8539603494a773f852721da1d6f7b19bca0d8f64 /examples/ex07c_3d_models.c | |
| parent | 818e79638b5ff14fdae9f6a162e596bf119f82c5 (diff) | |
| download | raylib-e9143b8a8d2eb439b01b94c00518db2b59ffb1e7.tar.gz raylib-e9143b8a8d2eb439b01b94c00518db2b59ffb1e7.zip | |
Added some functions and Updated examples
View CHANGELOG for details
Diffstat (limited to 'examples/ex07c_3d_models.c')
| -rw-r--r-- | examples/ex07c_3d_models.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/examples/ex07c_3d_models.c b/examples/ex07c_3d_models.c index 962b71de..158224d1 100644 --- a/examples/ex07c_3d_models.c +++ b/examples/ex07c_3d_models.c @@ -13,12 +13,20 @@ int main() { +<<<<<<< HEAD int screenWidth = 800; int screenHeight = 450; +======= + // Initialization + //-------------------------------------------------------------------------------------- + int screenWidth = 800; + int screenHeight = 450; +>>>>>>> Added some functions and examples update Vector3 position = { 0.0, 0.0, 0.0 }; // Define the camera to look into our 3d world +<<<<<<< HEAD Camera camera = {{ 10.0, 8.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; // Initialization @@ -31,9 +39,22 @@ int main() Model cat = LoadModel("resources/cat.obj"); //---------------------------------------------------------- +======= + Camera camera = {{ 10.0, 8.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; + + InitWindow(screenWidth, screenHeight, "raylib example 07c - 3d models"); + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + + Texture2D texture = LoadTexture("resources/catwhite.png"); + Model cat = LoadModel("resources/cat.obj"); + //-------------------------------------------------------------------------------------- + +>>>>>>> Added some functions and examples update // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { +<<<<<<< HEAD // Update //----------------------------------------------------- if (IsKeyPressed(KEY_LEFT)) position.x -= 0.2; @@ -51,10 +72,30 @@ int main() Begin3dMode(camera); DrawModelEx(cat, texture, position, 0.1f, WHITE); // Draw 3d model with texture +======= + // Update + //---------------------------------------------------------------------------------- + if (IsKeyPressed(KEY_LEFT)) position.x -= 0.2; + if (IsKeyPressed(KEY_RIGHT)) position.x += 0.2; + if (IsKeyPressed(KEY_UP)) position.z -= 0.2; + if (IsKeyPressed(KEY_DOWN)) position.z += 0.2; + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + Begin3dMode(camera); + + DrawModelEx(cat, texture, position, 0.1f, WHITE); // Draw 3d model with texture +>>>>>>> Added some functions and examples update DrawGrid(10.0, 1.0); // Draw a grid DrawGizmo(position, false); +<<<<<<< HEAD End3dMode(); @@ -66,11 +107,30 @@ int main() // De-Initialization //--------------------------------------------------------- +======= + + End3dMode(); + + DrawFPS(10, 10); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- +>>>>>>> Added some functions and examples update UnloadTexture(texture); // Unload texture UnloadModel(cat); // Unload model CloseWindow(); // Close window and OpenGL context //---------------------------------------------------------- +<<<<<<< HEAD +======= + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + +>>>>>>> Added some functions and examples update return 0; }
\ No newline at end of file |