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 diff --git a/examples/ex07b_3d_shapes.c b/examples/ex07b_3d_shapes.c index 14d58354..25a028ed 100644 --- a/examples/ex07b_3d_shapes.c +++ b/examples/ex07b_3d_shapes.c @@ -1,11 +1,11 @@ /******************************************************************************************* * -* raylib example 07b - Draw some basic 3d shapes (cube, sphere, cylinder...) +* raylib example 07b - Draw some basic 3d shapes (cube, sphere, cylinder...) * -* 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,30 +13,14 @@ 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 }; - + 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 - //--------------------------------------------------------- - InitWindow(screenWidth, screenHeight, "raylib example 07b - 3d shapes"); - - 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"); @@ -44,26 +28,9 @@ int main() 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 + while (!WindowShouldClose()) // Detect window close button or ESC key { -<<<<<<< HEAD - // Update - //----------------------------------------------------- - // TODO: Update your variables here - //----------------------------------------------------- - - // Draw - //----------------------------------------------------- - BeginDrawing(); - - ClearBackground(RAYWHITE); - - Begin3dMode(camera); - - DrawCube(position, 2, 2, 2, RED); // Draw a cube -======= // Update //---------------------------------------------------------------------------------- // TODO: Update your variables here @@ -78,7 +45,6 @@ int main() 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 @@ -92,23 +58,6 @@ 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(); - - DrawFps(10, 10); - - EndDrawing(); - //----------------------------------------------------- - } - - // De-Initialization - //--------------------------------------------------------- - CloseWindow(); // Close window and OpenGL context - //---------------------------------------------------------- - -======= DrawGrid(10.0, 1.0); // Draw a grid End3dMode(); @@ -124,6 +73,5 @@ void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, fl CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- ->>>>>>> Added some functions and examples update return 0; } \ No newline at end of file diff --git a/examples/ex07c_3d_models.c b/examples/ex07c_3d_models.c index 158224d1..2da0f507 100644 --- a/examples/ex07c_3d_models.c +++ b/examples/ex07c_3d_models.c @@ -1,11 +1,11 @@ /******************************************************************************************* * -* raylib example 07c - Load and draw a 3d model (OBJ) +* raylib example 07c - Load and draw a 3d model (OBJ) * -* 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,33 +13,14 @@ 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 }; - + 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 - //--------------------------------------------------------- - 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"); - //---------------------------------------------------------- - -======= 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"); @@ -50,29 +31,9 @@ int main() Model cat = LoadModel("resources/cat.obj"); //-------------------------------------------------------------------------------------- ->>>>>>> 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 - //----------------------------------------------------- - 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 -======= // Update //---------------------------------------------------------------------------------- if (IsKeyPressed(KEY_LEFT)) position.x -= 0.2; @@ -90,24 +51,10 @@ int main() 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 + DrawGrid(10.0, 1.0); // Draw a grid DrawGizmo(position, false); -<<<<<<< HEAD - - End3dMode(); - - DrawFps(10, 10); - - EndDrawing(); - //----------------------------------------------------- - } - - // De-Initialization - //--------------------------------------------------------- -======= End3dMode(); @@ -119,18 +66,11 @@ int main() // De-Initialization //-------------------------------------------------------------------------------------- ->>>>>>> Added some functions and examples update UnloadTexture(texture); // Unload texture - UnloadModel(cat); // Unload model + 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 diff --git a/examples/ex08_audio.c b/examples/ex08_audio.c index 7f8df55c..a89f5221 100644 --- a/examples/ex08_audio.c +++ b/examples/ex08_audio.c @@ -1,11 +1,11 @@ /******************************************************************************************* * -* raylib example 08 - Audio loading and playing +* raylib example 08 - Audio loading and playing * -* 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,23 +13,6 @@ int main() { -<<<<<<< HEAD - int screenWidth = 800; - int screenHeight = 450; - - // Initialization - //--------------------------------------------------------- - InitWindow(screenWidth, screenHeight, "raylib example 08 - audio loading and playing"); - - InitAudioDevice(); // Initialize audio device - - Sound fx = LoadSound("resources/coin.wav"); // Load WAV audio file - - bool currentKeyState = false; - bool previousKeyState = currentKeyState; - //---------------------------------------------------------- - -======= // Initialization //-------------------------------------------------------------------------------------- int screenWidth = 800; @@ -42,46 +25,9 @@ int main() Sound fx = LoadSound("resources/coin.wav"); // Load WAV audio file //-------------------------------------------------------------------------------------- ->>>>>>> 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 - //----------------------------------------------------- - currentKeyState = IsKeyPressed(KEY_SPACE); // Check if Space have been pressed - - if (currentKeyState != previousKeyState) - { - if (currentKeyState) PlaySound(fx); // Play the sound! - - previousKeyState = currentKeyState; - } - - //----------------------------------------------------- - - // Draw - //----------------------------------------------------- - BeginDrawing(); - - ClearBackground(RAYWHITE); - - DrawText("Press SPACE to PLAY the SOUND!", 240, 200, 20, 1, LIGHTGRAY); - - EndDrawing(); - //----------------------------------------------------- - } - - // De-Initialization - //--------------------------------------------------------- - UnloadSound(fx); // Unload sound data - - CloseAudioDevice(); // Close audio device - - CloseWindow(); // Close window and OpenGL context - //---------------------------------------------------------- - -======= // Update //---------------------------------------------------------------------------------- if (IsKeyPressed(KEY_SPACE)) PlaySound(fx); // Play the sound! @@ -108,6 +54,5 @@ int main() CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- ->>>>>>> Added some functions and examples update return 0; } \ No newline at end of file