diff options
Diffstat (limited to 'examples/ex07a_3d_mode.c')
| -rw-r--r-- | examples/ex07a_3d_mode.c | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/examples/ex07a_3d_mode.c b/examples/ex07a_3d_mode.c index eb79a8b5..8d3923d7 100644 --- a/examples/ex07a_3d_mode.c +++ b/examples/ex07a_3d_mode.c @@ -13,6 +13,7 @@ int main() { +<<<<<<< HEAD int screenWidth = 800; int screenHeight = 450; @@ -25,9 +26,24 @@ int main() InitWindow(screenWidth, screenHeight, "raylib example 07a - 3d mode"); //---------------------------------------------------------- +======= + // Initialization + //-------------------------------------------------------------------------------------- + int screenWidth = 800; + int screenHeight = 450; + + Vector3 position = { 0.0, 0.0, 0.0 }; + + Camera camera = {{ 0.0, 10.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; + + InitWindow(screenWidth, screenHeight, "raylib example 07a - 3d mode"); + //-------------------------------------------------------------------------------------- + +>>>>>>> Added some functions and examples update // Main game loop while (!WindowShouldClose()) // Detect window close button or ESC key { +<<<<<<< HEAD // Update //----------------------------------------------------- // TODO: Update your variables here @@ -60,5 +76,39 @@ int main() CloseWindow(); // Close window and OpenGL context //---------------------------------------------------------- +======= + // Update + //---------------------------------------------------------------------------------- + // TODO: Update your variables here + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(WHITE); + + Begin3dMode(camera); + + DrawCube(position, 2, 2, 2, RED); + + DrawGrid(10.0, 1.0); + + End3dMode(); + + DrawText("Welcome to the third dimension!", 10, 40, 20, DARKGRAY); + + DrawFPS(10, 10); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + +>>>>>>> Added some functions and examples update return 0; }
\ No newline at end of file |