From 43b13d623be7bf4773d399af2efffaa76a2113a6 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 28 Jan 2014 21:21:29 +0100 Subject: [PATCH] Update to version 1.0.5 Check CHANGELOG for changes --- CHANGELOG | 8 + examples/ex06b_logo_anim.c | 6 - src/audio.c | 2 + src/core.c | 25 +- src/models.c | 221 ++++++++-------- src/raylib.h | 8 +- src/stb_image_write.h | 514 +++++++++++++++++++++++++++++++++++++ src/text.c | 2 +- src/textures.c | 4 +- tools/rrem.exe | Bin 241166 -> 241678 bytes 10 files changed, 668 insertions(+), 122 deletions(-) create mode 100644 src/stb_image_write.h diff --git a/CHANGELOG b/CHANGELOG index cce8ada5..d07c4433 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,14 @@ Current Release: raylib 1.0.4 (January 2014) NOTE: Only versions marked as 'Release' are available on release folder, updates are only available as source. NOTE: Current Release includes all previous updates. +----------------------------------------------- +Update: raylib 1.0.5 (28 January 2014) +----------------------------------------------- +[audio] LoadSound() - Corrected a bug, WAV file was not closed! +[core] GetMouseWheelMove() - Added, check mouse wheel Y movement +[models] LoadHeightmap() - Added, Heightmap can be loaded as a Model +[tool] rREM updated, now supports (partially) drag and drop of files + ----------------------------------------------- Release: raylib 1.0.4 (23 January 2014) ----------------------------------------------- diff --git a/examples/ex06b_logo_anim.c b/examples/ex06b_logo_anim.c index 223801c5..d4dd9fde 100644 --- a/examples/ex06b_logo_anim.c +++ b/examples/ex06b_logo_anim.c @@ -11,12 +11,6 @@ #include "raylib.h" -// Useful function for fade-ins and fade-outs -Color Fade(Color col, float alpha) -{ - return (Color){col.r, col.g, col.b, col.a*alpha}; -} - int main() { // Initialization diff --git a/src/audio.c b/src/audio.c index 5904d9ca..4b75942f 100644 --- a/src/audio.c +++ b/src/audio.c @@ -504,6 +504,8 @@ static Wave LoadWAV(char *fileName) wave.channels = waveFormat.numChannels; wave.bitsPerSample = waveFormat.bitsPerSample; + fclose(wavFile); + return wave; } diff --git a/src/core.c b/src/core.c index 78525483..77ba5d7b 100644 --- a/src/core.c +++ b/src/core.c @@ -77,6 +77,9 @@ static char currentMouseState[3] = { 0 }; // Required to check if mouse btn pr static char previousGamepadState[32] = {0}; // Required to check if gamepad btn pressed/released once static char currentGamepadState[32] = {0}; // Required to check if gamepad btn pressed/released once +static int previousMouseWheelY = 0; +static int currentMouseWheelY = 0; + //---------------------------------------------------------------------------------- // Other Modules Functions Declaration (required by core) //---------------------------------------------------------------------------------- @@ -89,6 +92,7 @@ extern void UnloadDefaultFont(); // [Module: text] Unloads default f static void InitGraphicsDevice(); // Initialize Graphics Device (OpenGL stuff) static void ErrorCallback(int error, const char *description); // GLFW3 Error Callback, runs on GLFW3 error static void KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); // GLFW3 Keyboard Callback, runs on key pressed +static void ScrollCallback(GLFWwindow* window, double xoffset, double yoffset); // GLFW3 Srolling Callback, runs on mouse wheel static void CursorEnterCallback(GLFWwindow* window, int enter); // GLFW3 Cursor Enter Callback, cursor enters client area static void WindowSizeCallback(GLFWwindow* window, int width, int height); // GLFW3 WindowSize Callback, runs when window is resized static void CameraLookAt(Vector3 position, Vector3 target, Vector3 up); // Setup camera view (updates MODELVIEW matrix) @@ -133,6 +137,7 @@ void InitWindowEx(int width, int height, const char* title, bool resizable, cons glfwMakeContextCurrent(window); glfwSetKeyCallback(window, KeyCallback); + glfwSetScrollCallback(window, ScrollCallback); glfwSwapInterval(0); // Disables GPU v-sync (if set), so frames are not limited to screen refresh rate (60Hz -> 60 FPS) // If not set, swap interval uses GPU v-sync configuration // Framerate can be setup using SetTargetFPS() @@ -195,6 +200,8 @@ void ToggleFullscreen() fullscreen = !fullscreen; // Toggle fullscreen flag glfwDestroyWindow(window); // Destroy the current window (we will recreate it!) + + // TODO: WARNING! All loaded resources are lost, we loose Context! // NOTE: Window aspect ratio is always windowWidth / windowHeight if (fullscreen) window = glfwCreateWindow(windowWidth, windowHeight, windowTitle, glfwGetPrimaryMonitor(), NULL); // Fullscreen mode @@ -498,6 +505,16 @@ Vector2 GetMousePosition() return position; } +// Returns mouse wheel movement Y +int GetMouseWheelMove() +{ + previousMouseWheelY = currentMouseWheelY; + + currentMouseWheelY = 0; + + return previousMouseWheelY; +} + // Detect if a gamepad is available bool IsGamepadAvailable(int gamepad) { @@ -602,6 +619,12 @@ static void ErrorCallback(int error, const char *description) //fprintf(stderr, description); } +// GLFW3 Srolling Callback, runs on mouse wheel +static void ScrollCallback(GLFWwindow* window, double xoffset, double yoffset) +{ + currentMouseWheelY = (int)yoffset; +} + // GLFW3 Keyboard Callback, runs on key pressed static void KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) { @@ -662,8 +685,6 @@ static void InitGraphicsDevice() glMatrixMode(GL_MODELVIEW); // Switch back to MODELVIEW matrix glLoadIdentity(); // Reset current matrix (MODELVIEW) - glDisable(GL_LIGHTING); // Lighting Disabled... - // TODO: Create an efficient Lighting System with proper functions (raylib 1.x) /* glEnable(GL_COLOR_MATERIAL); // Enable materials, causes some glMaterial atributes to track the current color (glColor)... diff --git a/src/models.c b/src/models.c index 1f145523..9edfb142 100644 --- a/src/models.c +++ b/src/models.c @@ -49,7 +49,7 @@ //---------------------------------------------------------------------------------- // Module specific Functions Declaration //---------------------------------------------------------------------------------- -// No private (static) functions in this module +static float GetHeightValue(Color pixel); //---------------------------------------------------------------------------------- // Module Functions Definition @@ -465,100 +465,100 @@ Model LoadModel(const char *fileName) int numTexCoords = 0; int numTriangles = 0; - FILE* objfile; + FILE* objFile; - objfile = fopen(fileName, "rt"); + objFile = fopen(fileName, "rt"); - while(!feof(objfile)) + while(!feof(objFile)) { - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); switch(dataType) { case '#': // It's a comment { - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } break; case 'v': { - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); if (dataType == 't') // Read texCoord { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); while (dataType == 'v') { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); } if (dataType == '#') { - fscanf(objfile, "%i", &numTexCoords); + fscanf(objFile, "%i", &numTexCoords); } else printf("Ouch! Something was wrong..."); - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } else if (dataType == 'n') // Read normals { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); while (dataType == 'v') { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); } if (dataType == '#') { - fscanf(objfile, "%i", &numNormals); + fscanf(objFile, "%i", &numNormals); } else printf("Ouch! Something was wrong..."); - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } else // Read vertex { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); while (dataType == 'v') { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); } if (dataType == '#') { - fscanf(objfile, "%i", &numVertex); + fscanf(objFile, "%i", &numVertex); } else printf("Ouch! Something was wrong..."); - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } } break; case 'f': { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); while (dataType == 'f') { - fgets(comments, 200, objfile); - fscanf(objfile, "%c", &dataType); + fgets(comments, 200, objFile); + fscanf(objFile, "%c", &dataType); } if (dataType == '#') { - fscanf(objfile, "%i", &numTriangles); + fscanf(objFile, "%i", &numTriangles); } else printf("Ouch! Something was wrong..."); - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } break; default: break; @@ -581,51 +581,51 @@ Model LoadModel(const char *fileName) int countMaxVertex = 0; - rewind(objfile); + rewind(objFile); - while(!feof(objfile)) + while(!feof(objFile)) { - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); switch(dataType) { case '#': { - fgets(comments, 200, objfile); + fgets(comments, 200, objFile); } break; case 'v': { - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); if (dataType == 't') // Read texCoord { float useless = 0; - fscanf(objfile, "%f %f %f", &midTexCoords[countTexCoords].x, &midTexCoords[countTexCoords].y, &useless); + fscanf(objFile, "%f %f %f", &midTexCoords[countTexCoords].x, &midTexCoords[countTexCoords].y, &useless); countTexCoords++; - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); } else if (dataType == 'n') // Read normals { - fscanf(objfile, "%f %f %f", &midNormals[countNormals].x, &midNormals[countNormals].y, &midNormals[countNormals].z ); + fscanf(objFile, "%f %f %f", &midNormals[countNormals].x, &midNormals[countNormals].y, &midNormals[countNormals].z ); countNormals++; - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); } else // Read vertex { - fscanf(objfile, "%f %f %f", &midVertices[countVertex].x, &midVertices[countVertex].y, &midVertices[countVertex].z ); + fscanf(objFile, "%f %f %f", &midVertices[countVertex].x, &midVertices[countVertex].y, &midVertices[countVertex].z ); countVertex++; - fscanf(objfile, "%c", &dataType); + fscanf(objFile, "%c", &dataType); } } break; case 'f': { int vNum, vtNum, vnNum; - fscanf(objfile, "%c", &dataType); - fscanf(objfile, "%i/%i/%i", &vNum, &vtNum, &vnNum); + fscanf(objFile, "%c", &dataType); + fscanf(objFile, "%i/%i/%i", &vNum, &vtNum, &vnNum); model.vertices[countMaxVertex] = midVertices[vNum-1]; model.normals[countMaxVertex] = midNormals[vnNum-1]; @@ -633,7 +633,7 @@ Model LoadModel(const char *fileName) model.texcoords[countMaxVertex].y = -midTexCoords[vtNum-1].y; countMaxVertex++; - fscanf(objfile, "%i/%i/%i", &vNum, &vtNum, &vnNum); + fscanf(objFile, "%i/%i/%i", &vNum, &vtNum, &vnNum); model.vertices[countMaxVertex] = midVertices[vNum-1]; model.normals[countMaxVertex] = midNormals[vnNum-1]; @@ -641,7 +641,7 @@ Model LoadModel(const char *fileName) model.texcoords[countMaxVertex].y = -midTexCoords[vtNum-1].y; countMaxVertex++; - fscanf(objfile, "%i/%i/%i", &vNum, &vtNum, &vnNum); + fscanf(objFile, "%i/%i/%i", &vNum, &vtNum, &vnNum); model.vertices[countMaxVertex] = midVertices[vNum-1]; model.normals[countMaxVertex] = midNormals[vnNum-1]; @@ -653,14 +653,13 @@ Model LoadModel(const char *fileName) } } - fclose(objfile); + fclose(objFile); return model; } // Load a heightmap image as a 3d model -// TODO: Just do it... -Model LoadHeightmap(Image heightmap, Vector3 resolution) +Model LoadHeightmap(Image heightmap, float maxHeight) { Model model; @@ -676,17 +675,72 @@ Model LoadHeightmap(Image heightmap, Vector3 resolution) model.vertices = (Vector3 *)malloc(model.numVertices * sizeof(Vector3)); model.normals = (Vector3 *)malloc(model.numVertices * sizeof(Vector3)); model.texcoords = (Vector2 *)malloc(model.numVertices * sizeof(Vector2)); + + int vCounter = 0; + int trisCounter = 0; + + float scaleFactor = maxHeight/255; // TODO: Review scaleFactor calculation - for(int z = 0; z < mapZ; z++) + for(int z = 0; z < mapZ-1; z++) { - for(int x = 0; x < mapX; x++) + for(int x = 0; x < mapX-1; x++) { - // TODO: Fill vertices array with data + // Fill vertices array with data + //---------------------------------------------------------- + + // one triangle - 3 vertex + model.vertices[vCounter].x = x; + model.vertices[vCounter].y = GetHeightValue(heightmap.pixels[x + z*mapX])*scaleFactor; + model.vertices[vCounter].z = z; + + model.vertices[vCounter+1].x = x; + model.vertices[vCounter+1].y = GetHeightValue(heightmap.pixels[x + (z+1)*mapX])*scaleFactor; + model.vertices[vCounter+1].z = z+1; + + model.vertices[vCounter+2].x = x+1; + model.vertices[vCounter+2].y = GetHeightValue(heightmap.pixels[(x+1) + z*mapX])*scaleFactor; + model.vertices[vCounter+2].z = z; + + // another triangle - 3 vertex + model.vertices[vCounter+3] = model.vertices[vCounter+2]; + model.vertices[vCounter+4] = model.vertices[vCounter+1]; + + model.vertices[vCounter+5].x = x+1; + model.vertices[vCounter+5].y = GetHeightValue(heightmap.pixels[(x+1) + (z+1)*mapX])*scaleFactor; + model.vertices[vCounter+5].z = z+1; + + // Fill texcoords array with data + //-------------------------------------------------------------- + model.texcoords[vCounter].x = (float)x / (mapX-1); + model.texcoords[vCounter].y = (float)z / (mapZ-1); + + model.texcoords[vCounter+1].x = (float)x / (mapX-1); + model.texcoords[vCounter+1].y = (float)(z+1) / (mapZ-1); + + model.texcoords[vCounter+2].x = (float)(x+1) / (mapX-1); + model.texcoords[vCounter+2].y = (float)z / (mapZ-1); + + model.texcoords[vCounter+3] = model.texcoords[vCounter+2]; + model.texcoords[vCounter+4] = model.texcoords[vCounter+1]; + + model.texcoords[vCounter+5].x = (float)(x+1) / (mapX-1); + model.texcoords[vCounter+5].y = (float)(z+1) / (mapZ-1); + + // Fill normals array with data + //-------------------------------------------------------------- + // TODO: Review normals calculation + model.normals[vCounter] = (Vector3){ 0.0f, 1.0f, 0.0f }; + model.normals[vCounter+1] = (Vector3){ 0.0f, 1.0f, 0.0f }; + model.normals[vCounter+2] = (Vector3){ 0.0f, 1.0f, 0.0f }; + model.normals[vCounter+3] = (Vector3){ 0.0f, 1.0f, 0.0f }; + model.normals[vCounter+4] = (Vector3){ 0.0f, 1.0f, 0.0f }; + model.normals[vCounter+5] = (Vector3){ 0.0f, 1.0f, 0.0f }; + + vCounter += 6; + trisCounter += 2; } } - //SmoothHeightmap(&model); // TODO: Smooth vertex interpolation - return model; } @@ -702,6 +756,7 @@ void UnloadModel(Model model) void DrawModel(Model model, Vector3 position, float scale, Color color) { // NOTE: For models we use Vertex Arrays (OpenGL 1.1) + //static int rotation = 0; glEnableClientState(GL_VERTEX_ARRAY); // Enable vertex array glEnableClientState(GL_TEXTURE_COORD_ARRAY); // Enable texture coords array @@ -725,6 +780,8 @@ void DrawModel(Model model, Vector3 position, float scale, Color color) glDisableClientState(GL_VERTEX_ARRAY); // Disable vertex array glDisableClientState(GL_TEXTURE_COORD_ARRAY); // Disable texture coords array glDisableClientState(GL_NORMAL_ARRAY); // Disable normals array + + //rotation += 10; } // Draw a textured model @@ -787,58 +844,8 @@ void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vec glDisable(GL_TEXTURE_2D); } -// Draw a heightmap using a provided image data -void DrawHeightmap(Image heightmap, Vector3 centerPos, Vector3 scale, Color color) +// Get current vertex y altitude (proportional to pixel colors in grayscale) +static float GetHeightValue(Color pixel) { - // NOTE: Pixel-data is interpreted as grey-scale (even being a color image) - // NOTE: Heightmap resolution will depend on image size (one quad per pixel) - - // TODO: Review how this function works... probably we need: - // Model LoadHeightmap(Image heightmap, Vector3 resolution); - - // NOTE: We are allocating and de-allocating vertex data every frame! --> framerate drops 80%! CRAZY! - Vector3 *terrainVertex = (Vector3 *)malloc(heightmap.width * heightmap.height * sizeof(Vector3)); - - for (int z = 0; z < heightmap.height; z++) - { - for (int x = 0; x < heightmap.width; x++) - { - terrainVertex[z*heightmap.height + x].x = (float)(x*scale.x); - terrainVertex[z*heightmap.height + x].y = ((float)heightmap.pixels[z*heightmap.height + x].r + - (float)heightmap.pixels[z*heightmap.height + x].g + - (float)heightmap.pixels[z*heightmap.height + x].b) / 3 * scale.y; - terrainVertex[z*heightmap.height + x].z = (float)(-z*scale.z); - } - } - - // TODO: Texture coordinates and normals computing - - for (int z = 0; z < heightmap.height-1; z++) - { - glBegin(GL_TRIANGLE_STRIP); - for (int x = 0; x < heightmap.width; x++) - { - glColor3f((float)heightmap.pixels[z*heightmap.height + x].r / 255.0f, - (float)heightmap.pixels[z*heightmap.height + x].g / 255.0f, - (float)heightmap.pixels[z*heightmap.height + x].b / 255.0f); - - glVertex3f(terrainVertex[z*heightmap.height + x].x, terrainVertex[z*heightmap.height + x].y, terrainVertex[z*heightmap.height + x].z); - glVertex3f(terrainVertex[(z+1)*heightmap.height + x].x, terrainVertex[(z+1)*heightmap.height + x].y, terrainVertex[(z+1)*heightmap.height + x].z); - } - glEnd(); - } - - free(terrainVertex); -} - -void DrawHeightmapEx(Image heightmap, Texture2D texture, Vector3 centerPos, Vector3 scale, Color tint) -{ - glEnable(GL_TEXTURE_2D); - - glBindTexture(GL_TEXTURE_2D, texture.glId); - - // NOTE: No texture coordinates or normals defined at this moment... - DrawHeightmap(heightmap, centerPos, scale, tint); - - glDisable(GL_TEXTURE_2D); + return (((float)pixel.r + (float)pixel.g + (float)pixel.b)/3); } \ No newline at end of file diff --git a/src/raylib.h b/src/raylib.h index dff65ae6..867b7218 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -65,6 +65,7 @@ #define KEY_SPACE 32 #define KEY_ESCAPE 256 #define KEY_ENTER 257 +#define KEY_BACKSPACE 259 #define KEY_RIGHT 262 #define KEY_LEFT 263 #define KEY_DOWN 264 @@ -278,6 +279,7 @@ bool IsMouseButtonUp(int button); // Detect if a mouse but int GetMouseX(); // Returns mouse position X int GetMouseY(); // Returns mouse position Y Vector2 GetMousePosition(); // Returns mouse position XY +int GetMouseWheelMove(); // Returns mouse wheel movement Y bool IsGamepadAvailable(int gamepad); // Detect if a gamepad is available Vector2 GetGamepadMovement(int gamepad); // Return axis movement vector for a gamepad @@ -323,7 +325,7 @@ Image LoadImage(const char *fileName); Image LoadImageFromRES(const char *rresName, int resId); // Load an image from rRES file (raylib Resource) Texture2D LoadTexture(const char *fileName); // Load an image as texture into GPU memory Texture2D LoadTextureFromRES(const char *rresName, int resId); // Load an image as texture from rRES file (raylib Resource) -Texture2D CreateTexture2D(Image image); // Create a Texture2D from Image data +Texture2D CreateTexture(Image image); // Create a Texture2D from Image data void UnloadImage(Image image); // Unload image from CPU memory (RAM) void UnloadTexture(Texture2D texture); // Unload texture from GPU memory @@ -370,17 +372,15 @@ void DrawGizmo(Vector3 position, bool orbits); //------------------------------------------------------------------------------------ Model LoadModel(const char *fileName); // Load a 3d model (.OBJ) //Model LoadModelFromRES(const char *rresName, int resId); // TODO: Load a 3d model from rRES file (raylib Resource) +Model LoadHeightmap(Image heightmap, float maxHeight); // Load a heightmap image as a 3d model void UnloadModel(Model model); // Unload 3d model from memory void DrawModel(Model model, Vector3 position, float scale, Color color); // Draw a model void DrawModelEx(Model model, Texture2D texture, Vector3 position, float scale, Color tint); // Draw a textured model void DrawModelWires(Model model, Vector3 position, float scale, Color color); // Draw a model wires // NOTE: The following functions work but are incomplete or require some revision -// DrawHeightmap is extremely inefficient and can impact performance up to 60% void DrawBillboard(Camera camera, Texture2D texture, Vector3 basePos, float size, Color tint); // REVIEW: Draw a billboard (raylib 1.x) void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vector3 basePos, float size, Color tint); // REVIEW: Draw a billboard (raylib 1.x) -void DrawHeightmap(Image heightmap, Vector3 centerPos, Vector3 scale, Color color); // REVIEW: Draw heightmap using image map (raylib 1.x) -void DrawHeightmapEx(Image heightmap, Texture2D texture, Vector3 centerPos, Vector3 scale, Color tint); // REVIEW: Draw textured heightmap (raylib 1.x) //------------------------------------------------------------------------------------ // Audio Loading and Playing Functions (Module: audio) diff --git a/src/stb_image_write.h b/src/stb_image_write.h new file mode 100644 index 00000000..b78cd212 --- /dev/null +++ b/src/stb_image_write.h @@ -0,0 +1,514 @@ +/* stbiw-0.92 - public domain - http://nothings.org/stb/stb_image_write.h + writes out PNG/BMP/TGA images to C stdio - Sean Barrett 2010 + no warranty implied; use at your own risk + + +Before #including, + + #define STB_IMAGE_WRITE_IMPLEMENTATION + +in the file that you want to have the implementation. + + +ABOUT: + + This header file is a library for writing images to C stdio. It could be + adapted to write to memory or a general streaming interface; let me know. + + The PNG output is not optimal; it is 20-50% larger than the file + written by a decent optimizing implementation. This library is designed + for source code compactness and simplicitly, not optimal image file size + or run-time performance. + +USAGE: + + There are three functions, one for each image file format: + + int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); + int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); + int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); + + Each function returns 0 on failure and non-0 on success. + + The functions create an image file defined by the parameters. The image + is a rectangle of pixels stored from left-to-right, top-to-bottom. + Each pixel contains 'comp' channels of data stored interleaved with 8-bits + per channel, in the following order: 1=L, 2=LA, 3=RGB, 4=RGBA. (L is + luminance, i.e. monochrome "color", i.e. grey value.) The rectangle is + 'w' pixels wide and 'h' pixels tall. The *data pointer points to the + first byte of the top-left-most pixel. For PNG, "stride_in_bytes" is + the distance in bytes from the first byte of a row of pixels to the + first byte of the next row of pixels. Other file formats assume the + first byte of the each row of pixels begins immediately after the last + byte of the previous row. + + PNG creates output files with the same number of components as the input. + The BMP and TGA formats expand Y to RGB in the file format. BMP does not + output alpha. + + PNG supports writing rectangles of data even when the bytes storing rows of + data are not consecutive in memory (e.g. sub-rectangles of a larger image), + by supplying the stride between the beginning of adjacent rows. The other + formats do not. (Thus you cannot write an in-memory BMP through the BMP + writer, both because it is in BGR order and because it may have padding + at the end of the line.) +*/ + +#ifndef INCLUDE_STB_IMAGE_WRITE_H +#define INCLUDE_STB_IMAGE_WRITE_H + +#ifdef __cplusplus +extern "C" { +#endif + +extern int stbi_write_png(char const *filename, int w, int h, int comp, const void *data, int stride_in_bytes); +extern int stbi_write_bmp(char const *filename, int w, int h, int comp, const void *data); +extern int stbi_write_tga(char const *filename, int w, int h, int comp, const void *data); + +#ifdef __cplusplus +} +#endif + +#endif//INCLUDE_STB_IMAGE_WRITE_H + +#ifdef STB_IMAGE_WRITE_IMPLEMENTATION + +#include +#include +#include +#include +#include + +typedef unsigned int stbiw_uint32; +typedef int stb_image_write_test[sizeof(stbiw_uint32)==4 ? 1 : -1]; + +static void writefv(FILE *f, const char *fmt, va_list v) +{ + while (*fmt) { + switch (*fmt++) { + case ' ': break; + case '1': { unsigned char x = (unsigned char) va_arg(v, int); fputc(x,f); break; } + case '2': { int x = va_arg(v,int); unsigned char b[2]; + b[0] = (unsigned char) x; b[1] = (unsigned char) (x>>8); + fwrite(b,2,1,f); break; } + case '4': { stbiw_uint32 x = va_arg(v,int); unsigned char b[4]; + b[0]=(unsigned char)x; b[1]=(unsigned char)(x>>8); + b[2]=(unsigned char)(x>>16); b[3]=(unsigned char)(x>>24); + fwrite(b,4,1,f); break; } + default: + assert(0); + return; + } + } +} + +static void write3(FILE *f, unsigned char a, unsigned char b, unsigned char c) +{ + unsigned char arr[3]; + arr[0] = a, arr[1] = b, arr[2] = c; + fwrite(arr, 3, 1, f); +} + +static void write_pixels(FILE *f, int rgb_dir, int vdir, int x, int y, int comp, void *data, int write_alpha, int scanline_pad) +{ + unsigned char bg[3] = { 255, 0, 255}, px[3]; + stbiw_uint32 zero = 0; + int i,j,k, j_end; + + if (y <= 0) + return; + + if (vdir < 0) + j_end = -1, j = y-1; + else + j_end = y, j = 0; + + for (; j != j_end; j += vdir) { + for (i=0; i < x; ++i) { + unsigned char *d = (unsigned char *) data + (j*x+i)*comp; + if (write_alpha < 0) + fwrite(&d[comp-1], 1, 1, f); + switch (comp) { + case 1: + case 2: write3(f, d[0],d[0],d[0]); + break; + case 4: + if (!write_alpha) { + // composite against pink background + for (k=0; k < 3; ++k) + px[k] = bg[k] + ((d[k] - bg[k]) * d[3])/255; + write3(f, px[1-rgb_dir],px[1],px[1+rgb_dir]); + break; + } + /* FALLTHROUGH */ + case 3: + write3(f, d[1-rgb_dir],d[1],d[1+rgb_dir]); + break; + } + if (write_alpha > 0) + fwrite(&d[comp-1], 1, 1, f); + } + fwrite(&zero,scanline_pad,1,f); + } +} + +static int outfile(char const *filename, int rgb_dir, int vdir, int x, int y, int comp, void *data, int alpha, int pad, const char *fmt, ...) +{ + FILE *f; + if (y < 0 || x < 0) return 0; + f = fopen(filename, "wb"); + if (f) { + va_list v; + va_start(v, fmt); + writefv(f, fmt, v); + va_end(v); + write_pixels(f,rgb_dir,vdir,x,y,comp,data,alpha,pad); + fclose(f); + } + return f != NULL; +} + +int stbi_write_bmp(char const *filename, int x, int y, int comp, const void *data) +{ + int pad = (-x*3) & 3; + return outfile(filename,-1,-1,x,y,comp,(void *) data,0,pad, + "11 4 22 4" "4 44 22 444444", + 'B', 'M', 14+40+(x*3+pad)*y, 0,0, 14+40, // file header + 40, x,y, 1,24, 0,0,0,0,0,0); // bitmap header +} + +int stbi_write_tga(char const *filename, int x, int y, int comp, const void *data) +{ + int has_alpha = !(comp & 1); + return outfile(filename, -1,-1, x, y, comp, (void *) data, has_alpha, 0, + "111 221 2222 11", 0,0,2, 0,0,0, 0,0,x,y, 24+8*has_alpha, 8*has_alpha); +} + +// stretchy buffer; stbi__sbpush() == vector<>::push_back() -- stbi__sbcount() == vector<>::size() +#define stbi__sbraw(a) ((int *) (a) - 2) +#define stbi__sbm(a) stbi__sbraw(a)[0] +#define stbi__sbn(a) stbi__sbraw(a)[1] + +#define stbi__sbneedgrow(a,n) ((a)==0 || stbi__sbn(a)+n >= stbi__sbm(a)) +#define stbi__sbmaybegrow(a,n) (stbi__sbneedgrow(a,(n)) ? stbi__sbgrow(a,n) : 0) +#define stbi__sbgrow(a,n) stbi__sbgrowf((void **) &(a), (n), sizeof(*(a))) + +#define stbi__sbpush(a, v) (stbi__sbmaybegrow(a,1), (a)[stbi__sbn(a)++] = (v)) +#define stbi__sbcount(a) ((a) ? stbi__sbn(a) : 0) +#define stbi__sbfree(a) ((a) ? free(stbi__sbraw(a)),0 : 0) + +static void *stbi__sbgrowf(void **arr, int increment, int itemsize) +{ + int m = *arr ? 2*stbi__sbm(*arr)+increment : increment+1; + void *p = realloc(*arr ? stbi__sbraw(*arr) : 0, itemsize * m + sizeof(int)*2); + assert(p); + if (p) { + if (!*arr) ((int *) p)[1] = 0; + *arr = (void *) ((int *) p + 2); + stbi__sbm(*arr) = m; + } + return *arr; +} + +static unsigned char *stbi__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount) +{ + while (*bitcount >= 8) { + stbi__sbpush(data, (unsigned char) *bitbuffer); + *bitbuffer >>= 8; + *bitcount -= 8; + } + return data; +} + +static int stbi__zlib_bitrev(int code, int codebits) +{ + int res=0; + while (codebits--) { + res = (res << 1) | (code & 1); + code >>= 1; + } + return res; +} + +static unsigned int stbi__zlib_countm(unsigned char *a, unsigned char *b, int limit) +{ + int i; + for (i=0; i < limit && i < 258; ++i) + if (a[i] != b[i]) break; + return i; +} + +static unsigned int stbi__zhash(unsigned char *data) +{ + stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16); + hash ^= hash << 3; + hash += hash >> 5; + hash ^= hash << 4; + hash += hash >> 17; + hash ^= hash << 25; + hash += hash >> 6; + return hash; +} + +#define stbi__zlib_flush() (out = stbi__zlib_flushf(out, &bitbuf, &bitcount)) +#define stbi__zlib_add(code,codebits) \ + (bitbuf |= (code) << bitcount, bitcount += (codebits), stbi__zlib_flush()) +#define stbi__zlib_huffa(b,c) stbi__zlib_add(stbi__zlib_bitrev(b,c),c) +// default huffman tables +#define stbi__zlib_huff1(n) stbi__zlib_huffa(0x30 + (n), 8) +#define stbi__zlib_huff2(n) stbi__zlib_huffa(0x190 + (n)-144, 9) +#define stbi__zlib_huff3(n) stbi__zlib_huffa(0 + (n)-256,7) +#define stbi__zlib_huff4(n) stbi__zlib_huffa(0xc0 + (n)-280,8) +#define stbi__zlib_huff(n) ((n) <= 143 ? stbi__zlib_huff1(n) : (n) <= 255 ? stbi__zlib_huff2(n) : (n) <= 279 ? stbi__zlib_huff3(n) : stbi__zlib_huff4(n)) +#define stbi__zlib_huffb(n) ((n) <= 143 ? stbi__zlib_huff1(n) : stbi__zlib_huff2(n)) + +#define stbi__ZHASH 16384 + +unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality) +{ + static unsigned short lengthc[] = { 3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258, 259 }; + static unsigned char lengtheb[]= { 0,0,0,0,0,0,0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 }; + static unsigned short distc[] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577, 32768 }; + static unsigned char disteb[] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13 }; + unsigned int bitbuf=0; + int i,j, bitcount=0; + unsigned char *out = NULL; + unsigned char **hash_table[stbi__ZHASH]; // 64KB on the stack! + if (quality < 5) quality = 5; + + stbi__sbpush(out, 0x78); // DEFLATE 32K window + stbi__sbpush(out, 0x5e); // FLEVEL = 1 + stbi__zlib_add(1,1); // BFINAL = 1 + stbi__zlib_add(1,2); // BTYPE = 1 -- fixed huffman + + for (i=0; i < stbi__ZHASH; ++i) + hash_table[i] = NULL; + + i=0; + while (i < data_len-3) { + // hash next 3 bytes of data to be compressed + int h = stbi__zhash(data+i)&(stbi__ZHASH-1), best=3; + unsigned char *bestloc = 0; + unsigned char **hlist = hash_table[h]; + int n = stbi__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32768) { // if entry lies within window + int d = stbi__zlib_countm(hlist[j], data+i, data_len-i); + if (d >= best) best=d,bestloc=hlist[j]; + } + } + // when hash table entry is too long, delete half the entries + if (hash_table[h] && stbi__sbn(hash_table[h]) == 2*quality) { + memcpy(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality); + stbi__sbn(hash_table[h]) = quality; + } + stbi__sbpush(hash_table[h],data+i); + + if (bestloc) { + // "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal + h = stbi__zhash(data+i+1)&(stbi__ZHASH-1); + hlist = hash_table[h]; + n = stbi__sbcount(hlist); + for (j=0; j < n; ++j) { + if (hlist[j]-data > i-32767) { + int e = stbi__zlib_countm(hlist[j], data+i+1, data_len-i-1); + if (e > best) { // if next match is better, bail on current match + bestloc = NULL; + break; + } + } + } + } + + if (bestloc) { + int d = data+i - bestloc; // distance back + assert(d <= 32767 && best <= 258); + for (j=0; best > lengthc[j+1]-1; ++j); + stbi__zlib_huff(j+257); + if (lengtheb[j]) stbi__zlib_add(best - lengthc[j], lengtheb[j]); + for (j=0; d > distc[j+1]-1; ++j); + stbi__zlib_add(stbi__zlib_bitrev(j,5),5); + if (disteb[j]) stbi__zlib_add(d - distc[j], disteb[j]); + i += best; + } else { + stbi__zlib_huffb(data[i]); + ++i; + } + } + // write out final bytes + for (;i < data_len; ++i) + stbi__zlib_huffb(data[i]); + stbi__zlib_huff(256); // end of block + // pad with 0 bits to byte boundary + while (bitcount) + stbi__zlib_add(0,1); + + for (i=0; i < stbi__ZHASH; ++i) + (void) stbi__sbfree(hash_table[i]); + + { + // compute adler32 on input + unsigned int i=0, s1=1, s2=0, blocklen = data_len % 5552; + int j=0; + while (j < data_len) { + for (i=0; i < blocklen; ++i) s1 += data[j+i], s2 += s1; + s1 %= 65521, s2 %= 65521; + j += blocklen; + blocklen = 5552; + } + stbi__sbpush(out, (unsigned char) (s2 >> 8)); + stbi__sbpush(out, (unsigned char) s2); + stbi__sbpush(out, (unsigned char) (s1 >> 8)); + stbi__sbpush(out, (unsigned char) s1); + } + *out_len = stbi__sbn(out); + // make returned pointer freeable + memmove(stbi__sbraw(out), out, *out_len); + return (unsigned char *) stbi__sbraw(out); +} + +unsigned int stbi__crc32(unsigned char *buffer, int len) +{ + static unsigned int crc_table[256]; + unsigned int crc = ~0u; + int i,j; + if (crc_table[1] == 0) + for(i=0; i < 256; i++) + for (crc_table[i]=i, j=0; j < 8; ++j) + crc_table[i] = (crc_table[i] >> 1) ^ (crc_table[i] & 1 ? 0xedb88320 : 0); + for (i=0; i < len; ++i) + crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)]; + return ~crc; +} + +#define stbi__wpng4(o,a,b,c,d) ((o)[0]=(unsigned char)(a),(o)[1]=(unsigned char)(b),(o)[2]=(unsigned char)(c),(o)[3]=(unsigned char)(d),(o)+=4) +#define stbi__wp32(data,v) stbi__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v)); +#define stbi__wptag(data,s) stbi__wpng4(data, s[0],s[1],s[2],s[3]) + +static void stbi__wpcrc(unsigned char **data, int len) +{ + unsigned int crc = stbi__crc32(*data - len - 4, len+4); + stbi__wp32(*data, crc); +} + +static unsigned char stbi__paeth(int a, int b, int c) +{ + int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c); + if (pa <= pb && pa <= pc) return (unsigned char) a; + if (pb <= pc) return (unsigned char) b; + return (unsigned char) c; +} + +unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, int x, int y, int n, int *out_len) +{ + int ctype[5] = { -1, 0, 4, 2, 6 }; + unsigned char sig[8] = { 137,80,78,71,13,10,26,10 }; + unsigned char *out,*o, *filt, *zlib; + signed char *line_buffer; + int i,j,k,p,zlen; + + if (stride_bytes == 0) + stride_bytes = x * n; + + filt = (unsigned char *) malloc((x*n+1) * y); if (!filt) return 0; + line_buffer = (signed char *) malloc(x * n); if (!line_buffer) { free(filt); return 0; } + for (j=0; j < y; ++j) { + static int mapping[] = { 0,1,2,3,4 }; + static int firstmap[] = { 0,1,0,5,6 }; + int *mymap = j ? mapping : firstmap; + int best = 0, bestval = 0x7fffffff; + for (p=0; p < 2; ++p) { + for (k= p?best:0; k < 5; ++k) { + int type = mymap[k],est=0; + unsigned char *z = pixels + stride_bytes*j; + for (i=0; i < n; ++i) + switch (type) { + case 0: line_buffer[i] = z[i]; break; + case 1: line_buffer[i] = z[i]; break; + case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break; + case 3: line_buffer[i] = z[i] - (z[i-stride_bytes]>>1); break; + case 4: line_buffer[i] = (signed char) (z[i] - stbi__paeth(0,z[i-stride_bytes],0)); break; + case 5: line_buffer[i] = z[i]; break; + case 6: line_buffer[i] = z[i]; break; + } + for (i=n; i < x*n; ++i) { + switch (type) { + case 0: line_buffer[i] = z[i]; break; + case 1: line_buffer[i] = z[i] - z[i-n]; break; + case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break; + case 3: line_buffer[i] = z[i] - ((z[i-n] + z[i-stride_bytes])>>1); break; + case 4: line_buffer[i] = z[i] - stbi__paeth(z[i-n], z[i-stride_bytes], z[i-stride_bytes-n]); break; + case 5: line_buffer[i] = z[i] - (z[i-n]>>1); break; + case 6: line_buffer[i] = z[i] - stbi__paeth(z[i-n], 0,0); break; + } + } + if (p) break; + for (i=0; i < x*n; ++i) + est += abs((signed char) line_buffer[i]); + if (est < bestval) { bestval = est; best = k; } + } + } + // when we get here, best contains the filter type, and line_buffer contains the data + filt[j*(x*n+1)] = (unsigned char) best; + memcpy(filt+j*(x*n+1)+1, line_buffer, x*n); + } + free(line_buffer); + zlib = stbi_zlib_compress(filt, y*( x*n+1), &zlen, 8); // increase 8 to get smaller but use more memory + free(filt); + if (!zlib) return 0; + + // each tag requires 12 bytes of overhead + out = (unsigned char *) malloc(8 + 12+13 + 12+zlen + 12); + if (!out) return 0; + *out_len = 8 + 12+13 + 12+zlen + 12; + + o=out; + memcpy(o,sig,8); o+= 8; + stbi__wp32(o, 13); // header length + stbi__wptag(o, "IHDR"); + stbi__wp32(o, x); + stbi__wp32(o, y); + *o++ = 8; + *o++ = (unsigned char) ctype[n]; + *o++ = 0; + *o++ = 0; + *o++ = 0; + stbi__wpcrc(&o,13); + + stbi__wp32(o, zlen); + stbi__wptag(o, "IDAT"); + memcpy(o, zlib, zlen); o += zlen; free(zlib); + stbi__wpcrc(&o, zlen); + + stbi__wp32(o,0); + stbi__wptag(o, "IEND"); + stbi__wpcrc(&o,0); + + assert(o == out + *out_len); + + return out; +} + +int stbi_write_png(char const *filename, int x, int y, int comp, const void *data, int stride_bytes) +{ + FILE *f; + int len; + unsigned char *png = stbi_write_png_to_mem((unsigned char *) data, stride_bytes, x, y, comp, &len); + if (!png) return 0; + f = fopen(filename, "wb"); + if (!f) { free(png); return 0; } + fwrite(png, 1, len, f); + fclose(f); + free(png); + return 1; +} +#endif // STB_IMAGE_WRITE_IMPLEMENTATION + +/* Revision history + + 0.92 (2010-08-01) + casts to unsigned char to fix warnings + 0.91 (2010-07-17) + first public release + 0.90 first internal release +*/ diff --git a/src/text.c b/src/text.c index 5af45f86..f1070a03 100644 --- a/src/text.c +++ b/src/text.c @@ -611,7 +611,7 @@ static SpriteFont LoadRBMF(const char *fileName) printf("Image reconstructed correctly... now converting it to texture..."); - spriteFont.texture = CreateTexture2D(image); + spriteFont.texture = CreateTexture(image); UnloadImage(image); // Unload image data diff --git a/src/textures.c b/src/textures.c index ee073e9a..c0832477 100644 --- a/src/textures.c +++ b/src/textures.c @@ -259,7 +259,7 @@ Texture2D LoadTextureFromRES(const char *rresName, int resId) Texture2D texture; Image image = LoadImageFromRES(rresName, resId); - texture = CreateTexture2D(image); + texture = CreateTexture(image); return texture; } @@ -283,7 +283,7 @@ Texture2D LoadTextureEx(const char *fileName, bool createPOT, bool mipmaps) // Create a Texture2D from Image data // NOTE: Image is not unloaded, it should be done manually... -Texture2D CreateTexture2D(Image image) +Texture2D CreateTexture(Image image) { Texture2D texture; diff --git a/tools/rrem.exe b/tools/rrem.exe index 1d058bf4dd04a56a36c42a00c185e52eac9d01bb..0e816e4b379cfc0f7a169aa11101cd5e2439756d 100644 GIT binary patch delta 12343 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 delta 12368 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