diff --git a/examples/audio_sound_loading.c b/examples/audio_sound_loading.c index 359af0aff..1376a27d2 100644 --- a/examples/audio_sound_loading.c +++ b/examples/audio_sound_loading.c @@ -7,7 +7,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_3d_mode.c b/examples/core_3d_mode.c index 2275058d4..c38da256b 100644 --- a/examples/core_3d_mode.c +++ b/examples/core_3d_mode.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_basic_window_web.c b/examples/core_basic_window_web.c index b35c07e67..65650b1aa 100644 --- a/examples/core_basic_window_web.c +++ b/examples/core_basic_window_web.c @@ -15,7 +15,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_color_select.c b/examples/core_color_select.c index a2a79ed98..118dc88a9 100644 --- a/examples/core_color_select.c +++ b/examples/core_color_select.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_input_gamepad.c b/examples/core_input_gamepad.c index 384ef989e..64be4cd84 100644 --- a/examples/core_input_gamepad.c +++ b/examples/core_input_gamepad.c @@ -8,7 +8,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_input_keys.c b/examples/core_input_keys.c index 442ae8408..99d5e5160 100644 --- a/examples/core_input_keys.c +++ b/examples/core_input_keys.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_input_mouse.c b/examples/core_input_mouse.c index eeef8c7ab..c64b421e3 100644 --- a/examples/core_input_mouse.c +++ b/examples/core_input_mouse.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_mouse_wheel.c b/examples/core_mouse_wheel.c index 08c2ee1e2..6a5252ee5 100644 --- a/examples/core_mouse_wheel.c +++ b/examples/core_mouse_wheel.c @@ -5,7 +5,7 @@ * This test has been created using raylib 1.1 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/core_random_values.c b/examples/core_random_values.c index 20989ee19..98e0e91ef 100644 --- a/examples/core_random_values.c +++ b/examples/core_random_values.c @@ -5,7 +5,7 @@ * This example has been created using raylib 1.1 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/models_custom_shader.c b/examples/models_custom_shader.c deleted file mode 100644 index 5430ed65a..000000000 --- a/examples/models_custom_shader.c +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************************* -* -* raylib [models] example - 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) -* -* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) -* -********************************************************************************************/ - -#include "raylib.h" - -int main() -{ - // Initialization - //-------------------------------------------------------------------------------------- - int screenWidth = 1280; - int screenHeight = 720; - - InitWindow(screenWidth, screenHeight, "raylib [models] example - custom shader"); - - // Define the camera to look into our 3d world - Camera camera = {{ 10.0, 8.0, 10.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }}; - - Texture2D texture = LoadTexture("resources/catsham.png"); // Load model texture - Shader shader = LoadShader("resources/shaders/custom.vs", "resources/shaders/custom.fs"); - //Shader poste = LoadShader("resources/shaders/custom.vs", "resources/shaders/pixel.fs"); - - Model cat = LoadModel("resources/cat.obj"); // Load OBJ model - - SetModelTexture(&cat, texture); // Bind texture to model - //SetModelShader(&cat, poste); - - Vector3 catPosition = { 0.0, 0.0, 0.0 }; // Set model position - - SetPostproShader(shader); - - SetTargetFPS(60); // Set our game to run at 60 frames-per-second - //-------------------------------------------------------------------------------------- - - // Main game loop - while (!WindowShouldClose()) // Detect window close button or ESC key - { - // Update - //---------------------------------------------------------------------------------- - if (IsKeyDown(KEY_LEFT)) catPosition.x -= 0.2; - if (IsKeyDown(KEY_RIGHT)) catPosition.x += 0.2; - if (IsKeyDown(KEY_UP)) catPosition.z -= 0.2; - if (IsKeyDown(KEY_DOWN)) catPosition.z += 0.2; - //---------------------------------------------------------------------------------- - - // Draw - //---------------------------------------------------------------------------------- - BeginDrawing(); - - ClearBackground(RAYWHITE); - - Begin3dMode(camera); - - DrawModel(cat, catPosition, 0.1f, WHITE); // Draw 3d model with texture - - DrawGrid(10.0, 1.0); // Draw a grid - - DrawGizmo(catPosition); // Draw gizmo - - End3dMode(); - - DrawFPS(10, 10); - - EndDrawing(); - //---------------------------------------------------------------------------------- - } - - // De-Initialization - //-------------------------------------------------------------------------------------- - UnloadTexture(texture); // Unload texture - UnloadModel(cat); // Unload model - UnloadShader(shader); - //UnloadShader(poste); - - CloseWindow(); // Close window and OpenGL context - //-------------------------------------------------------------------------------------- - - return 0; -} \ No newline at end of file diff --git a/examples/models_geometric_shapes.c b/examples/models_geometric_shapes.c index 3a649a3a6..e2d41dcd5 100644 --- a/examples/models_geometric_shapes.c +++ b/examples/models_geometric_shapes.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/shapes_basic_shapes.c b/examples/shapes_basic_shapes.c index 4ae9f4df8..4b14af89d 100644 --- a/examples/shapes_basic_shapes.c +++ b/examples/shapes_basic_shapes.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/shapes_colors_palette.c b/examples/shapes_colors_palette.c index 926dcdf8a..3e1611145 100644 --- a/examples/shapes_colors_palette.c +++ b/examples/shapes_colors_palette.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/shapes_logo_raylib.c b/examples/shapes_logo_raylib.c index a9e5104a2..3dd8fbf39 100644 --- a/examples/shapes_logo_raylib.c +++ b/examples/shapes_logo_raylib.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/shapes_logo_raylib_anim.c b/examples/shapes_logo_raylib_anim.c index cd3a4aa63..d08313782 100644 --- a/examples/shapes_logo_raylib_anim.c +++ b/examples/shapes_logo_raylib_anim.c @@ -5,7 +5,7 @@ * This example has been created using raylib 1.1 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/text_sprite_fonts.c b/examples/text_sprite_fonts.c index e27e8c085..423fa2504 100644 --- a/examples/text_sprite_fonts.c +++ b/examples/text_sprite_fonts.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/ diff --git a/examples/textures_logo_raylib.c b/examples/textures_logo_raylib.c index f4aeb738f..2ebf08672 100644 --- a/examples/textures_logo_raylib.c +++ b/examples/textures_logo_raylib.c @@ -5,7 +5,7 @@ * 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) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com) +* Copyright (c) 2014 Ramon Santamaria (@raysan5) * ********************************************************************************************/