From 95da97fa744766fb46b912dcae504cd858fd2377 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 4 Jan 2016 15:09:44 +0100 Subject: [PATCH 1/2] Fixed bug: rlglGenerateMipmaps() --- src/rlgl.c | 33 ++++++++++++--------------------- src/rlgl.h | 2 +- src/textures.c | 4 ++-- 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/rlgl.c b/src/rlgl.c index 8a0440e04..504381b2a 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -1921,40 +1921,31 @@ void rlglUpdateTexture(unsigned int id, int width, int height, int format, void } // Generate mipmap data for selected texture -void rlglGenerateMipmaps(unsigned int textureId) +void rlglGenerateMipmaps(Texture2D texture) { - glBindTexture(GL_TEXTURE_2D, textureId); + glBindTexture(GL_TEXTURE_2D, texture.id); // Check if texture is power-of-two (POT) bool texIsPOT = false; - // NOTE: In OpenGL ES 2.0 we have no way to retrieve texture size from id - -#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) - int width, height; - - glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width); - glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height); - - if (((width > 0) && ((width & (width - 1)) == 0)) && ((height > 0) && ((height & (height - 1)) == 0))) texIsPOT = true; -#endif + if (((texture.width > 0) && ((texture.width & (texture.width - 1)) == 0)) && + ((texture.height > 0) && ((texture.height & (texture.height - 1)) == 0))) texIsPOT = true; if ((texIsPOT) || (npotSupported)) { #if defined(GRAPHICS_API_OPENGL_11) // Compute required mipmaps - // TODO: rlglReadTexturePixels() needs Texture2D type parameter, not unsigned int parameter - void *data; // = rlglReadTexturePixels(textureId, UNCOMPRESSED_R8G8B8A8); // TODO: Detect internal format + void *data = rlglReadTexturePixels(texture); // NOTE: data size is reallocated to fit mipmaps data - int mipmapCount = GenerateMipmaps(data, width, height); + int mipmapCount = GenerateMipmaps(data, texture.width, texture.height); // TODO: Adjust mipmap size depending on texture format! - int size = width*height*4; + int size = texture.width*texture.height*4; int offset = size; - int mipWidth = width/2; - int mipHeight = height/2; + int mipWidth = texture.width/2; + int mipHeight = texture.height/2; // Load the mipmaps for (int level = 1; level < mipmapCount; level++) @@ -1968,17 +1959,17 @@ void rlglGenerateMipmaps(unsigned int textureId) mipHeight /= 2; } - TraceLog(WARNING, "[TEX ID %i] Mipmaps generated manually on CPU side", textureId); + TraceLog(WARNING, "[TEX ID %i] Mipmaps generated manually on CPU side", texture.id); #elif defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) glGenerateMipmap(GL_TEXTURE_2D); // Generate mipmaps automatically - TraceLog(INFO, "[TEX ID %i] Mipmaps generated automatically", textureId); + TraceLog(INFO, "[TEX ID %i] Mipmaps generated automatically", texture.id); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); // Activate Trilinear filtering for mipmaps (must be available) #endif } - else TraceLog(WARNING, "[TEX ID %i] Mipmaps can not be generated", textureId); + else TraceLog(WARNING, "[TEX ID %i] Mipmaps can not be generated", texture.id); glBindTexture(GL_TEXTURE_2D, 0); } diff --git a/src/rlgl.h b/src/rlgl.h index a7df043ed..93b56bb2c 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -246,7 +246,7 @@ void rlglInitGraphics(int offsetX, int offsetY, int width, int height); // Init unsigned int rlglLoadTexture(void *data, int width, int height, int textureFormat, int mipmapCount); // Load texture in GPU void rlglUpdateTexture(unsigned int id, int width, int height, int format, void *data); // Update GPU texture with new data -void rlglGenerateMipmaps(unsigned int textureId); // Generate mipmap data for selected texture +void rlglGenerateMipmaps(Texture2D texture); // Generate mipmap data for selected texture // NOTE: There is a set of shader related functions that are available to end user, // to avoid creating function wrappers through core module, they have been directly declared in raylib.h diff --git a/src/textures.c b/src/textures.c index 30ffb9458..f03d2d9ad 100644 --- a/src/textures.c +++ b/src/textures.c @@ -1271,9 +1271,9 @@ void GenTextureMipmaps(Texture2D texture) { TraceLog(WARNING, "Limited NPOT support, no mipmaps available for NPOT textures"); } - else rlglGenerateMipmaps(texture.id); + else rlglGenerateMipmaps(texture); #else - rlglGenerateMipmaps(texture.id); + rlglGenerateMipmaps(texture); #endif } From 70d405b41bcbbd73b9f752f4dc3910100abd1a36 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 4 Jan 2016 15:12:34 +0100 Subject: [PATCH 2/2] Added functionality: Storage values Two new functions added to save/load values as binary data: - StorageSaveValue() - StorageLoadValue() --- examples/core_storage_values.c | 85 +++++++++++++++++++++++++++++++ examples/core_storage_values.png | Bin 0 -> 16147 bytes src/core.c | 61 ++++++++++++++++++++++ src/raylib.h | 3 ++ 4 files changed, 149 insertions(+) create mode 100644 examples/core_storage_values.c create mode 100644 examples/core_storage_values.png diff --git a/examples/core_storage_values.c b/examples/core_storage_values.c new file mode 100644 index 000000000..3190d0a08 --- /dev/null +++ b/examples/core_storage_values.c @@ -0,0 +1,85 @@ +/******************************************************************************************* +* +* raylib [core] example - Storage save/load values +* +* This example has been created using raylib 1.4 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Copyright (c) 2014 Ramon Santamaria (@raysan5) +* +********************************************************************************************/ + +#include "raylib.h" + +// NOTE: Storage positions must start with 0, directly related to file memory layout +typedef enum { STORAGE_SCORE = 0, STORAGE_HISCORE } StorageData; + +int main() +{ + // Initialization + //-------------------------------------------------------------------------------------- + int screenWidth = 800; + int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [core] example - storage save/load values"); + + int score = 0; + int hiscore = 0; + + int framesCounter = 0; + + SetTargetFPS(60); + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + //---------------------------------------------------------------------------------- + if (IsKeyPressed(KEY_R)) + { + score = GetRandomValue(1000, 2000); + hiscore = GetRandomValue(2000, 4000); + } + + if (IsKeyPressed(KEY_ENTER)) + { + StorageSaveValue(STORAGE_SCORE, score); + StorageSaveValue(STORAGE_HISCORE, hiscore); + } + else if (IsKeyPressed(KEY_SPACE)) + { + // NOTE: If requested position could not be found, value 0 is returned + score = StorageLoadValue(STORAGE_SCORE); + hiscore = StorageLoadValue(STORAGE_HISCORE); + } + + framesCounter++; + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + DrawText(FormatText("SCORE: %i", score), 280, 130, 40, MAROON); + DrawText(FormatText("HI-SCORE: %i", hiscore), 210, 200, 50, BLACK); + + DrawText(FormatText("frames: %i", framesCounter), 10, 10, 20, LIME); + + DrawText("Press R to generate random numbers", 220, 40, 20, LIGHTGRAY); + DrawText("Press ENTER to SAVE values", 250, 310, 20, LIGHTGRAY); + DrawText("Press SPACE to LOAD values", 252, 350, 20, LIGHTGRAY); + + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/core_storage_values.png b/examples/core_storage_values.png new file mode 100644 index 0000000000000000000000000000000000000000..6cfd552dd63f24c854877db10f4e77cc6e6b4367 GIT binary patch literal 16147 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