From 6f9d7db4ad8817f944c08de99770a582ac85275f Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 28 Nov 2013 21:13:10 +0100 Subject: Updated --- examples/ex07a_3d_mode.c | 60 ++++-------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) (limited to 'examples/ex07a_3d_mode.c') diff --git a/examples/ex07a_3d_mode.c b/examples/ex07a_3d_mode.c index 8d3923d7..8da1a1b9 100644 --- a/examples/ex07a_3d_mode.c +++ b/examples/ex07a_3d_mode.c @@ -1,11 +1,11 @@ /******************************************************************************************* * -* raylib example 07a - Initialize 3d mode +* raylib example 07a - Initialize 3d mode * -* 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) +* 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) 2013 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2013 Ramon Santamaria (Ray San - raysan@raysanweb.com) * ********************************************************************************************/ @@ -13,20 +13,6 @@ int main() { -<<<<<<< HEAD - 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 }}; - - // Initialization - //--------------------------------------------------------- - InitWindow(screenWidth, screenHeight, "raylib example 07a - 3d mode"); - //---------------------------------------------------------- - -======= // Initialization //-------------------------------------------------------------------------------------- int screenWidth = 800; @@ -39,44 +25,9 @@ int main() 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 + while (!WindowShouldClose()) // Detect window close button or ESC key { -<<<<<<< HEAD - // 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, 1, DARKGRAY); - - DrawFps(); - - EndDrawing(); - //----------------------------------------------------- - } - - // De-Initialization - //--------------------------------------------------------- - CloseWindow(); // Close window and OpenGL context - //---------------------------------------------------------- - -======= // Update //---------------------------------------------------------------------------------- // TODO: Update your variables here @@ -109,6 +60,5 @@ int main() CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- ->>>>>>> Added some functions and examples update return 0; } \ No newline at end of file -- cgit v1.2.3