From 4315b82ea7b42b68572f14c595aa46f030d82a43 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 14 Apr 2017 13:58:39 +0200 Subject: Replaced some images and updated examples --- examples/shaders/resources/fudesumi.png | Bin 0 -> 219234 bytes examples/shaders/resources/sonic.png | Bin 116512 -> 0 bytes examples/shaders/shaders_shapes_textures.c | 21 +++++++++------------ examples/shaders/shaders_shapes_textures.png | Bin 110700 -> 167756 bytes 4 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 examples/shaders/resources/fudesumi.png delete mode 100644 examples/shaders/resources/sonic.png (limited to 'examples/shaders') diff --git a/examples/shaders/resources/fudesumi.png b/examples/shaders/resources/fudesumi.png new file mode 100644 index 00000000..8ba983dc Binary files /dev/null and b/examples/shaders/resources/fudesumi.png differ diff --git a/examples/shaders/resources/sonic.png b/examples/shaders/resources/sonic.png deleted file mode 100644 index 7a096847..00000000 Binary files a/examples/shaders/resources/sonic.png and /dev/null differ diff --git a/examples/shaders/shaders_shapes_textures.c b/examples/shaders/shaders_shapes_textures.c index 0a14469f..40e99a8f 100644 --- a/examples/shaders/shaders_shapes_textures.c +++ b/examples/shaders/shaders_shapes_textures.c @@ -9,7 +9,7 @@ * on OpenGL ES 2.0 platforms (Android, Raspberry Pi, HTML5), use #version 100 shaders * raylib comes with shaders ready for both versions, check raylib/shaders install folder * -* This example has been created using raylib 1.3 (www.raylib.com) +* This example has been created using raylib 1.7 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * * Copyright (c) 2015 Ramon Santamaria (@raysan5) @@ -18,9 +18,6 @@ #include "raylib.h" -#include -#include - int main() { // Initialization @@ -30,14 +27,12 @@ int main() InitWindow(screenWidth, screenHeight, "raylib [shaders] example - shapes and texture shaders"); - Texture2D sonic = LoadTexture("resources/texture_formats/sonic.png"); + Texture2D fudesumi = LoadTexture("resources/fudesumi.png"); // NOTE: Using GLSL 330 shader version, on OpenGL ES 2.0 use GLSL 100 shader version Shader shader = LoadShader("resources/shaders/glsl330/base.vs", "resources/shaders/glsl330/grayscale.fs"); - - // Shader usage is also different than models/postprocessing, shader is just activated when required - + SetTargetFPS(60); //-------------------------------------------------------------------------------------- @@ -91,21 +86,23 @@ int main() // Activate our custom shader to be applied on next shapes/textures drawings BeginShaderMode(shader); - DrawTexture(sonic, 380, -10, WHITE); // Using custom shader + DrawTexture(fudesumi, 500, -30, WHITE); // Using custom shader // Activate our default shader for next drawings EndShaderMode(); + DrawText("(c) Fudesumi sprite by Eiden Marsal", 380, screenHeight - 20, 10, GRAY); + EndDrawing(); //---------------------------------------------------------------------------------- } // De-Initialization //-------------------------------------------------------------------------------------- - UnloadShader(shader); // Unload shader - UnloadTexture(sonic); // Unload texture + UnloadShader(shader); // Unload shader + UnloadTexture(fudesumi); // Unload texture - CloseWindow(); // Close window and OpenGL context + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- return 0; diff --git a/examples/shaders/shaders_shapes_textures.png b/examples/shaders/shaders_shapes_textures.png index ee5fed42..63a2283c 100644 Binary files a/examples/shaders/shaders_shapes_textures.png and b/examples/shaders/shaders_shapes_textures.png differ -- cgit v1.2.3