diff options
Diffstat (limited to 'examples/ex07b_3d_shapes.c')
| -rw-r--r-- | examples/ex07b_3d_shapes.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/examples/ex07b_3d_shapes.c b/examples/ex07b_3d_shapes.c index 6501659d..14d58354 100644 --- a/examples/ex07b_3d_shapes.c +++ b/examples/ex07b_3d_shapes.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 = {{ 0.0, 10.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; // Initialization @@ -28,9 +36,19 @@ int main() SetTargetFPS(60); // Set our game to run at 60 frames-per-second //---------------------------------------------------------- +======= + 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 07b - 3d shapes"); + + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + //-------------------------------------------------------------------------------------- + +>>>>>>> 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 @@ -45,6 +63,22 @@ int main() Begin3dMode(camera); DrawCube(position, 2, 2, 2, RED); // Draw a cube +======= + // Update + //---------------------------------------------------------------------------------- + // TODO: Update your variables here + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + Begin3dMode(camera); + + DrawCube(position, 2, 2, 2, RED); // Draw a cube +>>>>>>> Added some functions and examples update DrawCubeWires(position, 2, 2, 2, MAROON); // Draw a wired-cube // TODO: Draw some basic 3d shapes @@ -58,6 +92,7 @@ void DrawSphereWires(Vector3 centerPos, float radius, Color color); void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color); void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color); */ +<<<<<<< HEAD DrawGrid(10.0, 1.0); // Draw a grid End3dMode(); @@ -73,5 +108,22 @@ void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, fl CloseWindow(); // Close window and OpenGL context //---------------------------------------------------------- +======= + DrawGrid(10.0, 1.0); // Draw a grid + + End3dMode(); + + 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 |