From d8ca13f4c6efbf2511d7f212b0af2716320e3da9 Mon Sep 17 00:00:00 2001 From: Kyle Appelgate Date: Wed, 28 Jul 2021 15:38:31 -0400 Subject: [PATCH 001/570] fixed DisableCursor() on web by registering an empty mouse click event function in emscripten (#1900) --- src/core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/core.c b/src/core.c index 03f60c6d3..ea913dbbe 100644 --- a/src/core.c +++ b/src/core.c @@ -622,6 +622,7 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) #endif #if defined(PLATFORM_WEB) +static EM_BOOL EmscriptenMouseCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData); static EM_BOOL EmscriptenTouchCallback(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData); static EM_BOOL EmscriptenGamepadCallback(int eventType, const EmscriptenGamepadEvent *gamepadEvent, void *userData); static EM_BOOL EmscriptenResizeCallback(int eventType, const EmscriptenUiEvent *e, void *userData); @@ -823,6 +824,9 @@ void InitWindow(int width, int height, const char *title) //emscripten_set_keypress_callback("#canvas", NULL, 1, EmscriptenKeyboardCallback); //emscripten_set_keydown_callback("#canvas", NULL, 1, EmscriptenKeyboardCallback); + // Support mouse events + emscripten_set_click_callback("#canvas", NULL, 1, EmscriptenMouseCallback); + // Support touch events emscripten_set_touchstart_callback("#canvas", NULL, 1, EmscriptenTouchCallback); emscripten_set_touchend_callback("#canvas", NULL, 1, EmscriptenTouchCallback); @@ -5315,6 +5319,13 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) #endif #if defined(PLATFORM_WEB) +// Register mouse input events +static EM_BOOL EmscriptenMouseCallback(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData) +{ + // This is only for registering mouse click events with emscripten and doesn't need to do anything + return 0; +} + // Register touch input events static EM_BOOL EmscriptenTouchCallback(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData) { From cd1464390c7079d672053f2cebf46a915cb67fd2 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 29 Jul 2021 12:11:12 +0200 Subject: [PATCH 002/570] Update CONVENTIONS.md --- CONVENTIONS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONVENTIONS.md b/CONVENTIONS.md index f963f1e05..e47a1e841 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -8,7 +8,7 @@ Defines | ALL_CAPS | `#define PLATFORM_DESKTOP` Macros | ALL_CAPS | `#define MIN(a,b) (((a)<(b))?(a):(b))` Variables | lowerCase | `int screenWidth = 0;`, `float targetFrameTime = 0.016f;` Local variables | lowerCase | `Vector2 playerPosition = { 0 };` -Global variables | lowerCase | `bool fullscreen = false;` +Global variables | lowerCase | `bool windowReady = false;` Constants | lowerCase | `const int maxValue = 8;` Pointers | MyType *pointer | `Texture2D *array = NULL;` float values | always x.xf | `float gravity = 10.0f` From a9f6ff6fe38cff24dd4642f67d6fed42b003c879 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 29 Jul 2021 20:32:30 +0200 Subject: [PATCH 003/570] Add external folder to build (just in case) --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 3a90dd92a..88570d405 100644 --- a/src/Makefile +++ b/src/Makefile @@ -385,7 +385,7 @@ endif # Define include paths for required headers # NOTE: Several external required libraries (stb and others) -INCLUDE_PATHS = -I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw +INCLUDE_PATHS = -I. -Iexternal -Iexternal/glfw/include -Iexternal/glfw/deps/mingw ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),BSD) From 6ef3ab3d3ac98f2e8a77b4bd065008d2ce9d7e8f Mon Sep 17 00:00:00 2001 From: iskolbin Date: Thu, 29 Jul 2021 21:37:44 +0300 Subject: [PATCH 004/570] impoves raylib_parser: makes it generic, adds -d key for functions define (RLAPI for raylib.h), increases maxiumum number of fields in structs and values in enums, doubles max length of struct field names; split float3/float16 struct typedefs in raymath to allow parser to process the file (#1901) --- parser/raylib_parser.c | 58 ++++++++++++++++++++++++++---------------- src/raymath.h | 9 +++++-- 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/parser/raylib_parser.c b/parser/raylib_parser.c index 4720af912..3e5db1ae2 100644 --- a/parser/raylib_parser.c +++ b/parser/raylib_parser.c @@ -70,6 +70,10 @@ #define MAX_LINE_LENGTH 512 // Maximum length of one line (including comments) #define MAX_STRUCT_LINE_LENGTH 2048 // Maximum length of one struct (multiple lines) +#define MAX_FUNCTION_PARAMETERS 12 // Maximum number of function parameters +#define MAX_STRUCT_FIELDS 32 // Maximum number of struct fields +#define MAX_ENUM_VALUES 512 // Maximum number of enum values + //---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- @@ -79,9 +83,9 @@ typedef struct FunctionInfo { char desc[128]; // Function description (comment at the end) char retType[32]; // Return value type int paramCount; // Number of function parameters - char paramType[12][32]; // Parameters type (max: 12 parameters) - char paramName[12][32]; // Parameters name (max: 12 parameters) - char paramDesc[12][8]; // Parameters description (max: 12 parameters) + char paramType[MAX_FUNCTION_PARAMETERS][32]; // Parameters type + char paramName[MAX_FUNCTION_PARAMETERS][32]; // Parameters name + char paramDesc[MAX_FUNCTION_PARAMETERS][8]; // Parameters description } FunctionInfo; // Struct info data @@ -89,9 +93,9 @@ typedef struct StructInfo { char name[64]; // Struct name char desc[64]; // Struct type description int fieldCount; // Number of fields in the struct - char fieldType[16][32]; // Field type (max: 16 fields) - char fieldName[16][32]; // Field name (max: 16 fields) - char fieldDesc[16][128]; // Field description (max: 16 fields) + char fieldType[MAX_STRUCT_FIELDS][64]; // Field type + char fieldName[MAX_STRUCT_FIELDS][64]; // Field name + char fieldDesc[MAX_STRUCT_FIELDS][128]; // Field description } StructInfo; // Enum info data @@ -99,9 +103,9 @@ typedef struct EnumInfo { char name[64]; // Enum name char desc[64]; // Enum description int valueCount; // Number of values in enumerator - char valueName[128][64]; // Value name definition (max: 128 values) - int valueInteger[128]; // Value integer (max: 128 values) - char valueDesc[128][64]; // Value description (max: 128 values) + char valueName[MAX_ENUM_VALUES][64]; // Value name definition + int valueInteger[MAX_ENUM_VALUES]; // Value integer + char valueDesc[MAX_ENUM_VALUES][64]; // Value description } EnumInfo; // Output format for parsed data @@ -116,6 +120,7 @@ static int enumCount = 0; static FunctionInfo *funcs = NULL; static StructInfo *structs = NULL; static EnumInfo *enums = NULL; +static char apiDefine[32] = "RLAPI\0"; // Command line variables static char inFileName[512] = { 0 }; // Input file name (required in case of provided through CLI) @@ -171,8 +176,8 @@ int main(int argc, char* argv[]) // Read function lines for (int i = 0; i < linesCount; i++) { - // Read function line (starting with "RLAPI") - if (IsTextEqual(lines[i], "RLAPI", 5)) + // Read function line (starting with `define`, i.e. for raylib.h "RLAPI") + if (IsTextEqual(lines[i], apiDefine, TextLength(apiDefine))) { // Keep a pointer to the function line funcLines[funcCount] = lines[i]; @@ -217,12 +222,6 @@ int main(int argc, char* argv[]) j++; } - while (buffer[i + j] != '}') - { - structLines[structCount][j] = buffer[i + j]; - j++; - } - while (buffer[i + j] != '\n') { structLines[structCount][j] = buffer[i + j]; @@ -238,7 +237,7 @@ int main(int argc, char* argv[]) // Read enum lines for (int i = 0; i < linesCount; i++) { - // Read function line (starting with "RLAPI") + // Read enum line if (IsTextEqual(lines[i], "typedef enum {", 14)) { // Keep the line position in the array of lines, @@ -335,7 +334,7 @@ int main(int argc, char* argv[]) { // TODO: Get enum description from lines[enumLines[i] - 1] - for (int j = 1; j < 256; j++) // Maximum number of lines following enum first line + for (int j = 1; j < MAX_ENUM_VALUES*2; j++) // Maximum number of lines following enum first line { char *linePtr = lines[enumLines[i] + j]; @@ -428,8 +427,9 @@ int main(int argc, char* argv[]) // At this point we have function return type and function name char funcRetTypeName[128] = { 0 }; - int funcRetTypeNameLen = c - 6; // Substract "RLAPI " - MemoryCopy(funcRetTypeName, &funcLines[i][6], funcRetTypeNameLen); + int dc = TextLength(apiDefine) + 1; + int funcRetTypeNameLen = c - dc; // Substract `define` ("RLAPI " for raylib.h) + MemoryCopy(funcRetTypeName, &funcLines[i][dc], funcRetTypeNameLen); GetDataTypeAndName(funcRetTypeName, funcRetTypeNameLen, funcs[i].retType, funcs[i].name); break; @@ -525,7 +525,7 @@ static void ShowCommandLineInfo(void) printf("//////////////////////////////////////////////////////////////////////////////////\n\n"); printf("USAGE:\n\n"); - printf(" > raylib_parser [--help] [--input ] [--output ] [--format ]\n"); + printf(" > raylib_parser [--help] [--input ] [--output ] [--format ] [--define ]\n"); printf("\nOPTIONS:\n\n"); printf(" -h, --help : Show tool version and command line usage help\n\n"); @@ -536,12 +536,16 @@ static void ShowCommandLineInfo(void) printf(" NOTE: If not specified, defaults to: raylib_api.txt\n\n"); printf(" -f, --format : Define output format for parser data.\n"); printf(" Supported types: DEFAULT, JSON, XML\n\n"); + printf(" -d, --define : Define functions define (i.e. RLAPI for raylib.h, RMDEF for raymath.h, etc\n"); + printf(" NOTE: If not specified, defaults to: RLAPI\n\n"); printf("\nEXAMPLES:\n\n"); printf(" > raylib_parser --input raylib.h --output api.json\n"); printf(" Process to generate \n\n"); printf(" > raylib_parser --output raylib_data.info --format XML\n"); printf(" Process to generate as XML text data\n\n"); + printf(" > raylib_parser --input raymath.h --output raymath_data.info --format XML\n"); + printf(" Process to generate as XML text data\n\n"); } // Process command line arguments @@ -583,6 +587,16 @@ static void ProcessCommandLine(int argc, char *argv[]) } else printf("WARNING: No format parameters provided\n"); } + else if (IsTextEqual(argv[i], "-d", 2) || IsTextEqual(argv[i], "--define", 8)) + { + if (((i + 1) < argc) && (argv[i + 1][0] != '-')) + { + MemoryCopy(apiDefine, argv[i + 1], TextLength(argv[i + 1])); // Read functions define + apiDefine[TextLength(argv[i + 1])] = '\0'; + i++; + } + else printf("WARNING: No define key provided\n"); + } } } diff --git a/src/raymath.h b/src/raymath.h index cc2cda822..3b65e382e 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -135,8 +135,13 @@ #endif // NOTE: Helper types to be used instead of array return types for *ToFloat functions -typedef struct float3 { float v[3]; } float3; -typedef struct float16 { float v[16]; } float16; +typedef struct float3 { + float v[3]; +} float3; + +typedef struct float16 { + float v[16]; +} float16; #include // Required for: sinf(), cosf(), tan(), atan2f(), sqrtf(), fminf(), fmaxf(), fabs() From 58e9a0894f65a50004e637f7db72bd12da809cd9 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 29 Jul 2021 21:50:50 +0200 Subject: [PATCH 005/570] Reviewed some functions to avoid calling other functions --- src/raymath.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/raymath.h b/src/raymath.h index 3b65e382e..ffdd2c274 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raymath v1.2 - Math functions to work with Vector3, Matrix and Quaternions +* raymath v1.3 - Math functions to work with Vector3, Matrix and Quaternions * * CONFIGURATION: * @@ -488,14 +488,14 @@ RMDEF Vector3 Vector3Normalize(Vector3 v) { Vector3 result = v; - float length, ilength; - length = Vector3Length(v); + float length, inverseLength; + length = sqrtf(v.x*v.x + v.y*v.y + v.z*v.z); if (length == 0.0f) length = 1.0f; - ilength = 1.0f/length; + inverseLength = 1.0f/length; - result.x *= ilength; - result.y *= ilength; - result.z *= ilength; + result.x *= inverseLength; + result.y *= inverseLength; + result.z *= inverseLength; return result; } @@ -1429,8 +1429,9 @@ RMDEF Matrix QuaternionToMatrix(Quaternion q) RMDEF Quaternion QuaternionFromAxisAngle(Vector3 axis, float angle) { Quaternion result = { 0.0f, 0.0f, 0.0f, 1.0f }; - - if (Vector3Length(axis) != 0.0f) + float axisLength = sqrtf(axis.x*axis.x + axis.y*axis.y + axis.z*axis.z); + + if (axisLength != 0.0f) { angle *= 0.5f; From 8b7f43f89b88c75f7353fe85f7cb6465ad6be7b5 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 29 Jul 2021 21:57:50 +0200 Subject: [PATCH 006/570] WARNING: BREAKING CHANGE: rlgl complete decoupling from raylib -WIP- rlgl has been redesigned to avoid any dependency to `raylib` or `raymath`, all functions using some of those libs have been reviewed. - REMOVED: `Texture2D`, `Shader` structs dependency - REMOVED: `Vector3`, `Matrix` structs dependency - REMOVED: raymath functions dependency, all required math is implemented in rlgl - ADDED: `rlMatrix` custom rlgl type - ADDED: `utils.c`: `rlMatrixFromMatrix()` and `rlMatrixToMatrix()` for a safe conversion between raylib<->rlgl matrix types - ADDED: `rl` prefix to all `rlgl` structs - Other small tweaks here and there --- examples/others/rlgl_standalone.c | 51 +- src/core.c | 34 +- src/models.c | 71 +-- src/raudio.c | 2 +- src/raylib.h | 3 +- src/rlgl.h | 743 ++++++++++++++++++------------ src/shapes.c | 2 +- src/textures.c | 17 +- src/utils.c | 23 + src/utils.h | 5 + 10 files changed, 595 insertions(+), 356 deletions(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index 0a5cb5096..a069d0296 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -50,8 +50,11 @@ #define RLGL_IMPLEMENTATION #define RLGL_STANDALONE -#define RLGL_SUPPORT_TRACELOG -#include "rlgl.h" // OpenGL 1.1 immediate-mode style coding +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 + +#define RAYMATH_STANDALONE +#define RAYMATH_HEADER_ONLY +#include "raymath.h" // Vector3, Quaternion and Matrix functionality #if defined(__EMSCRIPTEN__) #define GLFW_INCLUDE_ES2 @@ -65,6 +68,9 @@ #define RAYWHITE (Color){ 245, 245, 245, 255 } // My own White (raylib logo) #define DARKGRAY (Color){ 80, 80, 80, 255 } // Dark Gray +//---------------------------------------------------------------------------------- +// Structures Definition +//---------------------------------------------------------------------------------- // Color, 4 components, R8G8B8A8 (32bit) typedef struct Color { unsigned char r; // Color red value @@ -73,6 +79,21 @@ typedef struct Color { unsigned char a; // Color alpha value } Color; +#if !defined(RAYMATH_STANDALONE) +// Vector2, 2 components +typedef struct Vector2 { + float x; // Vector x component + float y; // Vector y component +} Vector2; + +// Vector3, 3 components +typedef struct Vector3 { + float x; // Vector x component + float y; // Vector y component + float z; // Vector z component +} Vector3; +#endif + // Camera type, defines a camera position/orientation in 3d space typedef struct Camera { Vector3 position; // Camera position @@ -94,6 +115,24 @@ static void DrawCube(Vector3 position, float width, float height, float length, static void DrawCubeWires(Vector3 position, float width, float height, float length, Color color); static void DrawRectangleV(Vector2 position, Vector2 size, Color color); +// NOTE: We used raymath to get this functionality but it can be implemented here +//static rlMatrix MatrixIdentity(void); +//static rlMatrix MatrixOrtho(double left, double right, double bottom, double top, double near, double far); +//static rlMatrix MatrixPerspective(double fovy, double aspect, double near, double far); +//static rlMatrix MatrixLookAt(Vector3 eye, Vector3 target, Vector3 up); + +rlMatrix rlMatrixFromMatrix(Matrix mat) +{ + rlMatrix result = { + mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) + mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) + mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) + mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) + }; + + return result; +} + //---------------------------------------------------------------------------------- // Main Entry point //---------------------------------------------------------------------------------- @@ -187,8 +226,8 @@ int main(void) Matrix matProj = MatrixPerspective((double)(camera.fovy*DEG2RAD), (double)screenWidth/(double)screenHeight, 0.01, 1000.0); Matrix matView = MatrixLookAt(camera.position, camera.target, camera.up); - rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) - rlSetMatrixProjection(matProj); // Set internal projection matrix (default shader) + rlSetMatrixModelview(rlMatrixFromMatrix(matView)); // Set internal modelview matrix (default shader) + rlSetMatrixProjection(rlMatrixFromMatrix(matProj)); // Set internal projection matrix (default shader) DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED); DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, RAYWHITE); @@ -205,8 +244,8 @@ int main(void) matProj = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0); matView = MatrixIdentity(); - rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) - rlSetMatrixProjection(matProj); // Set internal projection matrix (default shader) + rlSetMatrixModelview(rlMatrixFromMatrix(matView)); // Set internal modelview matrix (default shader) + rlSetMatrixProjection(rlMatrixFromMatrix(matProj)); // Set internal projection matrix (default shader) #else // Let rlgl generate and multiply matrix internally diff --git a/src/core.c b/src/core.c index ea913dbbe..8ccc1e083 100644 --- a/src/core.c +++ b/src/core.c @@ -119,19 +119,14 @@ #include "config.h" // Defines module configuration flags #endif -#include "utils.h" // TRACELOG macros +#include "utils.h" // Required for: TRACELOG() macros -#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L - #undef _POSIX_C_SOURCE - #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. -#endif +#define RLGL_IMPLEMENTATION +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 #define RAYMATH_IMPLEMENTATION // Define external out-of-line implementation #include "raymath.h" // Vector3, Quaternion and Matrix functionality -#define RLGL_IMPLEMENTATION -#include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 - #if defined(SUPPORT_GESTURES_SYSTEM) #define GESTURES_IMPLEMENTATION #include "gestures.h" // Gestures detection functionality @@ -159,6 +154,11 @@ #include "external/sdefl.h" // Deflate (RFC 1951) compressor #endif +#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L + #undef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. +#endif + #include // Required for: srand(), rand(), atexit() #include // Required for: sprintf() [Used in OpenURL()] #include // Required for: strrchr(), strcmp(), strlen() @@ -795,8 +795,10 @@ void InitWindow(int width, int height, const char *title) // NOTE: We setup a 1px padding on char rectangle to avoid pixel bleeding on MSAA filtering SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 1, rec.y + 1, rec.width - 2, rec.height - 2 }); #else - // Set default internal texture (1px white) and rectangle to be used for shapes drawing - SetShapesTexture(rlGetTextureDefault(), (Rectangle){ 0.0f, 0.0f, 1.0f, 1.0f }); + // Set default texture and rectangle to be used for shapes drawing + // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8 + Texture2D texture = { rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; + SetShapesTexture(texture, (Rectangle){ 0.0f, 0.0f, 1.0f, 1.0f }); #endif #if defined(PLATFORM_DESKTOP) if ((CORE.Window.flags & FLAG_WINDOW_HIGHDPI) > 0) @@ -2138,13 +2140,13 @@ void EndTextureMode(void) // Begin custom shader mode void BeginShaderMode(Shader shader) { - rlSetShader(shader); + rlSetShader(shader.id, shader.locs); } // End custom shader mode (returns to default shader) void EndShaderMode(void) { - rlSetShader(rlGetShaderDefault()); + rlSetShader(rlGetShaderIdDefault(), rlGetShaderLocsDefault()); } // Begin blending mode (alpha, additive, multiplied, subtract, custom) @@ -2183,8 +2185,8 @@ void BeginVrStereoMode(VrStereoConfig config) rlEnableStereoRender(); // Set stereo render matrices - rlSetMatrixProjectionStereo(config.projection[0], config.projection[1]); - rlSetMatrixViewOffsetStereo(config.viewOffset[0], config.viewOffset[1]); + rlSetMatrixProjectionStereo(rlMatrixFromMatrix(config.projection[0]), rlMatrixFromMatrix(config.projection[1])); + rlSetMatrixViewOffsetStereo(rlMatrixFromMatrix(config.viewOffset[0]), rlMatrixFromMatrix(config.viewOffset[1])); } // End VR drawing process (and desktop mirror) @@ -2342,7 +2344,7 @@ RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode) // Unload shader from GPU memory (VRAM) void UnloadShader(Shader shader) { - if (shader.id != rlGetShaderDefault().id) + if (shader.id != rlGetShaderIdDefault()) { rlUnloadShaderProgram(shader.id); RL_FREE(shader.locs); @@ -2379,7 +2381,7 @@ void SetShaderValueV(Shader shader, int locIndex, const void *value, int uniform void SetShaderValueMatrix(Shader shader, int locIndex, Matrix mat) { rlEnableShader(shader.id); - rlSetUniformMatrix(locIndex, mat); + rlSetUniformMatrix(locIndex, rlMatrixFromMatrix(mat)); //rlDisableShader(); } diff --git a/src/models.c b/src/models.c index 3d200d2ae..466e2ad7c 100644 --- a/src/models.c +++ b/src/models.c @@ -40,26 +40,18 @@ // Check if config flags have been externally provided on compilation line #if !defined(EXTERNAL_CONFIG_FLAGS) - #include "config.h" // Defines module configuration flags + #include "config.h" // Defines module configuration flags #endif -#include "utils.h" // Required for: LoadFileData(), LoadFileText(), SaveFileText() +#include "utils.h" // Required for: TRACELOG(), LoadFileData(), LoadFileText(), SaveFileText() +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 +#include "raymath.h" // Required for: Vector3, Quaternion and Matrix functionality #include // Required for: sprintf() #include // Required for: malloc(), free() #include // Required for: memcmp(), strlen() #include // Required for: sinf(), cosf(), sqrtf(), fabsf() -#if defined(_WIN32) - #include // Required for: _chdir() [Used in LoadOBJ()] - #define CHDIR _chdir -#else - #include // Required for: chdir() (POSIX) [Used in LoadOBJ()] - #define CHDIR chdir -#endif - -#include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 - #if defined(SUPPORT_FILEFORMAT_OBJ) || defined(SUPPORT_FILEFORMAT_MTL) #define TINYOBJ_MALLOC RL_MALLOC #define TINYOBJ_CALLOC RL_CALLOC @@ -89,6 +81,14 @@ #include "external/par_shapes.h" // Shapes 3d parametric generation #endif +#if defined(_WIN32) + #include // Required for: _chdir() [Used in LoadOBJ()] + #define CHDIR _chdir +#else + #include // Required for: chdir() (POSIX) [Used in LoadOBJ()] + #define CHDIR chdir +#endif + //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- @@ -1051,13 +1051,13 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // That's because BeginMode3D() sets it and there is no model-drawing function // that modifies it, all use rlPushMatrix() and rlPopMatrix() Matrix matModel = MatrixIdentity(); - Matrix matView = rlGetMatrixModelview(); + Matrix matView = rlMatrixToMatrix(rlGetMatrixModelview()); Matrix matModelView = MatrixIdentity(); - Matrix matProjection = rlGetMatrixProjection(); + Matrix matProjection = rlMatrixToMatrix(rlGetMatrixProjection()); // Upload view and projection matrices (if locations available) - if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], matView); - if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], matProjection); + if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], rlMatrixFromMatrix(matView)); + if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], rlMatrixFromMatrix(matProjection)); if (instancing) { @@ -1089,24 +1089,24 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // Accumulate internal matrix transform (push/pop) and view matrix // NOTE: In this case, model instance transformation must be computed in the shader - matModelView = MatrixMultiply(rlGetMatrixTransform(), matView); + matModelView = MatrixMultiply(rlMatrixToMatrix(rlGetMatrixTransform()), matView); } else { // Model transformation matrix is send to shader uniform location: SHADER_LOC_MATRIX_MODEL - if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], transforms[0]); + if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], rlMatrixFromMatrix(transforms[0])); // Accumulate several model transformations: // transforms[0]: model transformation provided (includes DrawModel() params combined with model.transform) // rlGetMatrixTransform(): rlgl internal transform matrix due to push/pop matrix stack - matModel = MatrixMultiply(transforms[0], rlGetMatrixTransform()); + matModel = MatrixMultiply(transforms[0], rlMatrixToMatrix(rlGetMatrixTransform())); // Get model-view matrix matModelView = MatrixMultiply(matModel, matView); } // Upload model normal matrix (if locations available) - if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], MatrixTranspose(MatrixInvert(matModel))); + if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], rlMatrixFromMatrix(MatrixTranspose(MatrixInvert(matModel)))); //----------------------------------------------------- // Bind active texture maps (if available) @@ -1199,11 +1199,11 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins { // Setup current eye viewport (half screen width) rlViewport(eye*rlGetFramebufferWidth()/2, 0, rlGetFramebufferWidth()/2, rlGetFramebufferHeight()); - matModelViewProjection = MatrixMultiply(MatrixMultiply(matModelView, rlGetMatrixViewOffsetStereo(eye)), rlGetMatrixProjectionStereo(eye)); + matModelViewProjection = MatrixMultiply(MatrixMultiply(matModelView, rlMatrixToMatrix(rlGetMatrixViewOffsetStereo(eye))), rlMatrixToMatrix(rlGetMatrixProjectionStereo(eye))); } // Send combined model-view-projection matrix to shader - rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], matModelViewProjection); + rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], rlMatrixFromMatrix(matModelViewProjection)); if (instancing) // Draw mesh instanced { @@ -1247,8 +1247,8 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins else { // Restore rlgl internal modelview and projection matrices - rlSetMatrixModelview(matView); - rlSetMatrixProjection(matProjection); + rlSetMatrixModelview(rlMatrixFromMatrix(matView)); + rlSetMatrixProjection(rlMatrixFromMatrix(matProjection)); } #endif } @@ -1371,7 +1371,11 @@ Material *LoadMaterials(const char *fileName, int *materialCount) // Set materials shader to default (DIFFUSE, SPECULAR, NORMAL) if (materials != NULL) { - for (unsigned int i = 0; i < count; i++) materials[i].shader = rlGetShaderDefault(); + for (unsigned int i = 0; i < count; i++) + { + materials[i].shader.id = rlGetShaderIdDefault(); + materials[i].shader.locs = rlGetShaderLocsDefault(); + } } *materialCount = count; @@ -1384,8 +1388,12 @@ Material LoadMaterialDefault(void) Material material = { 0 }; material.maps = (MaterialMap *)RL_CALLOC(MAX_MATERIAL_MAPS, sizeof(MaterialMap)); - material.shader = rlGetShaderDefault(); - material.maps[MATERIAL_MAP_DIFFUSE].texture = rlGetTextureDefault(); // White texture (1x1 pixel) + // Using rlgl default shader + material.shader.id = rlGetShaderIdDefault(); + material.shader.locs = rlGetShaderLocsDefault(); + + // Using rlgl default texture (1x1 pixel, UNCOMPRESSED_R8G8B8A8, 1 mipmap) + material.maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; //material.maps[MATERIAL_MAP_NORMAL].texture; // NOTE: By default, not set //material.maps[MATERIAL_MAP_SPECULAR].texture; // NOTE: By default, not set @@ -1399,12 +1407,12 @@ Material LoadMaterialDefault(void) void UnloadMaterial(Material material) { // Unload material shader (avoid unloading default shader, managed by raylib) - if (material.shader.id != rlGetShaderDefault().id) UnloadShader(material.shader); + if (material.shader.id != rlGetShaderIdDefault()) UnloadShader(material.shader); // Unload loaded texture maps (avoid unloading default texture, managed by raylib) for (int i = 0; i < MAX_MATERIAL_MAPS; i++) { - if (material.maps[i].texture.id != rlGetTextureDefault().id) rlUnloadTexture(material.maps[i].texture.id); + if (material.maps[i].texture.id != rlGetTextureIdDefault()) rlUnloadTexture(material.maps[i].texture.id); } RL_FREE(material.maps); @@ -3400,10 +3408,11 @@ static Model LoadOBJ(const char *fileName) // NOTE: Uses default shader, which only supports MATERIAL_MAP_DIFFUSE model.materials[m] = LoadMaterialDefault(); - model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = rlGetTextureDefault(); // Get default texture, in case no texture is defined + // Get default texture, in case no texture is defined + // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8 + model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; if (materials[m].diffuse_texname != NULL) model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = LoadTexture(materials[m].diffuse_texname); //char *diffuse_texname; // map_Kd - else model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = rlGetTextureDefault(); model.materials[m].maps[MATERIAL_MAP_DIFFUSE].color = (Color){ (unsigned char)(materials[m].diffuse[0]*255.0f), (unsigned char)(materials[m].diffuse[1]*255.0f), (unsigned char)(materials[m].diffuse[2]*255.0f), 255 }; //float diffuse[3]; model.materials[m].maps[MATERIAL_MAP_DIFFUSE].value = 0.0f; diff --git a/src/raudio.c b/src/raudio.c index e35215bfa..e25d153a8 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -173,7 +173,7 @@ typedef struct tagBITMAPINFOHEADER { #if defined(RAUDIO_STANDALONE) #include // Required for: strcmp() [Used in IsFileExtension()] - #if !defined(TRACELOG) + #ifndef TRACELOG #define TRACELOG(level, ...) (void)0 #endif diff --git a/src/raylib.h b/src/raylib.h index 738feb53d..e70dad777 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -22,7 +22,7 @@ * * NOTES: * One default Font is loaded on InitWindow()->LoadFontDefault() [core, text] -* One default Texture2D is loaded on rlglInit() [rlgl] (OpenGL 3.3 or ES2) +* One default Texture2D is loaded on rlglInit(), 1x1 white pixel R8G8B8A8 [rlgl] (OpenGL 3.3 or ES2) * One default Shader is loaded on rlglInit()->rlLoadShaderDefault() [rlgl] (OpenGL 3.3 or ES2) * One default RenderBatch is loaded on rlglInit()->rlLoadRenderBatch() [rlgl] (OpenGL 3.3 or ES2) * @@ -1315,6 +1315,7 @@ RLAPI void UnloadFont(Font font); RLAPI void DrawFPS(int posX, int posY); // Draw current FPS RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters +//RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) diff --git a/src/rlgl.h b/src/rlgl.h index 93227c2be..8edccf2d7 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1,6 +1,6 @@ /********************************************************************************************** * -* rlgl v3.7 - raylib OpenGL abstraction layer +* rlgl v4.0 - OpenGL abstraction layer * * rlgl is a wrapper for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) to * pseudo-OpenGL 1.1 style functions (rlVertex, rlTranslate, rlRotate...). @@ -25,14 +25,14 @@ * If not defined, the library is in header only mode and can be included in other headers * or source files without problems. But only ONE file should hold the implementation. * -* #define RLGL_STANDALONE -* Use rlgl as standalone library (no raylib dependency) +* #define SUPPORT_RENDER_TEXTURES_HINT +* Enable framebuffer objects (fbo) support (enabled by default) +* Some GPUs could not support them despite the OpenGL version * * #define SUPPORT_GL_DETAILS_INFO * Show OpenGL extensions and capabilities detailed logs on init * * DEPENDENCIES: -* raymath - 3D math functionality (Vector3, Matrix, Quaternion) * GLAD - OpenGL extensions loading (OpenGL 3.3 Core only) * * @@ -60,44 +60,39 @@ #ifndef RLGL_H #define RLGL_H -#if defined(RLGL_STANDALONE) - #define RAYMATH_STANDALONE - #define RAYMATH_HEADER_ONLY +#define SUPPORT_RENDER_TEXTURES_HINT +#ifndef RLAPI #define RLAPI // We are building or using rlgl as a static library (or Linux shared library) - - #if defined(_WIN32) - #if defined(BUILD_LIBTYPE_SHARED) - #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll) - #elif defined(USE_LIBTYPE_SHARED) - #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll) - #endif - #endif - - // Support TRACELOG macros - #if !defined(TRACELOG) - #define TRACELOG(level, ...) (void)0 - #define TRACELOGD(...) (void)0 - #endif - - // Allow custom memory allocators - #ifndef RL_MALLOC - #define RL_MALLOC(sz) malloc(sz) - #endif - #ifndef RL_CALLOC - #define RL_CALLOC(n,sz) calloc(n,sz) - #endif - #ifndef RL_REALLOC - #define RL_REALLOC(n,sz) realloc(n,sz) - #endif - #ifndef RL_FREE - #define RL_FREE(p) free(p) - #endif -#else - #include "raylib.h" // Required for: Shader, Texture2D #endif -#include "raymath.h" // Required for: Vector3, Matrix +#if defined(_WIN32) + #if defined(BUILD_LIBTYPE_SHARED) + #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll) + #elif defined(USE_LIBTYPE_SHARED) + #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll) + #endif +#endif + +// Support TRACELOG macros +#ifndef TRACELOG + #define TRACELOG(level, ...) (void)0 + #define TRACELOGD(...) (void)0 +#endif + +// Allow custom memory allocators +#ifndef RL_MALLOC + #define RL_MALLOC(sz) malloc(sz) +#endif +#ifndef RL_CALLOC + #define RL_CALLOC(n,sz) calloc(n,sz) +#endif +#ifndef RL_REALLOC + #define RL_REALLOC(n,sz) realloc(n,sz) +#endif +#ifndef RL_FREE + #define RL_FREE(p) free(p) +#endif // Security check in case no GRAPHICS_API_OPENGL_* defined #if !defined(GRAPHICS_API_OPENGL_11) && \ @@ -126,8 +121,6 @@ #define GRAPHICS_API_OPENGL_33 #endif -#define SUPPORT_RENDER_TEXTURES_HINT - //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- @@ -155,9 +148,9 @@ #define MAX_BATCH_ACTIVE_TEXTURES 4 // Maximum number of additional textures that can be activated on batch drawing (SetShaderValueTexture()) #endif -// Internal Matrix stack +// Internal rlMatrix stack #ifndef MAX_MATRIX_STACK_SIZE - #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of Matrix stack + #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of rlMatrix stack #endif // Vertex buffers id limit @@ -200,7 +193,7 @@ #define RL_TEXTURE_WRAP_MIRROR_REPEAT 0x8370 // GL_MIRRORED_REPEAT #define RL_TEXTURE_WRAP_MIRROR_CLAMP 0x8742 // GL_MIRROR_CLAMP_EXT -// Matrix modes (equivalent to OpenGL) +// rlMatrix modes (equivalent to OpenGL) #define RL_MODELVIEW 0x1700 // GL_MODELVIEW #define RL_PROJECTION 0x1701 // GL_PROJECTION #define RL_TEXTURE 0x1702 // GL_TEXTURE @@ -217,7 +210,12 @@ //---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- -typedef enum { OPENGL_11 = 1, OPENGL_21, OPENGL_33, OPENGL_ES_20 } GlVersion; +typedef enum { + OPENGL_11 = 1, + OPENGL_21, + OPENGL_33, + OPENGL_ES_20 +} rlGlVersion; typedef enum { RL_ATTACHMENT_COLOR_CHANNEL0 = 0, @@ -230,7 +228,7 @@ typedef enum { RL_ATTACHMENT_COLOR_CHANNEL7, RL_ATTACHMENT_DEPTH = 100, RL_ATTACHMENT_STENCIL = 200, -} FramebufferAttachType; +} rlFramebufferAttachType; typedef enum { RL_ATTACHMENT_CUBEMAP_POSITIVE_X = 0, @@ -241,10 +239,19 @@ typedef enum { RL_ATTACHMENT_CUBEMAP_NEGATIVE_Z, RL_ATTACHMENT_TEXTURE2D = 100, RL_ATTACHMENT_RENDERBUFFER = 200, -} FramebufferAttachTextureType; +} rlFramebufferAttachTextureType; + +// rlMatrix, 4x4 components, column major, OpenGL style, right handed +// NOTE: This struct is aligned with raylib struct Matrix +typedef struct rlMatrix { + float m0, m4, m8, m12; // Matrix first row (4 components) + float m1, m5, m9, m13; // Matrix second row (4 components) + float m2, m6, m10, m14; // Matrix third row (4 components) + float m3, m7, m11, m15; // Matrix fourth row (4 components) +} rlMatrix; // Dynamic vertex buffers (position + texcoords + colors + indices arrays) -typedef struct VertexBuffer { +typedef struct rlVertexBuffer { int elementsCount; // Number of elements in the buffer (QUADS) int vCounter; // Vertex position counter to process (and draw) from full buffer @@ -262,57 +269,43 @@ typedef struct VertexBuffer { #endif unsigned int vaoId; // OpenGL Vertex Array Object id unsigned int vboId[4]; // OpenGL Vertex Buffer Objects id (4 types of vertex data) -} VertexBuffer; +} rlVertexBuffer; // Draw call type // NOTE: Only texture changes register a new draw, other state-change-related elements are not // used at this moment (vaoId, shaderId, matrices), raylib just forces a batch draw call if any // of those state-change happens (this is done in core module) -typedef struct DrawCall { +typedef struct rlDrawCall { int mode; // Drawing mode: LINES, TRIANGLES, QUADS int vertexCount; // Number of vertex of the draw int vertexAlignment; // Number of vertex required for index alignment (LINES, TRIANGLES) //unsigned int vaoId; // Vertex array id to be used on the draw -> Using RLGL.currentBatch->vertexBuffer.vaoId - //unsigned int shaderId; // Shader id to be used on the draw -> Using RLGL.currentShader.id + //unsigned int shaderId; // Shader id to be used on the draw -> Using RLGL.currentShaderId unsigned int textureId; // Texture id to be used on the draw -> Use to create new draw call if changes - //Matrix projection; // Projection matrix for this draw -> Using RLGL.projection by default - //Matrix modelview; // Modelview matrix for this draw -> Using RLGL.modelview by default -} DrawCall; + //rlMatrix projection; // Projection matrix for this draw -> Using RLGL.projection by default + //rlMatrix modelview; // Modelview matrix for this draw -> Using RLGL.modelview by default +} rlDrawCall; -// RenderBatch type -typedef struct RenderBatch { +// rlRenderBatch type +typedef struct rlRenderBatch { int buffersCount; // Number of vertex buffers (multi-buffering support) int currentBuffer; // Current buffer tracking in case of multi-buffering - VertexBuffer *vertexBuffer; // Dynamic buffer(s) for vertex data + rlVertexBuffer *vertexBuffer; // Dynamic buffer(s) for vertex data - DrawCall *draws; // Draw calls array, depends on textureId + rlDrawCall *draws; // Draw calls array, depends on textureId int drawsCounter; // Draw calls counter float currentDepth; // Current depth value for next draw -} RenderBatch; +} rlRenderBatch; #if defined(RLGL_STANDALONE) - #ifndef __cplusplus // Boolean type - typedef enum { false, true } bool; + #if defined(__STDC__) && __STDC_VERSION__ >= 199901L + #include + #elif !defined(__cplusplus) && !defined(bool) + typedef enum bool { false, true } bool; #endif - // Texture type - // NOTE: Data stored in GPU memory - typedef struct Texture2D { - unsigned int id; // OpenGL texture id - int width; // Texture base width - int height; // Texture base height - int mipmaps; // Mipmap levels, 1 by default - int format; // Data format (PixelFormat) - } Texture2D; - - // Shader type (generic) - typedef struct Shader { - unsigned int id; // Shader program id - int *locs; // Shader locations array (MAX_SHADER_LOCATIONS) - } Shader; - // Trace log level // NOTE: Organized by priority level typedef enum { @@ -441,14 +434,14 @@ extern "C" { // Prevents name mangling of functions #endif //------------------------------------------------------------------------------------ -// Functions Declaration - Matrix operations +// Functions Declaration - rlMatrix operations //------------------------------------------------------------------------------------ RLAPI void rlMatrixMode(int mode); // Choose the current matrix to be transformed RLAPI void rlPushMatrix(void); // Push the current matrix to stack RLAPI void rlPopMatrix(void); // Pop lattest inserted matrix from stack RLAPI void rlLoadIdentity(void); // Reset current matrix to identity matrix RLAPI void rlTranslatef(float x, float y, float z); // Multiply the current matrix by a translation matrix -RLAPI void rlRotatef(float angleDeg, float x, float y, float z); // Multiply the current matrix by a rotation matrix +RLAPI void rlRotatef(float angle, float x, float y, float z); // Multiply the current matrix by a rotation matrix RLAPI void rlScalef(float x, float y, float z); // Multiply the current matrix by a scaling matrix RLAPI void rlMultMatrixf(float *matf); // Multiply the current matrix by another matrix RLAPI void rlFrustum(double left, double right, double bottom, double top, double znear, double zfar); @@ -542,18 +535,19 @@ RLAPI int rlGetVersion(void); // Get current OpenGL vers RLAPI int rlGetFramebufferWidth(void); // Get default framebuffer width RLAPI int rlGetFramebufferHeight(void); // Get default framebuffer height -RLAPI Shader rlGetShaderDefault(void); // Get default shader -RLAPI Texture2D rlGetTextureDefault(void); // Get default texture +RLAPI unsigned int rlGetTextureIdDefault(void); // Get default texture id +RLAPI unsigned int rlGetShaderIdDefault(void); // Get default shader id +RLAPI int *rlGetShaderLocsDefault(void); // Get default shader locations // Render batch management // NOTE: rlgl provides a default render batch to behave like OpenGL 1.1 immediate mode // but this render batch API is exposed in case of custom batches are required -RLAPI RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements); // Load a render batch system -RLAPI void rlUnloadRenderBatch(RenderBatch batch); // Unload render batch system -RLAPI void rlDrawRenderBatch(RenderBatch *batch); // Draw render batch data (Update->Draw->Reset) -RLAPI void rlSetRenderBatchActive(RenderBatch *batch); // Set the active render batch for rlgl (NULL for default internal) -RLAPI void rlDrawRenderBatchActive(void); // Update and draw internal render batch -RLAPI bool rlCheckRenderBatchLimit(int vCount); // Check internal buffer overflow for a given number of vertex +RLAPI rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements); // Load a render batch system +RLAPI void rlUnloadRenderBatch(rlRenderBatch batch); // Unload render batch system +RLAPI void rlDrawRenderBatch(rlRenderBatch *batch); // Draw render batch data (Update->Draw->Reset) +RLAPI void rlSetRenderBatchActive(rlRenderBatch *batch); // Set the active render batch for rlgl (NULL for default internal) +RLAPI void rlDrawRenderBatchActive(void); // Update and draw internal render batch +RLAPI bool rlCheckRenderBatchLimit(int vCount); // Check internal buffer overflow for a given number of vertex RLAPI void rlSetTexture(unsigned int id); // Set current texture for render batch and check buffers limits //------------------------------------------------------------------------------------------------------------------------ @@ -581,8 +575,8 @@ RLAPI void rlUpdateTexture(unsigned int id, int offsetX, int offsetY, int width, RLAPI void rlGetGlTextureFormats(int format, unsigned int *glInternalFormat, unsigned int *glFormat, unsigned int *glType); // Get OpenGL internal formats RLAPI const char *rlGetPixelFormatName(unsigned int format); // Get name string for pixel format RLAPI void rlUnloadTexture(unsigned int id); // Unload texture from GPU memory -RLAPI void rlGenerateMipmaps(Texture2D *texture); // Generate mipmap data for selected texture -RLAPI void *rlReadTexturePixels(Texture2D texture); // Read texture pixel data +RLAPI void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps); // Generate mipmap data for selected texture +RLAPI void *rlReadTexturePixels(unsigned int id, int width, int height, int format); // Read texture pixel data RLAPI unsigned char *rlReadScreenPixels(int width, int height); // Read screen pixel data (color buffer) // Framebuffer management (fbo) @@ -599,20 +593,20 @@ RLAPI void rlUnloadShaderProgram(unsigned int id); RLAPI int rlGetLocationUniform(unsigned int shaderId, const char *uniformName); // Get shader location uniform RLAPI int rlGetLocationAttrib(unsigned int shaderId, const char *attribName); // Get shader location attribute RLAPI void rlSetUniform(int locIndex, const void *value, int uniformType, int count); // Set shader value uniform -RLAPI void rlSetUniformMatrix(int locIndex, Matrix mat); // Set shader value matrix +RLAPI void rlSetUniformMatrix(int locIndex, rlMatrix mat); // Set shader value matrix RLAPI void rlSetUniformSampler(int locIndex, unsigned int textureId); // Set shader value sampler -RLAPI void rlSetShader(Shader shader); // Set shader currently active +RLAPI void rlSetShader(unsigned int id, int *locs); // Set shader currently active (id and locations) -// Matrix state management -RLAPI Matrix rlGetMatrixModelview(void); // Get internal modelview matrix -RLAPI Matrix rlGetMatrixProjection(void); // Get internal projection matrix -RLAPI Matrix rlGetMatrixTransform(void); // Get internal accumulated transform matrix -RLAPI Matrix rlGetMatrixProjectionStereo(int eye); // Get internal projection matrix for stereo render (selected eye) -RLAPI Matrix rlGetMatrixViewOffsetStereo(int eye); // Get internal view offset matrix for stereo render (selected eye) -RLAPI void rlSetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix) -RLAPI void rlSetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix) -RLAPI void rlSetMatrixProjectionStereo(Matrix right, Matrix left); // Set eyes projection matrices for stereo rendering -RLAPI void rlSetMatrixViewOffsetStereo(Matrix right, Matrix left); // Set eyes view offsets matrices for stereo rendering +// rlMatrix state management +RLAPI rlMatrix rlGetMatrixModelview(void); // Get internal modelview matrix +RLAPI rlMatrix rlGetMatrixProjection(void); // Get internal projection matrix +RLAPI rlMatrix rlGetMatrixTransform(void); // Get internal accumulated transform matrix +RLAPI rlMatrix rlGetMatrixProjectionStereo(int eye); // Get internal projection matrix for stereo render (selected eye) +RLAPI rlMatrix rlGetMatrixViewOffsetStereo(int eye); // Get internal view offset matrix for stereo render (selected eye) +RLAPI void rlSetMatrixProjection(rlMatrix proj); // Set a custom projection matrix (replaces internal projection matrix) +RLAPI void rlSetMatrixModelview(rlMatrix view); // Set a custom modelview matrix (replaces internal modelview matrix) +RLAPI void rlSetMatrixProjectionStereo(rlMatrix right, rlMatrix left); // Set eyes projection matrices for stereo rendering +RLAPI void rlSetMatrixViewOffsetStereo(rlMatrix right, rlMatrix left); // Set eyes view offsets matrices for stereo rendering // Quick and dirty cube/quad buffers load->draw->unload RLAPI void rlLoadDrawCube(void); // Load and draw a cube @@ -631,16 +625,14 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #if defined(RLGL_IMPLEMENTATION) -#if !defined(RLGL_STANDALONE) - // Check if config flags have been externally provided on compilation line - #if !defined(EXTERNAL_CONFIG_FLAGS) - #include "config.h" // Defines module configuration flags - #endif - #include "raymath.h" // Required for: Vector3 and Matrix functions +// Check if config flags have been externally provided on compilation line +#if !defined(EXTERNAL_CONFIG_FLAGS) + #include "config.h" // Defines module configuration flags #endif #include // Required for: malloc(), free() #include // Required for: strcmp(), strlen() [Used in rlglInit(), on extensions loading] +#include // Required for: sqrtf(), sinf(), cosf(), floor(), log() #if defined(GRAPHICS_API_OPENGL_11) #if defined(__APPLE__) @@ -673,11 +665,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #define GLAD_FREE RL_FREE #define GLAD_IMPLEMENTATION - #if defined(RLGL_STANDALONE) - #include "glad.h" // GLAD extensions loading library, includes OpenGL headers - #else - #include "external/glad.h" // GLAD extensions loading library, includes OpenGL headers - #endif + #include "external/glad.h" // GLAD extensions loading library, includes OpenGL headers #endif #endif @@ -699,6 +687,16 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- +#ifndef PI + #define PI 3.14159265358979323846f +#endif +#ifndef DEG2RAD + #define DEG2RAD (PI/180.0f) +#endif +#ifndef RAD2DEG + #define RAD2DEG (180.0f/PI) +#endif + #ifndef GL_SHADING_LANGUAGE_VERSION #define GL_SHADING_LANGUAGE_VERSION 0x8B8C #endif @@ -814,29 +812,31 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad //---------------------------------------------------------------------------------- #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) typedef struct rlglData { - RenderBatch *currentBatch; // Current render batch - RenderBatch defaultBatch; // Default internal render batch + rlRenderBatch *currentBatch; // Current render batch + rlRenderBatch defaultBatch; // Default internal render batch struct { int currentMatrixMode; // Current matrix mode - Matrix *currentMatrix; // Current matrix pointer - Matrix modelview; // Default modelview matrix - Matrix projection; // Default projection matrix - Matrix transform; // Transform matrix to be used with rlTranslate, rlRotate, rlScale + rlMatrix *currentMatrix; // Current matrix pointer + rlMatrix modelview; // Default modelview matrix + rlMatrix projection; // Default projection matrix + rlMatrix transform; // Transform matrix to be used with rlTranslate, rlRotate, rlScale bool transformRequired; // Require transform matrix application to current draw-call vertex (if required) - Matrix stack[MAX_MATRIX_STACK_SIZE];// Matrix stack for push/pop - int stackCounter; // Matrix stack counter + rlMatrix stack[MAX_MATRIX_STACK_SIZE];// rlMatrix stack for push/pop + int stackCounter; // rlMatrix stack counter unsigned int defaultTextureId; // Default texture used on shapes/poly drawing (required by shader) unsigned int activeTextureId[MAX_BATCH_ACTIVE_TEXTURES]; // Active texture ids to be enabled on batch drawing (0 active by default) unsigned int defaultVShaderId; // Default vertex shader id (used by default shader program) - unsigned int defaultFShaderId; // Default fragment shader Id (used by default shader program) - Shader defaultShader; // Basic shader, support vertex color and diffuse texture - Shader currentShader; // Shader to be used on rendering (by default, defaultShader) + unsigned int defaultFShaderId; // Default fragment shader id (used by default shader program) + unsigned int defaultShaderId; // Default shader program id, supports vertex color and diffuse texture + int *defaultShaderLocs; // Default shader locations pointer to be used on rendering + unsigned int currentShaderId; // Current shader id to be used on rendering (by default, defaultShaderId) + int *currentShaderLocs; // Current shader locations pointer to be used on rendering (by default, defaultShaderLocs) bool stereoRender; // Stereo rendering flag - Matrix projectionStereo[2]; // VR stereo rendering eyes projection matrices - Matrix viewOffsetStereo[2]; // VR stereo rendering eyes view offset matrices + rlMatrix projectionStereo[2]; // VR stereo rendering eyes projection matrices + rlMatrix viewOffsetStereo[2]; // VR stereo rendering eyes view offset matrices int currentBlendMode; // Blending mode active int glBlendSrcFactor; // Blending source factor @@ -901,13 +901,16 @@ static char *rlGetCompressedFormatName(int format); // Get compressed format off #endif // SUPPORT_GL_DETAILS_INFO #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 #if defined(GRAPHICS_API_OPENGL_11) -static int rlGenerateMipmapsData(unsigned char *data, int baseWidth, int baseHeight); // Generate mipmaps data on CPU side +static int rlGenTextureMipmapsData(unsigned char *data, int baseWidth, int baseHeight); // Generate mipmaps data on CPU side static unsigned char *rlGenNextMipmapData(unsigned char *srcData, int srcWidth, int srcHeight); // Generate next mipmap level on CPU side #endif static int rlGetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes (image or texture) +// Auxiliar matrix math functions +static rlMatrix rlMatrixIdentity(void); // Get identity matrix +static rlMatrix rlMatrixMultiply(rlMatrix left, rlMatrix right); // Multiply two matrices //---------------------------------------------------------------------------------- -// Module Functions Definition - Matrix operations +// Module Functions Definition - rlMatrix operations //---------------------------------------------------------------------------------- #if defined(GRAPHICS_API_OPENGL_11) @@ -938,7 +941,7 @@ void rlPushMatrix(void) { glPushMatrix(); } void rlPopMatrix(void) { glPopMatrix(); } void rlLoadIdentity(void) { glLoadIdentity(); } void rlTranslatef(float x, float y, float z) { glTranslatef(x, y, z); } -void rlRotatef(float angleDeg, float x, float y, float z) { glRotatef(angleDeg, x, y, z); } +void rlRotatef(float angle, float x, float y, float z) { glRotatef(angle, x, y, z); } void rlScalef(float x, float y, float z) { glScalef(x, y, z); } void rlMultMatrixf(float *matf) { glMultMatrixf(matf); } #endif @@ -956,7 +959,7 @@ void rlMatrixMode(int mode) // Push the current matrix into RLGL.State.stack void rlPushMatrix(void) { - if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(LOG_ERROR, "RLGL: Matrix stack overflow (MAX_MATRIX_STACK_SIZE)"); + if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(LOG_ERROR, "RLGL: rlMatrix stack overflow (MAX_MATRIX_STACK_SIZE)"); if (RLGL.State.currentMatrixMode == RL_MODELVIEW) { @@ -973,7 +976,7 @@ void rlPopMatrix(void) { if (RLGL.State.stackCounter > 0) { - Matrix mat = RLGL.State.stack[RLGL.State.stackCounter - 1]; + rlMatrix mat = RLGL.State.stack[RLGL.State.stackCounter - 1]; *RLGL.State.currentMatrix = mat; RLGL.State.stackCounter--; } @@ -988,67 +991,155 @@ void rlPopMatrix(void) // Reset current matrix to identity matrix void rlLoadIdentity(void) { - *RLGL.State.currentMatrix = MatrixIdentity(); + *RLGL.State.currentMatrix = rlMatrixIdentity(); } // Multiply the current matrix by a translation matrix void rlTranslatef(float x, float y, float z) { - Matrix matTranslation = MatrixTranslate(x, y, z); + rlMatrix matTranslation = { + 1.0f, 0.0f, 0.0f, x, + 0.0f, 1.0f, 0.0f, y, + 0.0f, 0.0f, 1.0f, z, + 0.0f, 0.0f, 0.0f, 1.0f + }; // NOTE: We transpose matrix with multiplication order - *RLGL.State.currentMatrix = MatrixMultiply(matTranslation, *RLGL.State.currentMatrix); + *RLGL.State.currentMatrix = rlMatrixMultiply(matTranslation, *RLGL.State.currentMatrix); } // Multiply the current matrix by a rotation matrix -void rlRotatef(float angleDeg, float x, float y, float z) +// NOTE: The provided angle must be in degrees +void rlRotatef(float angle, float x, float y, float z) { - Matrix matRotation = MatrixIdentity(); + rlMatrix matRotation = rlMatrixIdentity(); + + // Axis vector (x, y, z) normalization + float lengthSquared = x*x + y*y + z*z; + if ((lengthSquared != 1.0f) && (lengthSquared != 0.0f)) + { + float inverseLength = 1.0f/sqrtf(lengthSquared); + x *= inverseLength; + y *= inverseLength; + z *= inverseLength; + } + + // Rotation matrix generation + float sinres = sinf(DEG2RAD*angle); + float cosres = cosf(DEG2RAD*angle); + float t = 1.0f - cosres; - Vector3 axis = (Vector3){ x, y, z }; - matRotation = MatrixRotate(Vector3Normalize(axis), angleDeg*DEG2RAD); + matRotation.m0 = x*x*t + cosres; + matRotation.m1 = y*x*t + z*sinres; + matRotation.m2 = z*x*t - y*sinres; + matRotation.m3 = 0.0f; + + matRotation.m4 = x*y*t - z*sinres; + matRotation.m5 = y*y*t + cosres; + matRotation.m6 = z*y*t + x*sinres; + matRotation.m7 = 0.0f; + + matRotation.m8 = x*z*t + y*sinres; + matRotation.m9 = y*z*t - x*sinres; + matRotation.m10 = z*z*t + cosres; + matRotation.m11 = 0.0f; + + matRotation.m12 = 0.0f; + matRotation.m13 = 0.0f; + matRotation.m14 = 0.0f; + matRotation.m15 = 1.0f; // NOTE: We transpose matrix with multiplication order - *RLGL.State.currentMatrix = MatrixMultiply(matRotation, *RLGL.State.currentMatrix); + *RLGL.State.currentMatrix = rlMatrixMultiply(matRotation, *RLGL.State.currentMatrix); } // Multiply the current matrix by a scaling matrix void rlScalef(float x, float y, float z) { - Matrix matScale = MatrixScale(x, y, z); + rlMatrix matScale = { + x, 0.0f, 0.0f, 0.0f, + 0.0f, y, 0.0f, 0.0f, + 0.0f, 0.0f, z, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; // NOTE: We transpose matrix with multiplication order - *RLGL.State.currentMatrix = MatrixMultiply(matScale, *RLGL.State.currentMatrix); + *RLGL.State.currentMatrix = rlMatrixMultiply(matScale, *RLGL.State.currentMatrix); } // Multiply the current matrix by another matrix void rlMultMatrixf(float *matf) { - // Matrix creation from array - Matrix mat = { matf[0], matf[4], matf[8], matf[12], + // rlMatrix creation from array + rlMatrix mat = { matf[0], matf[4], matf[8], matf[12], matf[1], matf[5], matf[9], matf[13], matf[2], matf[6], matf[10], matf[14], matf[3], matf[7], matf[11], matf[15] }; - *RLGL.State.currentMatrix = MatrixMultiply(*RLGL.State.currentMatrix, mat); + *RLGL.State.currentMatrix = rlMatrixMultiply(*RLGL.State.currentMatrix, mat); } // Multiply the current matrix by a perspective matrix generated by parameters void rlFrustum(double left, double right, double bottom, double top, double znear, double zfar) { - Matrix matPerps = MatrixFrustum(left, right, bottom, top, znear, zfar); + rlMatrix matFrustum = { 0 }; - *RLGL.State.currentMatrix = MatrixMultiply(*RLGL.State.currentMatrix, matPerps); + float rl = (float)(right - left); + float tb = (float)(top - bottom); + float fn = (float)(zfar - znear); + + matFrustum.m0 = ((float) znear*2.0f)/rl; + matFrustum.m1 = 0.0f; + matFrustum.m2 = 0.0f; + matFrustum.m3 = 0.0f; + + matFrustum.m4 = 0.0f; + matFrustum.m5 = ((float) znear*2.0f)/tb; + matFrustum.m6 = 0.0f; + matFrustum.m7 = 0.0f; + + matFrustum.m8 = ((float)right + (float)left)/rl; + matFrustum.m9 = ((float)top + (float)bottom)/tb; + matFrustum.m10 = -((float)zfar + (float)znear)/fn; + matFrustum.m11 = -1.0f; + + matFrustum.m12 = 0.0f; + matFrustum.m13 = 0.0f; + matFrustum.m14 = -((float)zfar*(float)znear*2.0f)/fn; + matFrustum.m15 = 0.0f; + + *RLGL.State.currentMatrix = rlMatrixMultiply(*RLGL.State.currentMatrix, matFrustum); } // Multiply the current matrix by an orthographic matrix generated by parameters void rlOrtho(double left, double right, double bottom, double top, double znear, double zfar) { - // NOTE: If left-right and top-botton values are equal it could create - // a division by zero on MatrixOrtho(), response to it is platform/compiler dependant - Matrix matOrtho = MatrixOrtho(left, right, bottom, top, znear, zfar); + // NOTE: If left-right and top-botton values are equal it could create a division by zero, + // response to it is platform/compiler dependant + rlMatrix matOrtho = { 0 }; + + float rl = (float)(right - left); + float tb = (float)(top - bottom); + float fn = (float)(zfar - znear); - *RLGL.State.currentMatrix = MatrixMultiply(*RLGL.State.currentMatrix, matOrtho); + matOrtho.m0 = 2.0f/rl; + matOrtho.m1 = 0.0f; + matOrtho.m2 = 0.0f; + matOrtho.m3 = 0.0f; + matOrtho.m4 = 0.0f; + matOrtho.m5 = 2.0f/tb; + matOrtho.m6 = 0.0f; + matOrtho.m7 = 0.0f; + matOrtho.m8 = 0.0f; + matOrtho.m9 = 0.0f; + matOrtho.m10 = -2.0f/fn; + matOrtho.m11 = 0.0f; + matOrtho.m12 = -((float)left + (float)right)/rl; + matOrtho.m13 = -((float)top + (float)bottom)/tb; + matOrtho.m14 = -((float)zfar + (float)znear)/fn; + matOrtho.m15 = 1.0f; + + *RLGL.State.currentMatrix = rlMatrixMultiply(*RLGL.State.currentMatrix, matOrtho); } #endif @@ -1180,17 +1271,24 @@ void rlEnd(void) // NOTE: Vertex position data is the basic information required for drawing void rlVertex3f(float x, float y, float z) { - Vector3 vec = { x, y, z }; + float tx = x; + float ty = y; + float tz = z; // Transform provided vector if required - if (RLGL.State.transformRequired) vec = Vector3Transform(vec, RLGL.State.transform); + if (RLGL.State.transformRequired) + { + tx = RLGL.State.transform.m0*x + RLGL.State.transform.m4*y + RLGL.State.transform.m8*z + RLGL.State.transform.m12; + ty = RLGL.State.transform.m1*x + RLGL.State.transform.m5*y + RLGL.State.transform.m9*z + RLGL.State.transform.m13; + tz = RLGL.State.transform.m2*x + RLGL.State.transform.m6*y + RLGL.State.transform.m10*z + RLGL.State.transform.m14; + } // Verify that current vertex buffer elements limit has not been reached if (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter < (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementsCount*4)) { - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter] = vec.x; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 1] = vec.y; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 2] = vec.z; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter] = tx; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 1] = ty; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 2] = tz; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter++; RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount++; @@ -1616,20 +1714,22 @@ void rlglInit(int width, int height) else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load default texture"); // Init default Shader (customized for GL 3.3 and ES2) - rlLoadShaderDefault(); // RLGL.State.defaultShader - RLGL.State.currentShader = RLGL.State.defaultShader; + // Loaded: RLGL.State.defaultShaderId + RLGL.State.defaultShaderLocs + rlLoadShaderDefault(); + RLGL.State.currentShaderId = RLGL.State.defaultShaderId; + RLGL.State.currentShaderLocs = RLGL.State.defaultShaderLocs; // Init default vertex arrays buffers RLGL.defaultBatch = rlLoadRenderBatch(DEFAULT_BATCH_BUFFERS, DEFAULT_BATCH_BUFFER_ELEMENTS); RLGL.currentBatch = &RLGL.defaultBatch; // Init stack matrices (emulating OpenGL 1.1) - for (int i = 0; i < MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = MatrixIdentity(); + for (int i = 0; i < MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = rlMatrixIdentity(); // Init internal matrices - RLGL.State.transform = MatrixIdentity(); - RLGL.State.projection = MatrixIdentity(); - RLGL.State.modelview = MatrixIdentity(); + RLGL.State.transform = rlMatrixIdentity(); + RLGL.State.projection = rlMatrixIdentity(); + RLGL.State.modelview = rlMatrixIdentity(); RLGL.State.currentMatrix = &RLGL.State.modelview; #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 @@ -1916,79 +2016,87 @@ void rlLoadExtensions(void *loader) // Get current OpenGL version int rlGetVersion(void) { + int glVersion = 0; #if defined(GRAPHICS_API_OPENGL_11) - return OPENGL_11; + glVersion = OPENGL_11; #endif #if defined(GRAPHICS_API_OPENGL_21) #if defined(__APPLE__) - return OPENGL_33; // NOTE: Force OpenGL 3.3 on OSX + glVersion = OPENGL_33; // NOTE: Force OpenGL 3.3 on OSX #else - return OPENGL_21; + glVersion = OPENGL_21; #endif #elif defined(GRAPHICS_API_OPENGL_33) - return OPENGL_33; + glVersion = OPENGL_33; #endif #if defined(GRAPHICS_API_OPENGL_ES2) - return OPENGL_ES_20; + glVersion = OPENGL_ES_20; #endif + return glVersion; } // Get default framebuffer width int rlGetFramebufferWidth(void) { + int width = 0; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - return RLGL.State.framebufferWidth; -#else - return 0; + width = RLGL.State.framebufferWidth; #endif + return width; } // Get default framebuffer height int rlGetFramebufferHeight(void) { + int height = 0; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - return RLGL.State.framebufferHeight; -#else - return 0; -#endif -} - -// Get default internal shader (simple texture + tint color) -Shader rlGetShaderDefault(void) -{ -#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - return RLGL.State.defaultShader; -#else - Shader shader = { 0 }; - return shader; + height = RLGL.State.framebufferHeight; #endif + return height; } // Get default internal texture (white texture) -Texture2D rlGetTextureDefault(void) +// NOTE: Default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8 +unsigned int rlGetTextureIdDefault(void) { - Texture2D texture = { 0 }; + unsigned int id = 0; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - texture.id = RLGL.State.defaultTextureId; - texture.width = 1; - texture.height = 1; - texture.mipmaps = 1; - texture.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; + id = RLGL.State.defaultTextureId; #endif - return texture; + return id; +} + +// Get default shader id +unsigned int rlGetShaderIdDefault(void) +{ + unsigned int id = 0; +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + id = RLGL.State.defaultShaderId; +#endif + return id; +} + +// Get default shader locs +int *rlGetShaderLocsDefault(void) +{ + int *locs = NULL; +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + locs = RLGL.State.defaultShaderLocs; +#endif + return locs; } // Render batch management //------------------------------------------------------------------------------------------------ // Load render batch -RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) +rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) { - RenderBatch batch = { 0 }; + rlRenderBatch batch = { 0 }; #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Initialize CPU (RAM) vertex buffers (position, texcoord, color data and indexes) //-------------------------------------------------------------------------------------------- - batch.vertexBuffer = (VertexBuffer *)RL_MALLOC(numBuffers*sizeof(VertexBuffer)); + batch.vertexBuffer = (rlVertexBuffer *)RL_MALLOC(numBuffers*sizeof(rlVertexBuffer)); for (int i = 0; i < numBuffers; i++) { @@ -2047,22 +2155,22 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) glGenBuffers(1, &batch.vertexBuffer[i].vboId[0]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[0]); glBufferData(GL_ARRAY_BUFFER, bufferElements*3*4*sizeof(float), batch.vertexBuffer[i].vertices, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_POSITION]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); // Vertex texcoord buffer (shader-location = 1) glGenBuffers(1, &batch.vertexBuffer[i].vboId[1]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[1]); glBufferData(GL_ARRAY_BUFFER, bufferElements*2*4*sizeof(float), batch.vertexBuffer[i].texcoords, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_TEXCOORD01]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); // Vertex color buffer (shader-location = 3) glGenBuffers(1, &batch.vertexBuffer[i].vboId[2]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[2]); glBufferData(GL_ARRAY_BUFFER, bufferElements*4*4*sizeof(unsigned char), batch.vertexBuffer[i].colors, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_COLOR]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); // Fill index buffer glGenBuffers(1, &batch.vertexBuffer[i].vboId[3]); @@ -2083,7 +2191,7 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) // Init draw calls tracking system //-------------------------------------------------------------------------------------------- - batch.draws = (DrawCall *)RL_MALLOC(DEFAULT_BATCH_DRAWCALLS*sizeof(DrawCall)); + batch.draws = (rlDrawCall *)RL_MALLOC(DEFAULT_BATCH_DRAWCALLS*sizeof(rlDrawCall)); for (int i = 0; i < DEFAULT_BATCH_DRAWCALLS; i++) { @@ -2093,8 +2201,8 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) //batch.draws[i].vaoId = 0; //batch.draws[i].shaderId = 0; batch.draws[i].textureId = RLGL.State.defaultTextureId; - //batch.draws[i].RLGL.State.projection = MatrixIdentity(); - //batch.draws[i].RLGL.State.modelview = MatrixIdentity(); + //batch.draws[i].RLGL.State.projection = rlMatrixIdentity(); + //batch.draws[i].RLGL.State.modelview = rlMatrixIdentity(); } batch.buffersCount = numBuffers; // Record buffer count @@ -2107,7 +2215,7 @@ RenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) } // Unload default internal buffers vertex data from CPU and GPU -void rlUnloadRenderBatch(RenderBatch batch) +void rlUnloadRenderBatch(rlRenderBatch batch) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Unbind everything @@ -2146,7 +2254,7 @@ void rlUnloadRenderBatch(RenderBatch batch) // Draw render batch // NOTE: We require a pointer to reset batch and increase current buffer (multi-buffer) -void rlDrawRenderBatch(RenderBatch *batch) +void rlDrawRenderBatch(rlRenderBatch *batch) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Update batch vertex buffers @@ -2195,8 +2303,8 @@ void rlDrawRenderBatch(RenderBatch *batch) // Draw batch vertex buffers (considering VR stereo if required) //------------------------------------------------------------------------------------------------------------ - Matrix matProjection = RLGL.State.projection; - Matrix matModelView = RLGL.State.modelview; + rlMatrix matProjection = RLGL.State.projection; + rlMatrix matModelView = RLGL.State.modelview; int eyesCount = 1; if (RLGL.State.stereoRender) eyesCount = 2; @@ -2209,7 +2317,7 @@ void rlDrawRenderBatch(RenderBatch *batch) rlViewport(eye*RLGL.State.framebufferWidth/2, 0, RLGL.State.framebufferWidth/2, RLGL.State.framebufferHeight); // Set current eye view offset to modelview matrix - rlSetMatrixModelview(MatrixMultiply(matModelView, RLGL.State.viewOffsetStereo[eye])); + rlSetMatrixModelview(rlMatrixMultiply(matModelView, RLGL.State.viewOffsetStereo[eye])); // Set current eye projection matrix rlSetMatrixProjection(RLGL.State.projectionStereo[eye]); } @@ -2218,36 +2326,42 @@ void rlDrawRenderBatch(RenderBatch *batch) if (batch->vertexBuffer[batch->currentBuffer].vCounter > 0) { // Set current shader and upload current MVP matrix - glUseProgram(RLGL.State.currentShader.id); + glUseProgram(RLGL.State.currentShaderId); // Create modelview-projection matrix and upload to shader - Matrix matMVP = MatrixMultiply(RLGL.State.modelview, RLGL.State.projection); - glUniformMatrix4fv(RLGL.State.currentShader.locs[SHADER_LOC_MATRIX_MVP], 1, false, MatrixToFloat(matMVP)); + rlMatrix matMVP = rlMatrixMultiply(RLGL.State.modelview, RLGL.State.projection); + float matMVPfloat[16] = { + matMVP.m0, matMVP.m1, matMVP.m2, matMVP.m3, + matMVP.m4, matMVP.m5, matMVP.m6, matMVP.m7, + matMVP.m8, matMVP.m9, matMVP.m10, matMVP.m11, + matMVP.m12, matMVP.m13, matMVP.m14, matMVP.m15 + }; + glUniformMatrix4fv(RLGL.State.currentShaderLocs[SHADER_LOC_MATRIX_MVP], 1, false, matMVPfloat); if (RLGL.ExtSupported.vao) glBindVertexArray(batch->vertexBuffer[batch->currentBuffer].vaoId); else { // Bind vertex attrib: position (shader-location = 0) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[0]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_POSITION]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION]); // Bind vertex attrib: texcoord (shader-location = 1) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[1]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_TEXCOORD01]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01]); // Bind vertex attrib: color (shader-location = 3) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[2]); - glVertexAttribPointer(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShader.locs[SHADER_LOC_VERTEX_COLOR]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[3]); } // Setup some default shader values - glUniform4f(RLGL.State.currentShader.locs[SHADER_LOC_COLOR_DIFFUSE], 1.0f, 1.0f, 1.0f, 1.0f); - glUniform1i(RLGL.State.currentShader.locs[SHADER_LOC_MAP_DIFFUSE], 0); // Active default sampler2D: texture0 + glUniform4f(RLGL.State.currentShaderLocs[SHADER_LOC_COLOR_DIFFUSE], 1.0f, 1.0f, 1.0f, 1.0f); + glUniform1i(RLGL.State.currentShaderLocs[SHADER_LOC_MAP_DIFFUSE], 0); // Active default sampler2D: texture0 // Activate additional sampler textures // Those additional textures will be common for all draw calls of the batch @@ -2337,7 +2451,7 @@ void rlDrawRenderBatch(RenderBatch *batch) } // Set the active render batch for rlgl -void rlSetRenderBatchActive(RenderBatch *batch) +void rlSetRenderBatchActive(rlRenderBatch *batch) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) rlDrawRenderBatch(RLGL.currentBatch); @@ -2356,7 +2470,7 @@ void rlDrawRenderBatchActive(void) } // Check internal buffer overflow for a given number of vertex -// and force a RenderBatch draw call if required +// and force a rlRenderBatch draw call if required bool rlCheckRenderBatchLimit(int vCount) { bool overflow = false; @@ -2729,34 +2843,34 @@ void rlUnloadTexture(unsigned int id) } // Generate mipmap data for selected texture -void rlGenerateMipmaps(Texture2D *texture) +void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps) { - glBindTexture(GL_TEXTURE_2D, texture->id); + glBindTexture(GL_TEXTURE_2D, id); // Check if texture is power-of-two (POT) bool texIsPOT = false; - if (((texture->width > 0) && ((texture->width & (texture->width - 1)) == 0)) && - ((texture->height > 0) && ((texture->height & (texture->height - 1)) == 0))) texIsPOT = true; + if (((width > 0) && ((width & (width - 1)) == 0)) && + ((height > 0) && ((height & (height - 1)) == 0))) texIsPOT = true; #if defined(GRAPHICS_API_OPENGL_11) if (texIsPOT) { // WARNING: Manual mipmap generation only works for RGBA 32bit textures! - if (texture->format == PIXELFORMAT_UNCOMPRESSED_R8G8B8A8) + if (format == PIXELFORMAT_UNCOMPRESSED_R8G8B8A8) { // Retrieve texture data from VRAM - void *texData = rlReadTexturePixels(*texture); + void *texData = rlReadTexturePixels(id, width, height, format); // NOTE: Texture data size is reallocated to fit mipmaps data // NOTE: CPU mipmap generation only supports RGBA 32bit data - int mipmapCount = rlGenerateMipmapsData(texData, texture->width, texture->height); + int mipmapCount = rlGenTextureMipmapsData(texData, width, height); - int size = texture->width*texture->height*4; + int size = width*height*4; int offset = size; - int mipWidth = texture->width/2; - int mipHeight = texture->height/2; + int mipWidth = width/2; + int mipHeight = height/2; // Load the mipmaps for (int level = 1; level < mipmapCount; level++) @@ -2770,7 +2884,7 @@ void rlGenerateMipmaps(Texture2D *texture) mipHeight /= 2; } - texture->mipmaps = mipmapCount + 1; + *mipmaps = mipmapCount + 1; RL_FREE(texData); // Once mipmaps have been generated and data has been uploaded to GPU VRAM, we can discard RAM data TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Mipmaps generated manually on CPU side, total: %i", texture->id, texture->mipmaps); @@ -2790,25 +2904,25 @@ void rlGenerateMipmaps(Texture2D *texture) #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) - texture->mipmaps = 1 + (int)floor(log(MAX(texture->width, texture->height))/log(2)); - TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Mipmaps generated automatically, total: %i", texture->id, texture->mipmaps); + *mipmaps = 1 + (int)floor(log(MAX(width, height))/log(2)); + TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Mipmaps generated automatically, total: %i", id, *mipmaps); } #endif - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps", texture->id); + else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps", id); glBindTexture(GL_TEXTURE_2D, 0); } // Read texture pixel data -void *rlReadTexturePixels(Texture2D texture) +void *rlReadTexturePixels(unsigned int id, int width, int height, int format) { void *pixels = NULL; #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) - glBindTexture(GL_TEXTURE_2D, texture.id); + glBindTexture(GL_TEXTURE_2D, id); - // NOTE: Using texture.id, we can retrieve some texture info (but not on OpenGL ES 2.0) + // NOTE: Using texture id, we can retrieve some texture info (but not on OpenGL ES 2.0) // Possible texture info: GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE //int width, height, format; //glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width); @@ -2822,15 +2936,15 @@ void *rlReadTexturePixels(Texture2D texture) glPixelStorei(GL_PACK_ALIGNMENT, 1); unsigned int glInternalFormat, glFormat, glType; - rlGetGlTextureFormats(texture.format, &glInternalFormat, &glFormat, &glType); - unsigned int size = rlGetPixelDataSize(texture.width, texture.height, texture.format); + rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); + unsigned int size = rlGetPixelDataSize(width, height, format); - if ((glInternalFormat != -1) && (texture.format < PIXELFORMAT_COMPRESSED_DXT1_RGB)) + if ((glInternalFormat != -1) && (format < PIXELFORMAT_COMPRESSED_DXT1_RGB)) { pixels = RL_MALLOC(size); glGetTexImage(GL_TEXTURE_2D, 0, glFormat, glType, pixels); } - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Data retrieval not suported for pixel format (%i)", texture.id, texture.format); + else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Data retrieval not suported for pixel format (%i)", id, format); glBindTexture(GL_TEXTURE_2D, 0); #endif @@ -2843,7 +2957,7 @@ void *rlReadTexturePixels(Texture2D texture) // 2 - Create an fbo, activate it, render quad with texture, glReadPixels() // We are using Option 1, just need to care for texture format on retrieval // NOTE: This behaviour could be conditioned by graphic driver... - unsigned int fboId = rlLoadFramebuffer(texture.width, texture.height); + unsigned int fboId = rlLoadFramebuffer(width, height); // TODO: Create depth texture/renderbuffer for fbo? @@ -2851,11 +2965,11 @@ void *rlReadTexturePixels(Texture2D texture) glBindTexture(GL_TEXTURE_2D, 0); // Attach our texture to FBO - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.id, 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, id, 0); // We read data as RGBA because FBO texture is configured as RGBA, despite binding another texture format pixels = (unsigned char *)RL_MALLOC(rlGetPixelDataSize(texture.width, texture.height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)); - glReadPixels(0, 0, texture.width, texture.height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -3220,7 +3334,7 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); - if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShader.id; + if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShaderId; else { id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); @@ -3241,7 +3355,7 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (id == 0) { TRACELOG(LOG_WARNING, "SHADER: Failed to load custom shader code"); - id = RLGL.State.defaultShader.id; + id = RLGL.State.defaultShaderId; } } @@ -3447,10 +3561,16 @@ void rlSetVertexAttributeDefault(int locIndex, const void *value, int attribType } // Set shader value uniform matrix -void rlSetUniformMatrix(int locIndex, Matrix mat) +void rlSetUniformMatrix(int locIndex, rlMatrix mat) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - glUniformMatrix4fv(locIndex, 1, false, MatrixToFloat(mat)); + float matfloat[16] = { + mat.m0, mat.m1, mat.m2, mat.m3, + mat.m4, mat.m5, mat.m6, mat.m7, + mat.m8, mat.m9, mat.m10, mat.m11, + mat.m12, mat.m13, mat.m14, mat.m15 + }; + glUniformMatrix4fv(locIndex, 1, false, matfloat); #endif } @@ -3475,24 +3595,25 @@ void rlSetUniformSampler(int locIndex, unsigned int textureId) #endif } -// Set shader currently active -void rlSetShader(Shader shader) +// Set shader currently active (id and locations) +void rlSetShader(unsigned int id, int *locs) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - if (RLGL.State.currentShader.id != shader.id) + if (RLGL.State.currentShaderId != id) { rlDrawRenderBatch(RLGL.currentBatch); - RLGL.State.currentShader = shader; + RLGL.State.currentShaderId = id; + RLGL.State.currentShaderLocs = locs; } #endif } -// Matrix state management +// rlMatrix state management //----------------------------------------------------------------------------------------- // Get internal modelview matrix -Matrix rlGetMatrixModelview(void) +rlMatrix rlGetMatrixModelview(void) { - Matrix matrix = MatrixIdentity(); + rlMatrix matrix = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_11) float mat[16]; glGetFloatv(GL_MODELVIEW_MATRIX, mat); @@ -3519,12 +3640,12 @@ Matrix rlGetMatrixModelview(void) } // Get internal projection matrix -Matrix rlGetMatrixProjection(void) +rlMatrix rlGetMatrixProjection(void) { #if defined(GRAPHICS_API_OPENGL_11) float mat[16]; glGetFloatv(GL_PROJECTION_MATRIX,mat); - Matrix m; + rlMatrix m; m.m0 = mat[0]; m.m1 = mat[1]; m.m2 = mat[2]; @@ -3548,23 +3669,23 @@ Matrix rlGetMatrixProjection(void) } // Get internal accumulated transform matrix -Matrix rlGetMatrixTransform(void) +rlMatrix rlGetMatrixTransform(void) { - Matrix mat = MatrixIdentity(); + rlMatrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // TODO: Consider possible transform matrices in the RLGL.State.stack // Is this the right order? or should we start with the first stored matrix instead of the last one? - //Matrix matStackTransform = MatrixIdentity(); - //for (int i = RLGL.State.stackCounter; i > 0; i--) matStackTransform = MatrixMultiply(RLGL.State.stack[i], matStackTransform); + //rlMatrix matStackTransform = rlMatrixIdentity(); + //for (int i = RLGL.State.stackCounter; i > 0; i--) matStackTransform = rlMatrixMultiply(RLGL.State.stack[i], matStackTransform); mat = RLGL.State.transform; #endif return mat; } // Get internal projection matrix for stereo render (selected eye) -RLAPI Matrix rlGetMatrixProjectionStereo(int eye) +RLAPI rlMatrix rlGetMatrixProjectionStereo(int eye) { - Matrix mat = MatrixIdentity(); + rlMatrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) mat = RLGL.State.projectionStereo[eye]; #endif @@ -3572,9 +3693,9 @@ RLAPI Matrix rlGetMatrixProjectionStereo(int eye) } // Get internal view offset matrix for stereo render (selected eye) -RLAPI Matrix rlGetMatrixViewOffsetStereo(int eye) +RLAPI rlMatrix rlGetMatrixViewOffsetStereo(int eye) { - Matrix mat = MatrixIdentity(); + rlMatrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) mat = RLGL.State.viewOffsetStereo[eye]; #endif @@ -3582,7 +3703,7 @@ RLAPI Matrix rlGetMatrixViewOffsetStereo(int eye) } // Set a custom modelview matrix (replaces internal modelview matrix) -void rlSetMatrixModelview(Matrix view) +void rlSetMatrixModelview(rlMatrix view) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.modelview = view; @@ -3590,7 +3711,7 @@ void rlSetMatrixModelview(Matrix view) } // Set a custom projection matrix (replaces internal projection matrix) -void rlSetMatrixProjection(Matrix projection) +void rlSetMatrixProjection(rlMatrix projection) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.projection = projection; @@ -3598,7 +3719,7 @@ void rlSetMatrixProjection(Matrix projection) } // Set eyes projection matrices for stereo rendering -void rlSetMatrixProjectionStereo(Matrix right, Matrix left) +void rlSetMatrixProjectionStereo(rlMatrix right, rlMatrix left) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.projectionStereo[0] = right; @@ -3607,7 +3728,7 @@ void rlSetMatrixProjectionStereo(Matrix right, Matrix left) } // Set eyes view offsets matrices for stereo rendering -void rlSetMatrixViewOffsetStereo(Matrix right, Matrix left) +void rlSetMatrixViewOffsetStereo(rlMatrix right, rlMatrix left) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.viewOffsetStereo[0] = right; @@ -3773,13 +3894,13 @@ const char *rlGetPixelFormatName(unsigned int format) // NOTE: It uses global variable: RLGL.State.defaultShader static void rlLoadShaderDefault(void) { - RLGL.State.defaultShader.locs = (int *)RL_CALLOC(MAX_SHADER_LOCATIONS, sizeof(int)); + RLGL.State.defaultShaderLocs = (int *)RL_CALLOC(MAX_SHADER_LOCATIONS, sizeof(int)); // NOTE: All locations must be reseted to -1 (no location) - for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) RLGL.State.defaultShader.locs[i] = -1; + for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) RLGL.State.defaultShaderLocs[i] = -1; // Vertex shader directly defined, no external file required - const char *vShaderDefault = + const char *defaultVShaderCode = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" "attribute vec3 vertexPosition; \n" @@ -3812,7 +3933,7 @@ static void rlLoadShaderDefault(void) "} \n"; // Fragment shader directly defined, no external file required - const char *fShaderDefault = + const char *defaultFShaderCode = #if defined(GRAPHICS_API_OPENGL_21) "#version 120 \n" "varying vec2 fragTexCoord; \n" @@ -3852,26 +3973,26 @@ static void rlLoadShaderDefault(void) #endif // NOTE: Compiled vertex/fragment shaders are kept for re-use - RLGL.State.defaultVShaderId = rlCompileShader(vShaderDefault, GL_VERTEX_SHADER); // Compile default vertex shader - RLGL.State.defaultFShaderId = rlCompileShader(fShaderDefault, GL_FRAGMENT_SHADER); // Compile default fragment shader + RLGL.State.defaultVShaderId = rlCompileShader(defaultVShaderCode, GL_VERTEX_SHADER); // Compile default vertex shader + RLGL.State.defaultFShaderId = rlCompileShader(defaultFShaderCode, GL_FRAGMENT_SHADER); // Compile default fragment shader - RLGL.State.defaultShader.id = rlLoadShaderProgram(RLGL.State.defaultVShaderId, RLGL.State.defaultFShaderId); + RLGL.State.defaultShaderId = rlLoadShaderProgram(RLGL.State.defaultVShaderId, RLGL.State.defaultFShaderId); - if (RLGL.State.defaultShader.id > 0) + if (RLGL.State.defaultShaderId > 0) { - TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader loaded successfully", RLGL.State.defaultShader.id); + TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader loaded successfully", RLGL.State.defaultShaderId); // Set default shader locations: attributes locations - RLGL.State.defaultShader.locs[SHADER_LOC_VERTEX_POSITION] = glGetAttribLocation(RLGL.State.defaultShader.id, "vertexPosition"); - RLGL.State.defaultShader.locs[SHADER_LOC_VERTEX_TEXCOORD01] = glGetAttribLocation(RLGL.State.defaultShader.id, "vertexTexCoord"); - RLGL.State.defaultShader.locs[SHADER_LOC_VERTEX_COLOR] = glGetAttribLocation(RLGL.State.defaultShader.id, "vertexColor"); + RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_POSITION] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexPosition"); + RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexTexCoord"); + RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_COLOR] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexColor"); // Set default shader locations: uniform locations - RLGL.State.defaultShader.locs[SHADER_LOC_MATRIX_MVP] = glGetUniformLocation(RLGL.State.defaultShader.id, "mvp"); - RLGL.State.defaultShader.locs[SHADER_LOC_COLOR_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShader.id, "colDiffuse"); - RLGL.State.defaultShader.locs[SHADER_LOC_MAP_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShader.id, "texture0"); + RLGL.State.defaultShaderLocs[SHADER_LOC_MATRIX_MVP] = glGetUniformLocation(RLGL.State.defaultShaderId, "mvp"); + RLGL.State.defaultShaderLocs[SHADER_LOC_COLOR_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "colDiffuse"); + RLGL.State.defaultShaderLocs[SHADER_LOC_MAP_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "texture0"); } - else TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to load default shader", RLGL.State.defaultShader.id); + else TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to load default shader", RLGL.State.defaultShaderId); } // Unload default shader @@ -3880,16 +4001,16 @@ static void rlUnloadShaderDefault(void) { glUseProgram(0); - glDetachShader(RLGL.State.defaultShader.id, RLGL.State.defaultVShaderId); - glDetachShader(RLGL.State.defaultShader.id, RLGL.State.defaultFShaderId); + glDetachShader(RLGL.State.defaultShaderId, RLGL.State.defaultVShaderId); + glDetachShader(RLGL.State.defaultShaderId, RLGL.State.defaultFShaderId); glDeleteShader(RLGL.State.defaultVShaderId); glDeleteShader(RLGL.State.defaultFShaderId); - glDeleteProgram(RLGL.State.defaultShader.id); + glDeleteProgram(RLGL.State.defaultShaderId); - RL_FREE(RLGL.State.defaultShader.locs); + RL_FREE(RLGL.State.defaultShaderLocs); - TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShader.id); + TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShaderId); } #if defined(SUPPORT_GL_DETAILS_INFO) @@ -3978,7 +4099,7 @@ static char *rlGetCompressedFormatName(int format) #if defined(GRAPHICS_API_OPENGL_11) // Mipmaps data is generated after image data // NOTE: Only works with RGBA (4 bytes) data! -static int rlGenerateMipmapsData(unsigned char *data, int baseWidth, int baseHeight) +static int rlGenTextureMipmapsData(unsigned char *data, int baseWidth, int baseHeight) { int mipmapCount = 1; // Required mipmap levels count (including base level) int width = baseWidth; @@ -4146,4 +4267,46 @@ static int rlGetPixelDataSize(int width, int height, int format) return dataSize; } + +// Auxiliar math functions + +// Get identity matrix +static rlMatrix rlMatrixIdentity(void) +{ + rlMatrix result = { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + + return result; +} + +// Get two matrix multiplication +// NOTE: When multiplying matrices... the order matters! +static rlMatrix rlMatrixMultiply(rlMatrix left, rlMatrix right) +{ + rlMatrix result = { 0 }; + + result.m0 = left.m0*right.m0 + left.m1*right.m4 + left.m2*right.m8 + left.m3*right.m12; + result.m1 = left.m0*right.m1 + left.m1*right.m5 + left.m2*right.m9 + left.m3*right.m13; + result.m2 = left.m0*right.m2 + left.m1*right.m6 + left.m2*right.m10 + left.m3*right.m14; + result.m3 = left.m0*right.m3 + left.m1*right.m7 + left.m2*right.m11 + left.m3*right.m15; + result.m4 = left.m4*right.m0 + left.m5*right.m4 + left.m6*right.m8 + left.m7*right.m12; + result.m5 = left.m4*right.m1 + left.m5*right.m5 + left.m6*right.m9 + left.m7*right.m13; + result.m6 = left.m4*right.m2 + left.m5*right.m6 + left.m6*right.m10 + left.m7*right.m14; + result.m7 = left.m4*right.m3 + left.m5*right.m7 + left.m6*right.m11 + left.m7*right.m15; + result.m8 = left.m8*right.m0 + left.m9*right.m4 + left.m10*right.m8 + left.m11*right.m12; + result.m9 = left.m8*right.m1 + left.m9*right.m5 + left.m10*right.m9 + left.m11*right.m13; + result.m10 = left.m8*right.m2 + left.m9*right.m6 + left.m10*right.m10 + left.m11*right.m14; + result.m11 = left.m8*right.m3 + left.m9*right.m7 + left.m10*right.m11 + left.m11*right.m15; + result.m12 = left.m12*right.m0 + left.m13*right.m4 + left.m14*right.m8 + left.m15*right.m12; + result.m13 = left.m12*right.m1 + left.m13*right.m5 + left.m14*right.m9 + left.m15*right.m13; + result.m14 = left.m12*right.m2 + left.m13*right.m6 + left.m14*right.m10 + left.m15*right.m14; + result.m15 = left.m12*right.m3 + left.m13*right.m7 + left.m14*right.m11 + left.m15*right.m15; + + return result; +} + #endif // RLGL_IMPLEMENTATION diff --git a/src/shapes.c b/src/shapes.c index 6f8ae6490..104aef0a7 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -36,7 +36,7 @@ #include "config.h" // Defines module configuration flags #endif -#include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 #include // Required for: sinf(), asinf(), cosf(), acosf(), sqrtf(), fabsf() diff --git a/src/textures.c b/src/textures.c index 94da3c8ca..2480bcfcc 100644 --- a/src/textures.c +++ b/src/textures.c @@ -64,17 +64,14 @@ #include "config.h" // Defines module configuration flags #endif +#include "utils.h" // Required for: TRACELOG() and fopen() Android mapping +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3 or ES2 + #include // Required for: malloc(), free() #include // Required for: strlen() [Used in ImageTextEx()] #include // Required for: fabsf() #include // Required for: sprintf() [Used in ExportImageAsCode()] -#include "utils.h" // Required for: fopen() Android mapping - -#include "rlgl.h" // raylib OpenGL abstraction layer to OpenGL 1.1, 3.3 or ES2 - // Required for: rlLoadTexture() rlUnloadTexture(), - // rlGenerateMipmaps(), some funcs for DrawTexturePro() - // Support only desired texture formats on stb_image #if !defined(SUPPORT_FILEFORMAT_BMP) #define STBI_NO_BMP @@ -397,7 +394,7 @@ Image LoadImageFromTexture(Texture2D texture) if (texture.format < PIXELFORMAT_COMPRESSED_DXT1_RGB) { - image.data = rlReadTexturePixels(texture); + image.data = rlReadTexturePixels(texture.id, texture.width, texture.height, texture.format); if (image.data != NULL) { @@ -2348,7 +2345,7 @@ void ImageDrawPixel(Image *dst, int x, int y, Color color) unsigned char r = (unsigned char)(round(coln.x*31.0f)); unsigned char g = (unsigned char)(round(coln.y*31.0f)); unsigned char b = (unsigned char)(round(coln.z*31.0f)); - unsigned char a = (coln.w > ((float)PIXELFORMAT_UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;; + unsigned char a = (coln.w > ((float)PIXELFORMAT_UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0; ((unsigned short *)dst->data)[y*dst->width + x] = (unsigned short)r << 11 | (unsigned short)g << 6 | (unsigned short)b << 1 | (unsigned short)a; @@ -2934,7 +2931,7 @@ void GenTextureMipmaps(Texture2D *texture) { // NOTE: NPOT textures support check inside function // On WebGL (OpenGL ES 2.0) NPOT textures support is limited - rlGenerateMipmaps(texture); + rlGenTextureMipmaps(texture->id, texture->width, texture->height, texture->format, &texture->mipmaps); } // Set texture scaling filter mode @@ -3810,7 +3807,7 @@ void SetPixelColor(void *dstPtr, Color color, int format) unsigned char r = (unsigned char)(round(coln.x*31.0f)); unsigned char g = (unsigned char)(round(coln.y*31.0f)); unsigned char b = (unsigned char)(round(coln.z*31.0f)); - unsigned char a = (coln.w > ((float)PIXELFORMAT_UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0;; + unsigned char a = (coln.w > ((float)PIXELFORMAT_UNCOMPRESSED_R5G5B5A1_ALPHA_THRESHOLD/255.0f))? 1 : 0; ((unsigned short *)dstPtr)[0] = (unsigned short)r << 11 | (unsigned short)g << 6 | (unsigned short)b << 1 | (unsigned short)a; diff --git a/src/utils.c b/src/utils.c index dbf4b3bbb..4cb095946 100644 --- a/src/utils.c +++ b/src/utils.c @@ -99,6 +99,29 @@ static int android_close(void *cookie); //---------------------------------------------------------------------------------- // Module Functions Definition - Utilities //---------------------------------------------------------------------------------- +rlMatrix rlMatrixFromMatrix(Matrix mat) +{ + rlMatrix result = { + mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) + mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) + mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) + mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) + }; + + return result; +} + +Matrix rlMatrixToMatrix(rlMatrix mat) +{ + Matrix result = { + mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) + mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) + mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) + mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) + }; + + return result; +} // Set the current threshold (minimum) log level void SetTraceLogLevel(int logType) { logTypeLevel = logType; } diff --git a/src/utils.h b/src/utils.h index 50f704201..00ed8d149 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,6 +45,8 @@ #define TRACELOGD(...) (void)0 #endif +#include "rlgl.h" // Required for: rlMatrix + //---------------------------------------------------------------------------------- // Some basic Defines //---------------------------------------------------------------------------------- @@ -67,6 +69,9 @@ extern "C" { // Prevents name mangling of functions //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- +rlMatrix rlMatrixFromMatrix(Matrix mat); +Matrix rlMatrixToMatrix(rlMatrix mat); + #if defined(PLATFORM_ANDROID) void InitAssetManager(AAssetManager *manager, const char *dataPath); // Initialize asset manager from android app FILE *android_fopen(const char *fileName, const char *mode); // Replacement for fopen() -> Read-only! From bd70a224127207e1483eda4538cc482c9c7f49a0 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 11:56:14 +0200 Subject: [PATCH 007/570] Review some issues --- src/core.c | 10 +++++----- src/rlgl.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core.c b/src/core.c index 8ccc1e083..5e46d2c61 100644 --- a/src/core.c +++ b/src/core.c @@ -121,6 +121,11 @@ #include "utils.h" // Required for: TRACELOG() macros +#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L + #undef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. +#endif + #define RLGL_IMPLEMENTATION #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 @@ -154,11 +159,6 @@ #include "external/sdefl.h" // Deflate (RFC 1951) compressor #endif -#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L - #undef _POSIX_C_SOURCE - #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. -#endif - #include // Required for: srand(), rand(), atexit() #include // Required for: sprintf() [Used in OpenURL()] #include // Required for: strrchr(), strcmp(), strlen() diff --git a/src/rlgl.h b/src/rlgl.h index 8edccf2d7..747013720 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2968,7 +2968,7 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, id, 0); // We read data as RGBA because FBO texture is configured as RGBA, despite binding another texture format - pixels = (unsigned char *)RL_MALLOC(rlGetPixelDataSize(texture.width, texture.height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)); + pixels = (unsigned char *)RL_MALLOC(rlGetPixelDataSize(width, height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)); glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glBindFramebuffer(GL_FRAMEBUFFER, 0); From 1cc25d1a2d272202750c6250e84d4dfa87f5d845 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 12:14:31 +0200 Subject: [PATCH 008/570] Review include path that was breaking the build --- src/Makefile | 2 +- src/core.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index 88570d405..3a90dd92a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -385,7 +385,7 @@ endif # Define include paths for required headers # NOTE: Several external required libraries (stb and others) -INCLUDE_PATHS = -I. -Iexternal -Iexternal/glfw/include -Iexternal/glfw/deps/mingw +INCLUDE_PATHS = -I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),BSD) diff --git a/src/core.c b/src/core.c index 5e46d2c61..8ccc1e083 100644 --- a/src/core.c +++ b/src/core.c @@ -121,11 +121,6 @@ #include "utils.h" // Required for: TRACELOG() macros -#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L - #undef _POSIX_C_SOURCE - #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. -#endif - #define RLGL_IMPLEMENTATION #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 @@ -159,6 +154,11 @@ #include "external/sdefl.h" // Deflate (RFC 1951) compressor #endif +#if (defined(__linux__) || defined(PLATFORM_WEB)) && _POSIX_C_SOURCE < 199309L + #undef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 199309L // Required for: CLOCK_MONOTONIC if compiled with c99 without gnu ext. +#endif + #include // Required for: srand(), rand(), atexit() #include // Required for: sprintf() [Used in OpenURL()] #include // Required for: strrchr(), strcmp(), strlen() From 71373ee52468871e464e07000f8a602f373e906b Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 12:48:09 +0200 Subject: [PATCH 009/570] Update Makefile --- examples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/Makefile b/examples/Makefile index aa183fd17..bded27e53 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -195,7 +195,7 @@ endif # -std=gnu99 defines C language mode (GNU C from 1999 revision) # -Wno-missing-braces ignore invalid warning (GCC bug 53119) # -D_DEFAULT_SOURCE use with -std=c99 on Linux and PLATFORM_WEB, required for timespec -CFLAGS += -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces +CFLAGS += -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces -Wunused-result ifeq ($(BUILD_MODE),DEBUG) CFLAGS += -g From aeb1a0da84adc9e6987e1436431ea9cf495c8802 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 12:54:54 +0200 Subject: [PATCH 010/570] REVERTED: Removed the need for `rlMatrix` Now rlgl uses the `Matrix` type, just make sure it has been previously defined somewhere... I don't like this approach but it's probably the easier one for the users... still looking for a better solution... maybe using something like `#define MATRIX_TYPE`, so it can be checked in other modules. --- examples/models/models_skybox.c | 1 + examples/others/rlgl_standalone.c | 36 +++---- examples/shaders/shaders_hot_reloading.c | 2 +- src/core.c | 6 +- src/models.c | 24 ++--- src/rlgl.h | 131 +++++++++++------------ src/utils.c | 23 ---- src/utils.h | 5 - 8 files changed, 90 insertions(+), 138 deletions(-) diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c index 2b98435ac..168d61f61 100644 --- a/examples/models/models_skybox.c +++ b/examples/models/models_skybox.c @@ -11,6 +11,7 @@ #include "raylib.h" #include "rlgl.h" +#include "raymath.h" #if defined(PLATFORM_DESKTOP) #define GLSL_VERSION 330 diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index a069d0296..d92729f7e 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -48,14 +48,14 @@ * ********************************************************************************************/ -#define RLGL_IMPLEMENTATION -#define RLGL_STANDALONE -#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 - #define RAYMATH_STANDALONE #define RAYMATH_HEADER_ONLY #include "raymath.h" // Vector3, Quaternion and Matrix functionality +#define RLGL_IMPLEMENTATION +#define RLGL_STANDALONE +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 + #if defined(__EMSCRIPTEN__) #define GLFW_INCLUDE_ES2 #endif @@ -116,22 +116,10 @@ static void DrawCubeWires(Vector3 position, float width, float height, float len static void DrawRectangleV(Vector2 position, Vector2 size, Color color); // NOTE: We used raymath to get this functionality but it can be implemented here -//static rlMatrix MatrixIdentity(void); -//static rlMatrix MatrixOrtho(double left, double right, double bottom, double top, double near, double far); -//static rlMatrix MatrixPerspective(double fovy, double aspect, double near, double far); -//static rlMatrix MatrixLookAt(Vector3 eye, Vector3 target, Vector3 up); - -rlMatrix rlMatrixFromMatrix(Matrix mat) -{ - rlMatrix result = { - mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) - mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) - mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) - mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) - }; - - return result; -} +//static Matrix MatrixIdentity(void); +//static Matrix MatrixOrtho(double left, double right, double bottom, double top, double near, double far); +//static Matrix MatrixPerspective(double fovy, double aspect, double near, double far); +//static Matrix MatrixLookAt(Vector3 eye, Vector3 target, Vector3 up); //---------------------------------------------------------------------------------- // Main Entry point @@ -226,8 +214,8 @@ int main(void) Matrix matProj = MatrixPerspective((double)(camera.fovy*DEG2RAD), (double)screenWidth/(double)screenHeight, 0.01, 1000.0); Matrix matView = MatrixLookAt(camera.position, camera.target, camera.up); - rlSetMatrixModelview(rlMatrixFromMatrix(matView)); // Set internal modelview matrix (default shader) - rlSetMatrixProjection(rlMatrixFromMatrix(matProj)); // Set internal projection matrix (default shader) + rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) + rlSetMatrixProjection(matProj); // Set internal projection matrix (default shader) DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED); DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, RAYWHITE); @@ -244,8 +232,8 @@ int main(void) matProj = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0); matView = MatrixIdentity(); - rlSetMatrixModelview(rlMatrixFromMatrix(matView)); // Set internal modelview matrix (default shader) - rlSetMatrixProjection(rlMatrixFromMatrix(matProj)); // Set internal projection matrix (default shader) + rlSetMatrixModelview(matView); // Set internal modelview matrix (default shader) + rlSetMatrixProjection(matProj); // Set internal projection matrix (default shader) #else // Let rlgl generate and multiply matrix internally diff --git a/examples/shaders/shaders_hot_reloading.c b/examples/shaders/shaders_hot_reloading.c index 05da7b7ab..6f66f3613 100644 --- a/examples/shaders/shaders_hot_reloading.c +++ b/examples/shaders/shaders_hot_reloading.c @@ -77,7 +77,7 @@ int main(void) // Try reloading updated shader Shader updatedShader = LoadShader(0, TextFormat(fragShaderFileName, GLSL_VERSION)); - if (updatedShader.id != rlGetShaderDefault().id) // It was correctly loaded + if (updatedShader.id != rlGetShaderIdDefault()) // It was correctly loaded { UnloadShader(shader); shader = updatedShader; diff --git a/src/core.c b/src/core.c index 8ccc1e083..764969e99 100644 --- a/src/core.c +++ b/src/core.c @@ -2185,8 +2185,8 @@ void BeginVrStereoMode(VrStereoConfig config) rlEnableStereoRender(); // Set stereo render matrices - rlSetMatrixProjectionStereo(rlMatrixFromMatrix(config.projection[0]), rlMatrixFromMatrix(config.projection[1])); - rlSetMatrixViewOffsetStereo(rlMatrixFromMatrix(config.viewOffset[0]), rlMatrixFromMatrix(config.viewOffset[1])); + rlSetMatrixProjectionStereo(config.projection[0], config.projection[1]); + rlSetMatrixViewOffsetStereo(config.viewOffset[0], config.viewOffset[1]); } // End VR drawing process (and desktop mirror) @@ -2381,7 +2381,7 @@ void SetShaderValueV(Shader shader, int locIndex, const void *value, int uniform void SetShaderValueMatrix(Shader shader, int locIndex, Matrix mat) { rlEnableShader(shader.id); - rlSetUniformMatrix(locIndex, rlMatrixFromMatrix(mat)); + rlSetUniformMatrix(locIndex, mat); //rlDisableShader(); } diff --git a/src/models.c b/src/models.c index 466e2ad7c..870c5e8cb 100644 --- a/src/models.c +++ b/src/models.c @@ -1051,13 +1051,13 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // That's because BeginMode3D() sets it and there is no model-drawing function // that modifies it, all use rlPushMatrix() and rlPopMatrix() Matrix matModel = MatrixIdentity(); - Matrix matView = rlMatrixToMatrix(rlGetMatrixModelview()); + Matrix matView = rlGetMatrixModelview(); Matrix matModelView = MatrixIdentity(); - Matrix matProjection = rlMatrixToMatrix(rlGetMatrixProjection()); + Matrix matProjection = rlGetMatrixProjection(); // Upload view and projection matrices (if locations available) - if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], rlMatrixFromMatrix(matView)); - if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], rlMatrixFromMatrix(matProjection)); + if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], matView); + if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], matProjection); if (instancing) { @@ -1089,24 +1089,24 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // Accumulate internal matrix transform (push/pop) and view matrix // NOTE: In this case, model instance transformation must be computed in the shader - matModelView = MatrixMultiply(rlMatrixToMatrix(rlGetMatrixTransform()), matView); + matModelView = MatrixMultiply(rlGetMatrixTransform(), matView); } else { // Model transformation matrix is send to shader uniform location: SHADER_LOC_MATRIX_MODEL - if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], rlMatrixFromMatrix(transforms[0])); + if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], transforms[0]); // Accumulate several model transformations: // transforms[0]: model transformation provided (includes DrawModel() params combined with model.transform) // rlGetMatrixTransform(): rlgl internal transform matrix due to push/pop matrix stack - matModel = MatrixMultiply(transforms[0], rlMatrixToMatrix(rlGetMatrixTransform())); + matModel = MatrixMultiply(transforms[0], rlGetMatrixTransform()); // Get model-view matrix matModelView = MatrixMultiply(matModel, matView); } // Upload model normal matrix (if locations available) - if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], rlMatrixFromMatrix(MatrixTranspose(MatrixInvert(matModel)))); + if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], MatrixTranspose(MatrixInvert(matModel))); //----------------------------------------------------- // Bind active texture maps (if available) @@ -1199,11 +1199,11 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins { // Setup current eye viewport (half screen width) rlViewport(eye*rlGetFramebufferWidth()/2, 0, rlGetFramebufferWidth()/2, rlGetFramebufferHeight()); - matModelViewProjection = MatrixMultiply(MatrixMultiply(matModelView, rlMatrixToMatrix(rlGetMatrixViewOffsetStereo(eye))), rlMatrixToMatrix(rlGetMatrixProjectionStereo(eye))); + matModelViewProjection = MatrixMultiply(MatrixMultiply(matModelView, rlGetMatrixViewOffsetStereo(eye)), rlGetMatrixProjectionStereo(eye)); } // Send combined model-view-projection matrix to shader - rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], rlMatrixFromMatrix(matModelViewProjection)); + rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], matModelViewProjection); if (instancing) // Draw mesh instanced { @@ -1247,8 +1247,8 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins else { // Restore rlgl internal modelview and projection matrices - rlSetMatrixModelview(rlMatrixFromMatrix(matView)); - rlSetMatrixProjection(rlMatrixFromMatrix(matProjection)); + rlSetMatrixModelview(matView); + rlSetMatrixProjection(matProjection); } #endif } diff --git a/src/rlgl.h b/src/rlgl.h index 747013720..e7a396c59 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -148,9 +148,9 @@ #define MAX_BATCH_ACTIVE_TEXTURES 4 // Maximum number of additional textures that can be activated on batch drawing (SetShaderValueTexture()) #endif -// Internal rlMatrix stack +// Internal Matrix stack #ifndef MAX_MATRIX_STACK_SIZE - #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of rlMatrix stack + #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of Matrix stack #endif // Vertex buffers id limit @@ -193,7 +193,7 @@ #define RL_TEXTURE_WRAP_MIRROR_REPEAT 0x8370 // GL_MIRRORED_REPEAT #define RL_TEXTURE_WRAP_MIRROR_CLAMP 0x8742 // GL_MIRROR_CLAMP_EXT -// rlMatrix modes (equivalent to OpenGL) +// Matrix modes (equivalent to OpenGL) #define RL_MODELVIEW 0x1700 // GL_MODELVIEW #define RL_PROJECTION 0x1701 // GL_PROJECTION #define RL_TEXTURE 0x1702 // GL_TEXTURE @@ -241,15 +241,6 @@ typedef enum { RL_ATTACHMENT_RENDERBUFFER = 200, } rlFramebufferAttachTextureType; -// rlMatrix, 4x4 components, column major, OpenGL style, right handed -// NOTE: This struct is aligned with raylib struct Matrix -typedef struct rlMatrix { - float m0, m4, m8, m12; // Matrix first row (4 components) - float m1, m5, m9, m13; // Matrix second row (4 components) - float m2, m6, m10, m14; // Matrix third row (4 components) - float m3, m7, m11, m15; // Matrix fourth row (4 components) -} rlMatrix; - // Dynamic vertex buffers (position + texcoords + colors + indices arrays) typedef struct rlVertexBuffer { int elementsCount; // Number of elements in the buffer (QUADS) @@ -283,8 +274,8 @@ typedef struct rlDrawCall { //unsigned int shaderId; // Shader id to be used on the draw -> Using RLGL.currentShaderId unsigned int textureId; // Texture id to be used on the draw -> Use to create new draw call if changes - //rlMatrix projection; // Projection matrix for this draw -> Using RLGL.projection by default - //rlMatrix modelview; // Modelview matrix for this draw -> Using RLGL.modelview by default + //Matrix projection; // Projection matrix for this draw -> Using RLGL.projection by default + //Matrix modelview; // Modelview matrix for this draw -> Using RLGL.modelview by default } rlDrawCall; // rlRenderBatch type @@ -434,7 +425,7 @@ extern "C" { // Prevents name mangling of functions #endif //------------------------------------------------------------------------------------ -// Functions Declaration - rlMatrix operations +// Functions Declaration - Matrix operations //------------------------------------------------------------------------------------ RLAPI void rlMatrixMode(int mode); // Choose the current matrix to be transformed RLAPI void rlPushMatrix(void); // Push the current matrix to stack @@ -593,20 +584,20 @@ RLAPI void rlUnloadShaderProgram(unsigned int id); RLAPI int rlGetLocationUniform(unsigned int shaderId, const char *uniformName); // Get shader location uniform RLAPI int rlGetLocationAttrib(unsigned int shaderId, const char *attribName); // Get shader location attribute RLAPI void rlSetUniform(int locIndex, const void *value, int uniformType, int count); // Set shader value uniform -RLAPI void rlSetUniformMatrix(int locIndex, rlMatrix mat); // Set shader value matrix +RLAPI void rlSetUniformMatrix(int locIndex, Matrix mat); // Set shader value matrix RLAPI void rlSetUniformSampler(int locIndex, unsigned int textureId); // Set shader value sampler RLAPI void rlSetShader(unsigned int id, int *locs); // Set shader currently active (id and locations) -// rlMatrix state management -RLAPI rlMatrix rlGetMatrixModelview(void); // Get internal modelview matrix -RLAPI rlMatrix rlGetMatrixProjection(void); // Get internal projection matrix -RLAPI rlMatrix rlGetMatrixTransform(void); // Get internal accumulated transform matrix -RLAPI rlMatrix rlGetMatrixProjectionStereo(int eye); // Get internal projection matrix for stereo render (selected eye) -RLAPI rlMatrix rlGetMatrixViewOffsetStereo(int eye); // Get internal view offset matrix for stereo render (selected eye) -RLAPI void rlSetMatrixProjection(rlMatrix proj); // Set a custom projection matrix (replaces internal projection matrix) -RLAPI void rlSetMatrixModelview(rlMatrix view); // Set a custom modelview matrix (replaces internal modelview matrix) -RLAPI void rlSetMatrixProjectionStereo(rlMatrix right, rlMatrix left); // Set eyes projection matrices for stereo rendering -RLAPI void rlSetMatrixViewOffsetStereo(rlMatrix right, rlMatrix left); // Set eyes view offsets matrices for stereo rendering +// Matrix state management +RLAPI Matrix rlGetMatrixModelview(void); // Get internal modelview matrix +RLAPI Matrix rlGetMatrixProjection(void); // Get internal projection matrix +RLAPI Matrix rlGetMatrixTransform(void); // Get internal accumulated transform matrix +RLAPI Matrix rlGetMatrixProjectionStereo(int eye); // Get internal projection matrix for stereo render (selected eye) +RLAPI Matrix rlGetMatrixViewOffsetStereo(int eye); // Get internal view offset matrix for stereo render (selected eye) +RLAPI void rlSetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix) +RLAPI void rlSetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix) +RLAPI void rlSetMatrixProjectionStereo(Matrix right, Matrix left); // Set eyes projection matrices for stereo rendering +RLAPI void rlSetMatrixViewOffsetStereo(Matrix right, Matrix left); // Set eyes view offsets matrices for stereo rendering // Quick and dirty cube/quad buffers load->draw->unload RLAPI void rlLoadDrawCube(void); // Load and draw a cube @@ -817,13 +808,13 @@ typedef struct rlglData { struct { int currentMatrixMode; // Current matrix mode - rlMatrix *currentMatrix; // Current matrix pointer - rlMatrix modelview; // Default modelview matrix - rlMatrix projection; // Default projection matrix - rlMatrix transform; // Transform matrix to be used with rlTranslate, rlRotate, rlScale + Matrix *currentMatrix; // Current matrix pointer + Matrix modelview; // Default modelview matrix + Matrix projection; // Default projection matrix + Matrix transform; // Transform matrix to be used with rlTranslate, rlRotate, rlScale bool transformRequired; // Require transform matrix application to current draw-call vertex (if required) - rlMatrix stack[MAX_MATRIX_STACK_SIZE];// rlMatrix stack for push/pop - int stackCounter; // rlMatrix stack counter + Matrix stack[MAX_MATRIX_STACK_SIZE];// Matrix stack for push/pop + int stackCounter; // Matrix stack counter unsigned int defaultTextureId; // Default texture used on shapes/poly drawing (required by shader) unsigned int activeTextureId[MAX_BATCH_ACTIVE_TEXTURES]; // Active texture ids to be enabled on batch drawing (0 active by default) @@ -835,8 +826,8 @@ typedef struct rlglData { int *currentShaderLocs; // Current shader locations pointer to be used on rendering (by default, defaultShaderLocs) bool stereoRender; // Stereo rendering flag - rlMatrix projectionStereo[2]; // VR stereo rendering eyes projection matrices - rlMatrix viewOffsetStereo[2]; // VR stereo rendering eyes view offset matrices + Matrix projectionStereo[2]; // VR stereo rendering eyes projection matrices + Matrix viewOffsetStereo[2]; // VR stereo rendering eyes view offset matrices int currentBlendMode; // Blending mode active int glBlendSrcFactor; // Blending source factor @@ -906,11 +897,11 @@ static unsigned char *rlGenNextMipmapData(unsigned char *srcData, int srcWidth, #endif static int rlGetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes (image or texture) // Auxiliar matrix math functions -static rlMatrix rlMatrixIdentity(void); // Get identity matrix -static rlMatrix rlMatrixMultiply(rlMatrix left, rlMatrix right); // Multiply two matrices +static Matrix rlMatrixIdentity(void); // Get identity matrix +static Matrix rlMatrixMultiply(Matrix left, Matrix right); // Multiply two matrices //---------------------------------------------------------------------------------- -// Module Functions Definition - rlMatrix operations +// Module Functions Definition - Matrix operations //---------------------------------------------------------------------------------- #if defined(GRAPHICS_API_OPENGL_11) @@ -959,7 +950,7 @@ void rlMatrixMode(int mode) // Push the current matrix into RLGL.State.stack void rlPushMatrix(void) { - if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(LOG_ERROR, "RLGL: rlMatrix stack overflow (MAX_MATRIX_STACK_SIZE)"); + if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(LOG_ERROR, "RLGL: Matrix stack overflow (MAX_MATRIX_STACK_SIZE)"); if (RLGL.State.currentMatrixMode == RL_MODELVIEW) { @@ -976,7 +967,7 @@ void rlPopMatrix(void) { if (RLGL.State.stackCounter > 0) { - rlMatrix mat = RLGL.State.stack[RLGL.State.stackCounter - 1]; + Matrix mat = RLGL.State.stack[RLGL.State.stackCounter - 1]; *RLGL.State.currentMatrix = mat; RLGL.State.stackCounter--; } @@ -997,7 +988,7 @@ void rlLoadIdentity(void) // Multiply the current matrix by a translation matrix void rlTranslatef(float x, float y, float z) { - rlMatrix matTranslation = { + Matrix matTranslation = { 1.0f, 0.0f, 0.0f, x, 0.0f, 1.0f, 0.0f, y, 0.0f, 0.0f, 1.0f, z, @@ -1012,7 +1003,7 @@ void rlTranslatef(float x, float y, float z) // NOTE: The provided angle must be in degrees void rlRotatef(float angle, float x, float y, float z) { - rlMatrix matRotation = rlMatrixIdentity(); + Matrix matRotation = rlMatrixIdentity(); // Axis vector (x, y, z) normalization float lengthSquared = x*x + y*y + z*z; @@ -1056,7 +1047,7 @@ void rlRotatef(float angle, float x, float y, float z) // Multiply the current matrix by a scaling matrix void rlScalef(float x, float y, float z) { - rlMatrix matScale = { + Matrix matScale = { x, 0.0f, 0.0f, 0.0f, 0.0f, y, 0.0f, 0.0f, 0.0f, 0.0f, z, 0.0f, @@ -1070,8 +1061,8 @@ void rlScalef(float x, float y, float z) // Multiply the current matrix by another matrix void rlMultMatrixf(float *matf) { - // rlMatrix creation from array - rlMatrix mat = { matf[0], matf[4], matf[8], matf[12], + // Matrix creation from array + Matrix mat = { matf[0], matf[4], matf[8], matf[12], matf[1], matf[5], matf[9], matf[13], matf[2], matf[6], matf[10], matf[14], matf[3], matf[7], matf[11], matf[15] }; @@ -1082,7 +1073,7 @@ void rlMultMatrixf(float *matf) // Multiply the current matrix by a perspective matrix generated by parameters void rlFrustum(double left, double right, double bottom, double top, double znear, double zfar) { - rlMatrix matFrustum = { 0 }; + Matrix matFrustum = { 0 }; float rl = (float)(right - left); float tb = (float)(top - bottom); @@ -1116,7 +1107,7 @@ void rlOrtho(double left, double right, double bottom, double top, double znear, { // NOTE: If left-right and top-botton values are equal it could create a division by zero, // response to it is platform/compiler dependant - rlMatrix matOrtho = { 0 }; + Matrix matOrtho = { 0 }; float rl = (float)(right - left); float tb = (float)(top - bottom); @@ -2303,8 +2294,8 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // Draw batch vertex buffers (considering VR stereo if required) //------------------------------------------------------------------------------------------------------------ - rlMatrix matProjection = RLGL.State.projection; - rlMatrix matModelView = RLGL.State.modelview; + Matrix matProjection = RLGL.State.projection; + Matrix matModelView = RLGL.State.modelview; int eyesCount = 1; if (RLGL.State.stereoRender) eyesCount = 2; @@ -2329,7 +2320,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) glUseProgram(RLGL.State.currentShaderId); // Create modelview-projection matrix and upload to shader - rlMatrix matMVP = rlMatrixMultiply(RLGL.State.modelview, RLGL.State.projection); + Matrix matMVP = rlMatrixMultiply(RLGL.State.modelview, RLGL.State.projection); float matMVPfloat[16] = { matMVP.m0, matMVP.m1, matMVP.m2, matMVP.m3, matMVP.m4, matMVP.m5, matMVP.m6, matMVP.m7, @@ -3561,7 +3552,7 @@ void rlSetVertexAttributeDefault(int locIndex, const void *value, int attribType } // Set shader value uniform matrix -void rlSetUniformMatrix(int locIndex, rlMatrix mat) +void rlSetUniformMatrix(int locIndex, Matrix mat) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) float matfloat[16] = { @@ -3608,12 +3599,12 @@ void rlSetShader(unsigned int id, int *locs) #endif } -// rlMatrix state management +// Matrix state management //----------------------------------------------------------------------------------------- // Get internal modelview matrix -rlMatrix rlGetMatrixModelview(void) +Matrix rlGetMatrixModelview(void) { - rlMatrix matrix = rlMatrixIdentity(); + Matrix matrix = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_11) float mat[16]; glGetFloatv(GL_MODELVIEW_MATRIX, mat); @@ -3640,12 +3631,12 @@ rlMatrix rlGetMatrixModelview(void) } // Get internal projection matrix -rlMatrix rlGetMatrixProjection(void) +Matrix rlGetMatrixProjection(void) { #if defined(GRAPHICS_API_OPENGL_11) float mat[16]; glGetFloatv(GL_PROJECTION_MATRIX,mat); - rlMatrix m; + Matrix m; m.m0 = mat[0]; m.m1 = mat[1]; m.m2 = mat[2]; @@ -3669,13 +3660,13 @@ rlMatrix rlGetMatrixProjection(void) } // Get internal accumulated transform matrix -rlMatrix rlGetMatrixTransform(void) +Matrix rlGetMatrixTransform(void) { - rlMatrix mat = rlMatrixIdentity(); + Matrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // TODO: Consider possible transform matrices in the RLGL.State.stack // Is this the right order? or should we start with the first stored matrix instead of the last one? - //rlMatrix matStackTransform = rlMatrixIdentity(); + //Matrix matStackTransform = rlMatrixIdentity(); //for (int i = RLGL.State.stackCounter; i > 0; i--) matStackTransform = rlMatrixMultiply(RLGL.State.stack[i], matStackTransform); mat = RLGL.State.transform; #endif @@ -3683,9 +3674,9 @@ rlMatrix rlGetMatrixTransform(void) } // Get internal projection matrix for stereo render (selected eye) -RLAPI rlMatrix rlGetMatrixProjectionStereo(int eye) +RLAPI Matrix rlGetMatrixProjectionStereo(int eye) { - rlMatrix mat = rlMatrixIdentity(); + Matrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) mat = RLGL.State.projectionStereo[eye]; #endif @@ -3693,9 +3684,9 @@ RLAPI rlMatrix rlGetMatrixProjectionStereo(int eye) } // Get internal view offset matrix for stereo render (selected eye) -RLAPI rlMatrix rlGetMatrixViewOffsetStereo(int eye) +RLAPI Matrix rlGetMatrixViewOffsetStereo(int eye) { - rlMatrix mat = rlMatrixIdentity(); + Matrix mat = rlMatrixIdentity(); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) mat = RLGL.State.viewOffsetStereo[eye]; #endif @@ -3703,7 +3694,7 @@ RLAPI rlMatrix rlGetMatrixViewOffsetStereo(int eye) } // Set a custom modelview matrix (replaces internal modelview matrix) -void rlSetMatrixModelview(rlMatrix view) +void rlSetMatrixModelview(Matrix view) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.modelview = view; @@ -3711,7 +3702,7 @@ void rlSetMatrixModelview(rlMatrix view) } // Set a custom projection matrix (replaces internal projection matrix) -void rlSetMatrixProjection(rlMatrix projection) +void rlSetMatrixProjection(Matrix projection) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.projection = projection; @@ -3719,7 +3710,7 @@ void rlSetMatrixProjection(rlMatrix projection) } // Set eyes projection matrices for stereo rendering -void rlSetMatrixProjectionStereo(rlMatrix right, rlMatrix left) +void rlSetMatrixProjectionStereo(Matrix right, Matrix left) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.projectionStereo[0] = right; @@ -3728,7 +3719,7 @@ void rlSetMatrixProjectionStereo(rlMatrix right, rlMatrix left) } // Set eyes view offsets matrices for stereo rendering -void rlSetMatrixViewOffsetStereo(rlMatrix right, rlMatrix left) +void rlSetMatrixViewOffsetStereo(Matrix right, Matrix left) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) RLGL.State.viewOffsetStereo[0] = right; @@ -4271,9 +4262,9 @@ static int rlGetPixelDataSize(int width, int height, int format) // Auxiliar math functions // Get identity matrix -static rlMatrix rlMatrixIdentity(void) +static Matrix rlMatrixIdentity(void) { - rlMatrix result = { + Matrix result = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, @@ -4285,9 +4276,9 @@ static rlMatrix rlMatrixIdentity(void) // Get two matrix multiplication // NOTE: When multiplying matrices... the order matters! -static rlMatrix rlMatrixMultiply(rlMatrix left, rlMatrix right) +static Matrix rlMatrixMultiply(Matrix left, Matrix right) { - rlMatrix result = { 0 }; + Matrix result = { 0 }; result.m0 = left.m0*right.m0 + left.m1*right.m4 + left.m2*right.m8 + left.m3*right.m12; result.m1 = left.m0*right.m1 + left.m1*right.m5 + left.m2*right.m9 + left.m3*right.m13; diff --git a/src/utils.c b/src/utils.c index 4cb095946..dbf4b3bbb 100644 --- a/src/utils.c +++ b/src/utils.c @@ -99,29 +99,6 @@ static int android_close(void *cookie); //---------------------------------------------------------------------------------- // Module Functions Definition - Utilities //---------------------------------------------------------------------------------- -rlMatrix rlMatrixFromMatrix(Matrix mat) -{ - rlMatrix result = { - mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) - mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) - mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) - mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) - }; - - return result; -} - -Matrix rlMatrixToMatrix(rlMatrix mat) -{ - Matrix result = { - mat.m0, mat.m4, mat.m8, mat.m12, // Matrix first row (4 comat.mponents) - mat.m1, mat.m5, mat.m9, mat.m13, // Matrix second row (4 comat.mponents) - mat.m2, mat.m6, mat.m10, mat.m14, // Matrix third row (4 comat.mponents) - mat.m3, mat.m7, mat.m11, mat.m15, // Matrix fourth row (4 comat.mponents) - }; - - return result; -} // Set the current threshold (minimum) log level void SetTraceLogLevel(int logType) { logTypeLevel = logType; } diff --git a/src/utils.h b/src/utils.h index 00ed8d149..50f704201 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,8 +45,6 @@ #define TRACELOGD(...) (void)0 #endif -#include "rlgl.h" // Required for: rlMatrix - //---------------------------------------------------------------------------------- // Some basic Defines //---------------------------------------------------------------------------------- @@ -69,9 +67,6 @@ extern "C" { // Prevents name mangling of functions //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- -rlMatrix rlMatrixFromMatrix(Matrix mat); -Matrix rlMatrixToMatrix(rlMatrix mat); - #if defined(PLATFORM_ANDROID) void InitAssetManager(AAssetManager *manager, const char *dataPath); // Initialize asset manager from android app FILE *android_fopen(const char *fileName, const char *mode); // Replacement for fopen() -> Read-only! From b4fddf146b1f3d7c0548263594ad7283e6a9ac71 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 13:44:52 +0200 Subject: [PATCH 011/570] REVIEWED: Added new mechanism to avoid data types collision between modules that share same data types and can be used in standalone mode --- examples/others/rlgl_standalone.c | 23 +- src/config.h | 30 +- src/core.c | 30 +- src/raylib.h | 10 + src/raymath.h | 88 ++-- src/rlgl.h | 803 +++++++++++++++--------------- 6 files changed, 490 insertions(+), 494 deletions(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index d92729f7e..0ddae3179 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -48,14 +48,12 @@ * ********************************************************************************************/ -#define RAYMATH_STANDALONE -#define RAYMATH_HEADER_ONLY -#include "raymath.h" // Vector3, Quaternion and Matrix functionality - #define RLGL_IMPLEMENTATION -#define RLGL_STANDALONE #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 +#define RAYMATH_STATIC_INLINE +#include "raymath.h" // Vector3, Quaternion and Matrix functionality + #if defined(__EMSCRIPTEN__) #define GLFW_INCLUDE_ES2 #endif @@ -79,21 +77,6 @@ typedef struct Color { unsigned char a; // Color alpha value } Color; -#if !defined(RAYMATH_STANDALONE) -// Vector2, 2 components -typedef struct Vector2 { - float x; // Vector x component - float y; // Vector y component -} Vector2; - -// Vector3, 3 components -typedef struct Vector3 { - float x; // Vector x component - float y; // Vector y component - float z; // Vector z component -} Vector3; -#endif - // Camera type, defines a camera position/orientation in 3d space typedef struct Camera { Vector3 position; // Camera position diff --git a/src/config.h b/src/config.h index 0cb81c340..084c235db 100644 --- a/src/config.h +++ b/src/config.h @@ -106,22 +106,22 @@ // Default shader vertex attribute names to set location points // NOTE: When a new shader is loaded, the following locations are tried to be set for convenience -#define DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 -#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 -#define DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 -#define DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3 -#define DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 -#define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 +#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 -#define DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix -#define DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix -#define DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix -#define DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix -#define DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) -#define DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) -#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) -#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) -#define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) +#define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix +#define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix +#define RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix +#define RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix +#define RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) +#define RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) +#define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) +#define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) +#define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) //------------------------------------------------------------------------------------ diff --git a/src/core.c b/src/core.c index 764969e99..264921229 100644 --- a/src/core.c +++ b/src/core.c @@ -2317,25 +2317,25 @@ RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode) // NOTE: If any location is not found, loc point becomes -1 // Get handles to GLSL input attibute locations - shader.locs[SHADER_LOC_VERTEX_POSITION] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_POSITION); - shader.locs[SHADER_LOC_VERTEX_TEXCOORD01] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD); - shader.locs[SHADER_LOC_VERTEX_TEXCOORD02] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2); - shader.locs[SHADER_LOC_VERTEX_NORMAL] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_NORMAL); - shader.locs[SHADER_LOC_VERTEX_TANGENT] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_TANGENT); - shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, DEFAULT_SHADER_ATTRIB_NAME_COLOR); + shader.locs[SHADER_LOC_VERTEX_POSITION] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION); + shader.locs[SHADER_LOC_VERTEX_TEXCOORD01] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD); + shader.locs[SHADER_LOC_VERTEX_TEXCOORD02] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2); + shader.locs[SHADER_LOC_VERTEX_NORMAL] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL); + shader.locs[SHADER_LOC_VERTEX_TANGENT] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT); + shader.locs[SHADER_LOC_VERTEX_COLOR] = rlGetLocationAttrib(shader.id, RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR); // Get handles to GLSL uniform locations (vertex shader) - shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_MVP); - shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_VIEW); - shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_PROJECTION); - shader.locs[SHADER_LOC_MATRIX_MODEL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_MODEL); - shader.locs[SHADER_LOC_MATRIX_NORMAL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_NORMAL); + shader.locs[SHADER_LOC_MATRIX_MVP] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_MVP); + shader.locs[SHADER_LOC_MATRIX_VIEW] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW); + shader.locs[SHADER_LOC_MATRIX_PROJECTION] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION); + shader.locs[SHADER_LOC_MATRIX_MODEL] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL); + shader.locs[SHADER_LOC_MATRIX_NORMAL] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL); // Get handles to GLSL uniform locations (fragment shader) - shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_UNIFORM_NAME_COLOR); - shader.locs[SHADER_LOC_MAP_DIFFUSE] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0); // SHADER_LOC_MAP_ALBEDO - shader.locs[SHADER_LOC_MAP_SPECULAR] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1); // SHADER_LOC_MAP_METALNESS - shader.locs[SHADER_LOC_MAP_NORMAL] = rlGetLocationUniform(shader.id, DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2); + shader.locs[SHADER_LOC_COLOR_DIFFUSE] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR); + shader.locs[SHADER_LOC_MAP_DIFFUSE] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0); // SHADER_LOC_MAP_ALBEDO + shader.locs[SHADER_LOC_MAP_SPECULAR] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1); // SHADER_LOC_MAP_METALNESS + shader.locs[SHADER_LOC_MAP_NORMAL] = rlGetLocationUniform(shader.id, RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2); } return shader; diff --git a/src/raylib.h b/src/raylib.h index e70dad777..f3d56a017 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -128,6 +128,16 @@ #define CLITERAL(type) (type) #endif +// NOTE: We set some defines with some data types declared by raylib +// Other modules (raymath, rlgl) also require some of those types, so, +// to be able to use those other modules as standalone (not depending on raylib) +// this defines are very useful for internal check and avoid type (re)definitions +#define RL_VECTOR2_TYPE +#define RL_VECTOR3_TYPE +#define RL_VECTOR4_TYPE +#define RL_QUATERNION_TYPE +#define RL_MATRIX_TYPE + // Some Basic Colors // NOTE: Custom raylib color palette for amazing visuals on WHITE background #define LIGHTGRAY CLITERAL(Color){ 200, 200, 200, 255 } // Light Gray diff --git a/src/raymath.h b/src/raymath.h index ffdd2c274..2eb7bbd0d 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -9,14 +9,10 @@ * If not defined, the library is in header only mode and can be included in other headers * or source files without problems. But only ONE file should hold the implementation. * -* #define RAYMATH_HEADER_ONLY +* #define RAYMATH_STATIC_INLINE * Define static inline functions code, so #include header suffices for use. * This may use up lots of memory. * -* #define RAYMATH_STANDALONE -* Avoid raylib.h header inclusion in this file. -* Vector3 and Matrix data types are defined internally in raymath module. -* * * LICENSE: zlib/libpng * @@ -42,15 +38,8 @@ #ifndef RAYMATH_H #define RAYMATH_H -//#define RAYMATH_STANDALONE // NOTE: To use raymath as standalone lib, just uncomment this line -//#define RAYMATH_HEADER_ONLY // NOTE: To compile functions as static inline, uncomment this line - -#ifndef RAYMATH_STANDALONE - #include "raylib.h" // Required for: Vector3, Matrix structs definition -#endif - -#if defined(RAYMATH_IMPLEMENTATION) && defined(RAYMATH_HEADER_ONLY) - #error "Specifying both RAYMATH_IMPLEMENTATION and RAYMATH_HEADER_ONLY is contradictory" +#if defined(RAYMATH_IMPLEMENTATION) && defined(RAYMATH_STATIC_INLINE) + #error "Specifying both RAYMATH_IMPLEMENTATION and RAYMATH_STATIC_INLINE is contradictory" #endif #if defined(RAYMATH_IMPLEMENTATION) @@ -61,7 +50,7 @@ #else #define RMDEF extern inline // Provide external definition #endif -#elif defined(RAYMATH_HEADER_ONLY) +#elif defined(RAYMATH_STATIC_INLINE) #define RMDEF static inline // Functions may be inlined, no external out-of-line definition #else #if defined(__TINYC__) @@ -100,38 +89,51 @@ // Types and Structures Definition //---------------------------------------------------------------------------------- -#if defined(RAYMATH_STANDALONE) - // Vector2 type - typedef struct Vector2 { - float x; - float y; - } Vector2; +#if !defined(RL_VECTOR2_TYPE) +// Vector2 type +typedef struct Vector2 { + float x; + float y; +} Vector2; +#define RL_VECTOR2_TYPE +#endif - // Vector3 type - typedef struct Vector3 { - float x; - float y; - float z; - } Vector3; +#if !defined(RL_VECTOR3_TYPE) +// Vector3 type +typedef struct Vector3 { + float x; + float y; + float z; +} Vector3; +#define RL_VECTOR3_TYPE +#endif - // Vector4 type - typedef struct Vector4 { - float x; - float y; - float z; - float w; - } Vector4; +#if !defined(RL_VECTOR4_TYPE) +// Vector4 type +typedef struct Vector4 { + float x; + float y; + float z; + float w; +} Vector4; +#define RL_VECTOR4_TYPE +#endif - // Quaternion type - typedef Vector4 Quaternion; +#if !defined(RL_QUATERNION_TYPE) +// Quaternion type +typedef Vector4 Quaternion; +#define RL_QUATERNION_TYPE +#endif - // Matrix type (OpenGL style 4x4 - right handed, column major) - typedef struct Matrix { - float m0, m4, m8, m12; - float m1, m5, m9, m13; - float m2, m6, m10, m14; - float m3, m7, m11, m15; - } Matrix; +#if !defined(RL_MATRIX_TYPE) +// Matrix type (OpenGL style 4x4 - right handed, column major) +typedef struct Matrix { + float m0, m4, m8, m12; // Matrix first row (4 components) + float m1, m5, m9, m13; // Matrix second row (4 components) + float m2, m6, m10, m14; // Matrix third row (4 components) + float m3, m7, m11, m15; // Matrix fourth row (4 components) +} Matrix; +#define RL_MATRIX_TYPE #endif // NOTE: Helper types to be used instead of array return types for *ToFloat functions diff --git a/src/rlgl.h b/src/rlgl.h index e7a396c59..ece72f8c0 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -289,137 +289,138 @@ typedef struct rlRenderBatch { float currentDepth; // Current depth value for next draw } rlRenderBatch; -#if defined(RLGL_STANDALONE) +#if defined(__STDC__) && __STDC_VERSION__ >= 199901L + #include +#elif !defined(__cplusplus) && !defined(bool) // Boolean type - #if defined(__STDC__) && __STDC_VERSION__ >= 199901L - #include - #elif !defined(__cplusplus) && !defined(bool) - typedef enum bool { false, true } bool; - #endif - - // Trace log level - // NOTE: Organized by priority level - typedef enum { - LOG_ALL = 0, // Display all logs - LOG_TRACE, // Trace logging, intended for internal use only - LOG_DEBUG, // Debug logging, used for internal debugging, it should be disabled on release builds - LOG_INFO, // Info logging, used for program execution info - LOG_WARNING, // Warning logging, used on recoverable failures - LOG_ERROR, // Error logging, used on unrecoverable failures - LOG_FATAL, // Fatal logging, used to abort program: exit(EXIT_FAILURE) - LOG_NONE // Disable logging - } TraceLogLevel; - - // Texture formats (support depends on OpenGL version) - typedef enum { - PIXELFORMAT_UNCOMPRESSED_GRAYSCALE = 1, // 8 bit per pixel (no alpha) - PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA, // 8*2 bpp (2 channels) - PIXELFORMAT_UNCOMPRESSED_R5G6B5, // 16 bpp - PIXELFORMAT_UNCOMPRESSED_R8G8B8, // 24 bpp - PIXELFORMAT_UNCOMPRESSED_R5G5B5A1, // 16 bpp (1 bit alpha) - PIXELFORMAT_UNCOMPRESSED_R4G4B4A4, // 16 bpp (4 bit alpha) - PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, // 32 bpp - PIXELFORMAT_UNCOMPRESSED_R32, // 32 bpp (1 channel - float) - PIXELFORMAT_UNCOMPRESSED_R32G32B32, // 32*3 bpp (3 channels - float) - PIXELFORMAT_UNCOMPRESSED_R32G32B32A32, // 32*4 bpp (4 channels - float) - PIXELFORMAT_COMPRESSED_DXT1_RGB, // 4 bpp (no alpha) - PIXELFORMAT_COMPRESSED_DXT1_RGBA, // 4 bpp (1 bit alpha) - PIXELFORMAT_COMPRESSED_DXT3_RGBA, // 8 bpp - PIXELFORMAT_COMPRESSED_DXT5_RGBA, // 8 bpp - PIXELFORMAT_COMPRESSED_ETC1_RGB, // 4 bpp - PIXELFORMAT_COMPRESSED_ETC2_RGB, // 4 bpp - PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA, // 8 bpp - PIXELFORMAT_COMPRESSED_PVRT_RGB, // 4 bpp - PIXELFORMAT_COMPRESSED_PVRT_RGBA, // 4 bpp - PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA, // 8 bpp - PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA // 2 bpp - } PixelFormat; - - // Texture parameters: filter mode - // NOTE 1: Filtering considers mipmaps if available in the texture - // NOTE 2: Filter is accordingly set for minification and magnification - typedef enum { - TEXTURE_FILTER_POINT = 0, // No filter, just pixel aproximation - TEXTURE_FILTER_BILINEAR, // Linear filtering - TEXTURE_FILTER_TRILINEAR, // Trilinear filtering (linear with mipmaps) - TEXTURE_FILTER_ANISOTROPIC_4X, // Anisotropic filtering 4x - TEXTURE_FILTER_ANISOTROPIC_8X, // Anisotropic filtering 8x - TEXTURE_FILTER_ANISOTROPIC_16X, // Anisotropic filtering 16x - } TextureFilter; - - // Texture parameters: wrap mode - typedef enum { - TEXTURE_WRAP_REPEAT = 0, // Repeats texture in tiled mode - TEXTURE_WRAP_CLAMP, // Clamps texture to edge pixel in tiled mode - TEXTURE_WRAP_MIRROR_REPEAT, // Mirrors and repeats the texture in tiled mode - TEXTURE_WRAP_MIRROR_CLAMP // Mirrors and clamps to border the texture in tiled mode - } TextureWrap; - - // Color blending modes (pre-defined) - typedef enum { - BLEND_ALPHA = 0, // Blend textures considering alpha (default) - BLEND_ADDITIVE, // Blend textures adding colors - BLEND_MULTIPLIED, // Blend textures multiplying colors - BLEND_ADD_COLORS, // Blend textures adding colors (alternative) - BLEND_SUBTRACT_COLORS, // Blend textures subtracting colors (alternative) - BLEND_CUSTOM // Belnd textures using custom src/dst factors (use SetBlendModeCustom()) - } BlendMode; - - // Shader location point type - typedef enum { - SHADER_LOC_VERTEX_POSITION = 0, // Shader location: vertex attribute: position - SHADER_LOC_VERTEX_TEXCOORD01, // Shader location: vertex attribute: texcoord01 - SHADER_LOC_VERTEX_TEXCOORD02, // Shader location: vertex attribute: texcoord02 - SHADER_LOC_VERTEX_NORMAL, // Shader location: vertex attribute: normal - SHADER_LOC_VERTEX_TANGENT, // Shader location: vertex attribute: tangent - SHADER_LOC_VERTEX_COLOR, // Shader location: vertex attribute: color - SHADER_LOC_MATRIX_MVP, // Shader location: matrix uniform: model-view-projection - SHADER_LOC_MATRIX_VIEW, // Shader location: matrix uniform: view (camera transform) - SHADER_LOC_MATRIX_PROJECTION, // Shader location: matrix uniform: projection - SHADER_LOC_MATRIX_MODEL, // Shader location: matrix uniform: model (transform) - SHADER_LOC_MATRIX_NORMAL, // Shader location: matrix uniform: normal - SHADER_LOC_VECTOR_VIEW, // Shader location: vector uniform: view - SHADER_LOC_COLOR_DIFFUSE, // Shader location: vector uniform: diffuse color - SHADER_LOC_COLOR_SPECULAR, // Shader location: vector uniform: specular color - SHADER_LOC_COLOR_AMBIENT, // Shader location: vector uniform: ambient color - SHADER_LOC_MAP_ALBEDO, // Shader location: sampler2d texture: albedo (same as: SHADER_LOC_MAP_DIFFUSE) - SHADER_LOC_MAP_METALNESS, // Shader location: sampler2d texture: metalness (same as: SHADER_LOC_MAP_SPECULAR) - SHADER_LOC_MAP_NORMAL, // Shader location: sampler2d texture: normal - SHADER_LOC_MAP_ROUGHNESS, // Shader location: sampler2d texture: roughness - SHADER_LOC_MAP_OCCLUSION, // Shader location: sampler2d texture: occlusion - SHADER_LOC_MAP_EMISSION, // Shader location: sampler2d texture: emission - SHADER_LOC_MAP_HEIGHT, // Shader location: sampler2d texture: height - SHADER_LOC_MAP_CUBEMAP, // Shader location: samplerCube texture: cubemap - SHADER_LOC_MAP_IRRADIANCE, // Shader location: samplerCube texture: irradiance - SHADER_LOC_MAP_PREFILTER, // Shader location: samplerCube texture: prefilter - SHADER_LOC_MAP_BRDF // Shader location: sampler2d texture: brdf - } ShaderLocationIndex; - - #define SHADER_LOC_MAP_DIFFUSE SHADER_LOC_MAP_ALBEDO - #define SHADER_LOC_MAP_SPECULAR SHADER_LOC_MAP_METALNESS - - // Shader uniform data type - typedef enum { - SHADER_UNIFORM_FLOAT = 0, // Shader uniform type: float - SHADER_UNIFORM_VEC2, // Shader uniform type: vec2 (2 float) - SHADER_UNIFORM_VEC3, // Shader uniform type: vec3 (3 float) - SHADER_UNIFORM_VEC4, // Shader uniform type: vec4 (4 float) - SHADER_UNIFORM_INT, // Shader uniform type: int - SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) - SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int) - SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int) - SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d - } ShaderUniformDataType; - - // Shader attribute data types - typedef enum { - SHADER_ATTRIB_FLOAT = 0, // Shader attribute type: float - SHADER_ATTRIB_VEC2, // Shader attribute type: vec2 (2 float) - SHADER_ATTRIB_VEC3, // Shader attribute type: vec3 (3 float) - SHADER_ATTRIB_VEC4 // Shader attribute type: vec4 (4 float) - } ShaderAttributeDataType; + typedef enum bool { false, true } bool; #endif +#if !defined(RL_MATRIX_TYPE) +// Matrix, 4x4 components, column major, OpenGL style, right handed +typedef struct Matrix { + float m0, m4, m8, m12; // Matrix first row (4 components) + float m1, m5, m9, m13; // Matrix second row (4 components) + float m2, m6, m10, m14; // Matrix third row (4 components) + float m3, m7, m11, m15; // Matrix fourth row (4 components) +} Matrix; +#define RL_MATRIX_TYPE +#endif + +// Trace log level +// NOTE: Organized by priority level +typedef enum { + RL_LOG_ALL = 0, // Display all logs + RL_LOG_TRACE, // Trace logging, intended for internal use only + RL_LOG_DEBUG, // Debug logging, used for internal debugging, it should be disabled on release builds + RL_LOG_INFO, // Info logging, used for program execution info + RL_LOG_WARNING, // Warning logging, used on recoverable failures + RL_LOG_ERROR, // Error logging, used on unrecoverable failures + RL_LOG_FATAL, // Fatal logging, used to abort program: exit(EXIT_FAILURE) + RL_LOG_NONE // Disable logging +} rlTraceLogLevel; + +// Texture formats (support depends on OpenGL version) +typedef enum { + RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE = 1, // 8 bit per pixel (no alpha) + RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA, // 8*2 bpp (2 channels) + RL_PIXELFORMAT_UNCOMPRESSED_R5G6B5, // 16 bpp + RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8, // 24 bpp + RL_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1, // 16 bpp (1 bit alpha) + RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4, // 16 bpp (4 bit alpha) + RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, // 32 bpp + RL_PIXELFORMAT_UNCOMPRESSED_R32, // 32 bpp (1 channel - float) + RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32, // 32*3 bpp (3 channels - float) + RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32, // 32*4 bpp (4 channels - float) + RL_PIXELFORMAT_COMPRESSED_DXT1_RGB, // 4 bpp (no alpha) + RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA, // 4 bpp (1 bit alpha) + RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA, // 8 bpp + RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA, // 8 bpp + RL_PIXELFORMAT_COMPRESSED_ETC1_RGB, // 4 bpp + RL_PIXELFORMAT_COMPRESSED_ETC2_RGB, // 4 bpp + RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA, // 8 bpp + RL_PIXELFORMAT_COMPRESSED_PVRT_RGB, // 4 bpp + RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA, // 4 bpp + RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA, // 8 bpp + RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA // 2 bpp +} rlPixelFormat; + +// Texture parameters: filter mode +// NOTE 1: Filtering considers mipmaps if available in the texture +// NOTE 2: Filter is accordingly set for minification and magnification +typedef enum { + RL_TEXTURE_FILTER_POINT = 0, // No filter, just pixel aproximation + RL_TEXTURE_FILTER_BILINEAR, // Linear filtering + RL_TEXTURE_FILTER_TRILINEAR, // Trilinear filtering (linear with mipmaps) + RL_TEXTURE_FILTER_ANISOTROPIC_4X, // Anisotropic filtering 4x + RL_TEXTURE_FILTER_ANISOTROPIC_8X, // Anisotropic filtering 8x + RL_TEXTURE_FILTER_ANISOTROPIC_16X, // Anisotropic filtering 16x +} rlTextureFilter; + +// Color blending modes (pre-defined) +typedef enum { + RL_BLEND_ALPHA = 0, // Blend textures considering alpha (default) + RL_BLEND_ADDITIVE, // Blend textures adding colors + RL_BLEND_MULTIPLIED, // Blend textures multiplying colors + RL_BLEND_ADD_COLORS, // Blend textures adding colors (alternative) + RL_BLEND_SUBTRACT_COLORS, // Blend textures subtracting colors (alternative) + RL_BLEND_CUSTOM // Belnd textures using custom src/dst factors (use SetBlendModeCustom()) +} rlBlendMode; + +// Shader location point type +typedef enum { + RL_SHADER_LOC_VERTEX_POSITION = 0, // Shader location: vertex attribute: position + RL_SHADER_LOC_VERTEX_TEXCOORD01, // Shader location: vertex attribute: texcoord01 + RL_SHADER_LOC_VERTEX_TEXCOORD02, // Shader location: vertex attribute: texcoord02 + RL_SHADER_LOC_VERTEX_NORMAL, // Shader location: vertex attribute: normal + RL_SHADER_LOC_VERTEX_TANGENT, // Shader location: vertex attribute: tangent + RL_SHADER_LOC_VERTEX_COLOR, // Shader location: vertex attribute: color + RL_SHADER_LOC_MATRIX_MVP, // Shader location: matrix uniform: model-view-projection + RL_SHADER_LOC_MATRIX_VIEW, // Shader location: matrix uniform: view (camera transform) + RL_SHADER_LOC_MATRIX_PROJECTION, // Shader location: matrix uniform: projection + RL_SHADER_LOC_MATRIX_MODEL, // Shader location: matrix uniform: model (transform) + RL_SHADER_LOC_MATRIX_NORMAL, // Shader location: matrix uniform: normal + RL_SHADER_LOC_VECTOR_VIEW, // Shader location: vector uniform: view + RL_SHADER_LOC_COLOR_DIFFUSE, // Shader location: vector uniform: diffuse color + RL_SHADER_LOC_COLOR_SPECULAR, // Shader location: vector uniform: specular color + RL_SHADER_LOC_COLOR_AMBIENT, // Shader location: vector uniform: ambient color + RL_SHADER_LOC_MAP_ALBEDO, // Shader location: sampler2d texture: albedo (same as: RL_SHADER_LOC_MAP_DIFFUSE) + RL_SHADER_LOC_MAP_METALNESS, // Shader location: sampler2d texture: metalness (same as: RL_SHADER_LOC_MAP_SPECULAR) + RL_SHADER_LOC_MAP_NORMAL, // Shader location: sampler2d texture: normal + RL_SHADER_LOC_MAP_ROUGHNESS, // Shader location: sampler2d texture: roughness + RL_SHADER_LOC_MAP_OCCLUSION, // Shader location: sampler2d texture: occlusion + RL_SHADER_LOC_MAP_EMISSION, // Shader location: sampler2d texture: emission + RL_SHADER_LOC_MAP_HEIGHT, // Shader location: sampler2d texture: height + RL_SHADER_LOC_MAP_CUBEMAP, // Shader location: samplerCube texture: cubemap + RL_SHADER_LOC_MAP_IRRADIANCE, // Shader location: samplerCube texture: irradiance + RL_SHADER_LOC_MAP_PREFILTER, // Shader location: samplerCube texture: prefilter + RL_SHADER_LOC_MAP_BRDF // Shader location: sampler2d texture: brdf +} rlShaderLocationIndex; + +#define RL_SHADER_LOC_MAP_DIFFUSE RL_SHADER_LOC_MAP_ALBEDO +#define RL_SHADER_LOC_MAP_SPECULAR RL_SHADER_LOC_MAP_METALNESS + +// Shader uniform data type +typedef enum { + RL_SHADER_UNIFORM_FLOAT = 0, // Shader uniform type: float + RL_SHADER_UNIFORM_VEC2, // Shader uniform type: vec2 (2 float) + RL_SHADER_UNIFORM_VEC3, // Shader uniform type: vec3 (3 float) + RL_SHADER_UNIFORM_VEC4, // Shader uniform type: vec4 (4 float) + RL_SHADER_UNIFORM_INT, // Shader uniform type: int + RL_SHADER_UNIFORM_IVEC2, // Shader uniform type: ivec2 (2 int) + RL_SHADER_UNIFORM_IVEC3, // Shader uniform type: ivec3 (3 int) + RL_SHADER_UNIFORM_IVEC4, // Shader uniform type: ivec4 (4 int) + RL_SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d +} rlShaderUniformDataType; + +// Shader attribute data types +typedef enum { + RL_SHADER_ATTRIB_FLOAT = 0, // Shader attribute type: float + RL_SHADER_ATTRIB_VEC2, // Shader attribute type: vec2 (2 float) + RL_SHADER_ATTRIB_VEC3, // Shader attribute type: vec3 (3 float) + RL_SHADER_ATTRIB_VEC4 // Shader attribute type: vec4 (4 float) +} rlShaderAttributeDataType; + #if defined(__cplusplus) extern "C" { // Prevents name mangling of functions #endif @@ -751,51 +752,51 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #endif // Default shader vertex attribute names to set location points -#ifndef DEFAULT_SHADER_ATTRIB_NAME_POSITION - #define DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION + #define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 #endif -#ifndef DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD - #define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD + #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 #endif -#ifndef DEFAULT_SHADER_ATTRIB_NAME_NORMAL - #define DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL + #define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 #endif -#ifndef DEFAULT_SHADER_ATTRIB_NAME_COLOR - #define DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR + #define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3 #endif -#ifndef DEFAULT_SHADER_ATTRIB_NAME_TANGENT - #define DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT + #define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 #endif -#ifndef DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 - #define DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 +#ifndef RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 + #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_MVP - #define DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_MVP + #define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_VIEW - #define DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW + #define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_PROJECTION - #define DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION + #define RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_MODEL - #define DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL + #define RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_NORMAL - #define DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL + #define RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) #endif -#ifndef DEFAULT_SHADER_UNIFORM_NAME_COLOR - #define DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) +#ifndef RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR + #define RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) #endif -#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 - #define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) +#ifndef RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 + #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) #endif -#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 - #define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) +#ifndef RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 + #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) #endif -#ifndef DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 - #define DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) +#ifndef RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 + #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) #endif //---------------------------------------------------------------------------------- @@ -950,7 +951,7 @@ void rlMatrixMode(int mode) // Push the current matrix into RLGL.State.stack void rlPushMatrix(void) { - if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(LOG_ERROR, "RLGL: Matrix stack overflow (MAX_MATRIX_STACK_SIZE)"); + if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(RL_LOG_ERROR, "RLGL: Matrix stack overflow (MAX_MATRIX_STACK_SIZE)"); if (RLGL.State.currentMatrixMode == RL_MODELVIEW) { @@ -1284,7 +1285,7 @@ void rlVertex3f(float x, float y, float z) RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount++; } - else TRACELOG(LOG_ERROR, "RLGL: Batch elements overflow"); + else TRACELOG(RL_LOG_ERROR, "RLGL: Batch elements overflow"); } // Define one vertex (position) @@ -1454,7 +1455,7 @@ void rlTextureParameters(unsigned int id, int param, int value) { #if !defined(GRAPHICS_API_OPENGL_11) if (RLGL.ExtSupported.texMirrorClamp) glTexParameteri(GL_TEXTURE_2D, param, value); - else TRACELOG(LOG_WARNING, "GL: Clamp mirror wrap mode not supported (GL_MIRROR_CLAMP_EXT)"); + else TRACELOG(RL_LOG_WARNING, "GL: Clamp mirror wrap mode not supported (GL_MIRROR_CLAMP_EXT)"); #endif } else glTexParameteri(GL_TEXTURE_2D, param, value); @@ -1468,10 +1469,10 @@ void rlTextureParameters(unsigned int id, int param, int value) if (value <= RLGL.ExtSupported.maxAnisotropyLevel) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); else if (RLGL.ExtSupported.maxAnisotropyLevel > 0.0f) { - TRACELOG(LOG_WARNING, "GL: Maximum anisotropic filter level supported is %iX", id, RLGL.ExtSupported.maxAnisotropyLevel); + TRACELOG(RL_LOG_WARNING, "GL: Maximum anisotropic filter level supported is %iX", id, RLGL.ExtSupported.maxAnisotropyLevel); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)value); } - else TRACELOG(LOG_WARNING, "GL: Anisotropic filtering not supported"); + else TRACELOG(RL_LOG_WARNING, "GL: Anisotropic filtering not supported"); #endif } break; default: break; @@ -1642,14 +1643,14 @@ void rlCheckErrors() switch (err) { case GL_NO_ERROR: check = 0; break; - case 0x0500: TRACELOG(LOG_WARNING, "GL: Error detected: GL_INVALID_ENUM"); break; - case 0x0501: TRACELOG(LOG_WARNING, "GL: Error detected: GL_INVALID_VALUE"); break; - case 0x0502: TRACELOG(LOG_WARNING, "GL: Error detected: GL_INVALID_OPERATION"); break; - case 0x0503: TRACELOG(LOG_WARNING, "GL: Error detected: GL_STACK_OVERFLOW"); break; - case 0x0504: TRACELOG(LOG_WARNING, "GL: Error detected: GL_STACK_UNDERFLOW"); break; - case 0x0505: TRACELOG(LOG_WARNING, "GL: Error detected: GL_OUT_OF_MEMORY"); break; - case 0x0506: TRACELOG(LOG_WARNING, "GL: Error detected: GL_INVALID_FRAMEBUFFER_OPERATION"); break; - default: TRACELOG(LOG_WARNING, "GL: Error detected: Unknown error code: %x", err); break; + case 0x0500: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_INVALID_ENUM"); break; + case 0x0501: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_INVALID_VALUE"); break; + case 0x0502: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_INVALID_OPERATION"); break; + case 0x0503: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_STACK_OVERFLOW"); break; + case 0x0504: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_STACK_UNDERFLOW"); break; + case 0x0505: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_OUT_OF_MEMORY"); break; + case 0x0506: TRACELOG(RL_LOG_WARNING, "GL: Error detected: GL_INVALID_FRAMEBUFFER_OPERATION"); break; + default: TRACELOG(RL_LOG_WARNING, "GL: Error detected: Unknown error code: %x", err); break; } } #endif @@ -1665,12 +1666,12 @@ void rlSetBlendMode(int mode) switch (mode) { - case BLEND_ALPHA: glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; - case BLEND_ADDITIVE: glBlendFunc(GL_SRC_ALPHA, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; - case BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; - case BLEND_ADD_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; - case BLEND_SUBTRACT_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_SUBTRACT); break; - case BLEND_CUSTOM: glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); break; + case RL_BLEND_ALPHA: glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; + case RL_BLEND_ADDITIVE: glBlendFunc(GL_SRC_ALPHA, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; + case RL_BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; + case RL_BLEND_ADD_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; + case RL_BLEND_SUBTRACT_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_SUBTRACT); break; + case RL_BLEND_CUSTOM: glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); break; default: break; } @@ -1699,10 +1700,10 @@ void rlglInit(int width, int height) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Init default white texture unsigned char pixels[4] = { 255, 255, 255, 255 }; // 1 pixel RGBA (4 bytes) - RLGL.State.defaultTextureId = rlLoadTexture(pixels, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1); + RLGL.State.defaultTextureId = rlLoadTexture(pixels, 1, 1, RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1); - if (RLGL.State.defaultTextureId != 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Default texture loaded successfully", RLGL.State.defaultTextureId); - else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load default texture"); + if (RLGL.State.defaultTextureId != 0) TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Default texture loaded successfully", RLGL.State.defaultTextureId); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: Failed to load default texture"); // Init default Shader (customized for GL 3.3 and ES2) // Loaded: RLGL.State.defaultShaderId + RLGL.State.defaultShaderLocs @@ -1756,7 +1757,7 @@ void rlglInit(int width, int height) RLGL.State.framebufferWidth = width; RLGL.State.framebufferHeight = height; - TRACELOG(LOG_INFO, "RLGL: Default OpenGL state initialized successfully"); + TRACELOG(RL_LOG_INFO, "RLGL: Default OpenGL state initialized successfully"); //---------------------------------------------------------- #endif @@ -1775,7 +1776,7 @@ void rlglClose(void) rlUnloadShaderDefault(); // Unload default shader glDeleteTextures(1, &RLGL.State.defaultTextureId); // Unload default texture - TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId); + TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Default texture unloaded successfully", RLGL.State.defaultTextureId); #endif } @@ -1786,24 +1787,24 @@ void rlLoadExtensions(void *loader) #if defined(GRAPHICS_API_OPENGL_33) // Also defined for GRAPHICS_API_OPENGL_21 // NOTE: glad is generated and contains only required OpenGL 3.3 Core extensions (and lower versions) #if !defined(__APPLE__) - if (!gladLoadGLLoader((GLADloadproc)loader)) TRACELOG(LOG_WARNING, "GLAD: Cannot load OpenGL extensions"); - else TRACELOG(LOG_INFO, "GLAD: OpenGL extensions loaded successfully"); + if (!gladLoadGLLoader((GLADloadproc)loader)) TRACELOG(RL_LOG_WARNING, "GLAD: Cannot load OpenGL extensions"); + else TRACELOG(RL_LOG_INFO, "GLAD: OpenGL extensions loaded successfully"); #endif // Get number of supported extensions GLint numExt = 0; glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); - TRACELOG(LOG_INFO, "GL: Supported extensions count: %i", numExt); + TRACELOG(RL_LOG_INFO, "GL: Supported extensions count: %i", numExt); #if defined(SUPPORT_GL_DETAILS_INFO) // Get supported extensions list // WARNING: glGetStringi() not available on OpenGL 2.1 char **extList = RL_MALLOC(numExt*sizeof(char *)); - TRACELOG(LOG_INFO, "GL: OpenGL extensions:"); + TRACELOG(RL_LOG_INFO, "GL: OpenGL extensions:"); for (int i = 0; i < numExt; i++) { extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); - TRACELOG(LOG_INFO, " %s", extList[i]); + TRACELOG(RL_LOG_INFO, " %s", extList[i]); } RL_FREE(extList); // Free extensions pointers #endif @@ -1847,11 +1848,11 @@ void rlLoadExtensions(void *loader) } } - TRACELOG(LOG_INFO, "GL: Supported extensions count: %i", numExt); + TRACELOG(RL_LOG_INFO, "GL: Supported extensions count: %i", numExt); #if defined(SUPPORT_GL_DETAILS_INFO) - TRACELOG(LOG_INFO, "GL: OpenGL extensions:"); - for (int i = 0; i < numExt; i++) TRACELOG(LOG_INFO, " %s", extList[i]); + TRACELOG(RL_LOG_INFO, "GL: OpenGL extensions:"); + for (int i = 0; i < numExt; i++) TRACELOG(RL_LOG_INFO, " %s", extList[i]); #endif // Check required extensions @@ -1940,11 +1941,11 @@ void rlLoadExtensions(void *loader) // Check OpenGL information and capabilities //------------------------------------------------------------------------------ // Show current OpenGL and GLSL version - TRACELOG(LOG_INFO, "GL: OpenGL device information:"); - TRACELOG(LOG_INFO, " > Vendor: %s", glGetString(GL_VENDOR)); - TRACELOG(LOG_INFO, " > Renderer: %s", glGetString(GL_RENDERER)); - TRACELOG(LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); - TRACELOG(LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); + TRACELOG(RL_LOG_INFO, "GL: OpenGL device information:"); + TRACELOG(RL_LOG_INFO, " > Vendor: %s", glGetString(GL_VENDOR)); + TRACELOG(RL_LOG_INFO, " > Renderer: %s", glGetString(GL_RENDERER)); + TRACELOG(RL_LOG_INFO, " > Version: %s", glGetString(GL_VERSION)); + TRACELOG(RL_LOG_INFO, " > GLSL: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // NOTE: Anisotropy levels capability is an extension @@ -1955,50 +1956,50 @@ void rlLoadExtensions(void *loader) #if defined(SUPPORT_GL_DETAILS_INFO) // Show some OpenGL GPU capabilities - TRACELOG(LOG_INFO, "GL: OpenGL capabilities:"); + TRACELOG(RL_LOG_INFO, "GL: OpenGL capabilities:"); GLint capability = 0; glGetIntegerv(GL_MAX_TEXTURE_SIZE, &capability); - TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_SIZE: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_TEXTURE_SIZE: %i", capability); glGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, &capability); - TRACELOG(LOG_INFO, " GL_MAX_CUBE_MAP_TEXTURE_SIZE: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_CUBE_MAP_TEXTURE_SIZE: %i", capability); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &capability); - TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_IMAGE_UNITS: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_TEXTURE_IMAGE_UNITS: %i", capability); glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &capability); - TRACELOG(LOG_INFO, " GL_MAX_VERTEX_ATTRIBS: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_VERTEX_ATTRIBS: %i", capability); #if !defined(GRAPHICS_API_OPENGL_ES2) glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &capability); - TRACELOG(LOG_INFO, " GL_MAX_UNIFORM_BLOCK_SIZE: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_UNIFORM_BLOCK_SIZE: %i", capability); glGetIntegerv(GL_MAX_DRAW_BUFFERS, &capability); - TRACELOG(LOG_INFO, " GL_MAX_DRAW_BUFFERS: %i", capability); - if (RLGL.ExtSupported.texAnisoFilter) TRACELOG(LOG_INFO, " GL_MAX_TEXTURE_MAX_ANISOTROPY: %.0f", RLGL.ExtSupported.maxAnisotropyLevel); + TRACELOG(RL_LOG_INFO, " GL_MAX_DRAW_BUFFERS: %i", capability); + if (RLGL.ExtSupported.texAnisoFilter) TRACELOG(RL_LOG_INFO, " GL_MAX_TEXTURE_MAX_ANISOTROPY: %.0f", RLGL.ExtSupported.maxAnisotropyLevel); #endif glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &capability); - TRACELOG(LOG_INFO, " GL_NUM_COMPRESSED_TEXTURE_FORMATS: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_NUM_COMPRESSED_TEXTURE_FORMATS: %i", capability); GLint format[32] = { 0 }; glGetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS, format); - for (int i = 0; i < capability; i++) TRACELOG(LOG_INFO, " %s", rlGetCompressedFormatName(format[i])); + for (int i = 0; i < capability; i++) TRACELOG(RL_LOG_INFO, " %s", rlGetCompressedFormatName(format[i])); /* // Following capabilities are only supported by OpenGL 4.3 or greater glGetIntegerv(GL_MAX_VERTEX_ATTRIB_BINDINGS, &capability); - TRACELOG(LOG_INFO, " GL_MAX_VERTEX_ATTRIB_BINDINGS: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_VERTEX_ATTRIB_BINDINGS: %i", capability); glGetIntegerv(GL_MAX_UNIFORM_LOCATIONS, &capability); - TRACELOG(LOG_INFO, " GL_MAX_UNIFORM_LOCATIONS: %i", capability); + TRACELOG(RL_LOG_INFO, " GL_MAX_UNIFORM_LOCATIONS: %i", capability); */ #else // SUPPORT_GL_DETAILS_INFO // Show some basic info about GL supported features #if defined(GRAPHICS_API_OPENGL_ES2) - if (RLGL.ExtSupported.vao) TRACELOG(LOG_INFO, "GL: VAO extension detected, VAO functions loaded successfully"); - else TRACELOG(LOG_WARNING, "GL: VAO extension not found, VAO not supported"); - if (RLGL.ExtSupported.texNPOT) TRACELOG(LOG_INFO, "GL: NPOT textures extension detected, full NPOT textures supported"); - else TRACELOG(LOG_WARNING, "GL: NPOT textures extension not found, limited NPOT support (no-mipmaps, no-repeat)"); + if (RLGL.ExtSupported.vao) TRACELOG(RL_LOG_INFO, "GL: VAO extension detected, VAO functions loaded successfully"); + else TRACELOG(RL_LOG_WARNING, "GL: VAO extension not found, VAO not supported"); + if (RLGL.ExtSupported.texNPOT) TRACELOG(RL_LOG_INFO, "GL: NPOT textures extension detected, full NPOT textures supported"); + else TRACELOG(RL_LOG_WARNING, "GL: NPOT textures extension not found, limited NPOT support (no-mipmaps, no-repeat)"); #endif - if (RLGL.ExtSupported.texCompDXT) TRACELOG(LOG_INFO, "GL: DXT compressed textures supported"); - if (RLGL.ExtSupported.texCompETC1) TRACELOG(LOG_INFO, "GL: ETC1 compressed textures supported"); - if (RLGL.ExtSupported.texCompETC2) TRACELOG(LOG_INFO, "GL: ETC2/EAC compressed textures supported"); - if (RLGL.ExtSupported.texCompPVRT) TRACELOG(LOG_INFO, "GL: PVRT compressed textures supported"); - if (RLGL.ExtSupported.texCompASTC) TRACELOG(LOG_INFO, "GL: ASTC compressed textures supported"); + if (RLGL.ExtSupported.texCompDXT) TRACELOG(RL_LOG_INFO, "GL: DXT compressed textures supported"); + if (RLGL.ExtSupported.texCompETC1) TRACELOG(RL_LOG_INFO, "GL: ETC1 compressed textures supported"); + if (RLGL.ExtSupported.texCompETC2) TRACELOG(RL_LOG_INFO, "GL: ETC2/EAC compressed textures supported"); + if (RLGL.ExtSupported.texCompPVRT) TRACELOG(RL_LOG_INFO, "GL: PVRT compressed textures supported"); + if (RLGL.ExtSupported.texCompASTC) TRACELOG(RL_LOG_INFO, "GL: ASTC compressed textures supported"); #endif // SUPPORT_GL_DETAILS_INFO #endif // GRAPHICS_API_OPENGL_33 || GRAPHICS_API_OPENGL_ES2 @@ -2127,7 +2128,7 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) batch.vertexBuffer[i].cCounter = 0; } - TRACELOG(LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in RAM (CPU)"); + TRACELOG(RL_LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in RAM (CPU)"); //-------------------------------------------------------------------------------------------- // Upload to GPU (VRAM) vertex data and initialize VAOs/VBOs @@ -2146,22 +2147,22 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) glGenBuffers(1, &batch.vertexBuffer[i].vboId[0]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[0]); glBufferData(GL_ARRAY_BUFFER, bufferElements*3*4*sizeof(float), batch.vertexBuffer[i].vertices, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_POSITION]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); // Vertex texcoord buffer (shader-location = 1) glGenBuffers(1, &batch.vertexBuffer[i].vboId[1]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[1]); glBufferData(GL_ARRAY_BUFFER, bufferElements*2*4*sizeof(float), batch.vertexBuffer[i].texcoords, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_TEXCOORD01]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); // Vertex color buffer (shader-location = 3) glGenBuffers(1, &batch.vertexBuffer[i].vboId[2]); glBindBuffer(GL_ARRAY_BUFFER, batch.vertexBuffer[i].vboId[2]); glBufferData(GL_ARRAY_BUFFER, bufferElements*4*4*sizeof(unsigned char), batch.vertexBuffer[i].colors, GL_DYNAMIC_DRAW); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_COLOR]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); // Fill index buffer glGenBuffers(1, &batch.vertexBuffer[i].vboId[3]); @@ -2174,7 +2175,7 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) #endif } - TRACELOG(LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in VRAM (GPU)"); + TRACELOG(RL_LOG_INFO, "RLGL: Render batch vertex buffers loaded successfully in VRAM (GPU)"); // Unbind the current VAO if (RLGL.ExtSupported.vao) glBindVertexArray(0); @@ -2327,32 +2328,32 @@ void rlDrawRenderBatch(rlRenderBatch *batch) matMVP.m8, matMVP.m9, matMVP.m10, matMVP.m11, matMVP.m12, matMVP.m13, matMVP.m14, matMVP.m15 }; - glUniformMatrix4fv(RLGL.State.currentShaderLocs[SHADER_LOC_MATRIX_MVP], 1, false, matMVPfloat); + glUniformMatrix4fv(RLGL.State.currentShaderLocs[RL_SHADER_LOC_MATRIX_MVP], 1, false, matMVPfloat); if (RLGL.ExtSupported.vao) glBindVertexArray(batch->vertexBuffer[batch->currentBuffer].vaoId); else { // Bind vertex attrib: position (shader-location = 0) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[0]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_POSITION]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_POSITION]); // Bind vertex attrib: texcoord (shader-location = 1) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[1]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_TEXCOORD01], 2, GL_FLOAT, 0, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_TEXCOORD01]); // Bind vertex attrib: color (shader-location = 3) glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[2]); - glVertexAttribPointer(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); - glEnableVertexAttribArray(RLGL.State.currentShaderLocs[SHADER_LOC_VERTEX_COLOR]); + glVertexAttribPointer(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_COLOR], 4, GL_UNSIGNED_BYTE, GL_TRUE, 0, 0); + glEnableVertexAttribArray(RLGL.State.currentShaderLocs[RL_SHADER_LOC_VERTEX_COLOR]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[3]); } // Setup some default shader values - glUniform4f(RLGL.State.currentShaderLocs[SHADER_LOC_COLOR_DIFFUSE], 1.0f, 1.0f, 1.0f, 1.0f); - glUniform1i(RLGL.State.currentShaderLocs[SHADER_LOC_MAP_DIFFUSE], 0); // Active default sampler2D: texture0 + glUniform4f(RLGL.State.currentShaderLocs[RL_SHADER_LOC_COLOR_DIFFUSE], 1.0f, 1.0f, 1.0f, 1.0f); + glUniform1i(RLGL.State.currentShaderLocs[RL_SHADER_LOC_MAP_DIFFUSE], 0); // Active default sampler2D: texture0 // Activate additional sampler textures // Those additional textures will be common for all draw calls of the batch @@ -2489,40 +2490,40 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi // Check texture format support by OpenGL 1.1 (compressed textures not supported) #if defined(GRAPHICS_API_OPENGL_11) - if (format >= PIXELFORMAT_COMPRESSED_DXT1_RGB) + if (format >= RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) { - TRACELOG(LOG_WARNING, "GL: OpenGL 1.1 does not support GPU compressed texture formats"); + TRACELOG(RL_LOG_WARNING, "GL: OpenGL 1.1 does not support GPU compressed texture formats"); return id; } #else - if ((!RLGL.ExtSupported.texCompDXT) && ((format == PIXELFORMAT_COMPRESSED_DXT1_RGB) || (format == PIXELFORMAT_COMPRESSED_DXT1_RGBA) || - (format == PIXELFORMAT_COMPRESSED_DXT3_RGBA) || (format == PIXELFORMAT_COMPRESSED_DXT5_RGBA))) + if ((!RLGL.ExtSupported.texCompDXT) && ((format == RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) || (format == RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA) || + (format == RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA) || (format == RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA))) { - TRACELOG(LOG_WARNING, "GL: DXT compressed texture format not supported"); + TRACELOG(RL_LOG_WARNING, "GL: DXT compressed texture format not supported"); return id; } #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - if ((!RLGL.ExtSupported.texCompETC1) && (format == PIXELFORMAT_COMPRESSED_ETC1_RGB)) + if ((!RLGL.ExtSupported.texCompETC1) && (format == RL_PIXELFORMAT_COMPRESSED_ETC1_RGB)) { - TRACELOG(LOG_WARNING, "GL: ETC1 compressed texture format not supported"); + TRACELOG(RL_LOG_WARNING, "GL: ETC1 compressed texture format not supported"); return id; } - if ((!RLGL.ExtSupported.texCompETC2) && ((format == PIXELFORMAT_COMPRESSED_ETC2_RGB) || (format == PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA))) + if ((!RLGL.ExtSupported.texCompETC2) && ((format == RL_PIXELFORMAT_COMPRESSED_ETC2_RGB) || (format == RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA))) { - TRACELOG(LOG_WARNING, "GL: ETC2 compressed texture format not supported"); + TRACELOG(RL_LOG_WARNING, "GL: ETC2 compressed texture format not supported"); return id; } - if ((!RLGL.ExtSupported.texCompPVRT) && ((format == PIXELFORMAT_COMPRESSED_PVRT_RGB) || (format == PIXELFORMAT_COMPRESSED_PVRT_RGBA))) + if ((!RLGL.ExtSupported.texCompPVRT) && ((format == RL_PIXELFORMAT_COMPRESSED_PVRT_RGB) || (format == RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA))) { - TRACELOG(LOG_WARNING, "GL: PVRT compressed texture format not supported"); + TRACELOG(RL_LOG_WARNING, "GL: PVRT compressed texture format not supported"); return id; } - if ((!RLGL.ExtSupported.texCompASTC) && ((format == PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA) || (format == PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA))) + if ((!RLGL.ExtSupported.texCompASTC) && ((format == RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA) || (format == RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA))) { - TRACELOG(LOG_WARNING, "GL: ASTC compressed texture format not supported"); + TRACELOG(RL_LOG_WARNING, "GL: ASTC compressed texture format not supported"); return id; } #endif @@ -2550,18 +2551,18 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi if (glInternalFormat != -1) { - if (format < PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, glFormat, glType, (unsigned char *)data + mipOffset); + if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, glFormat, glType, (unsigned char *)data + mipOffset); #if !defined(GRAPHICS_API_OPENGL_11) else glCompressedTexImage2D(GL_TEXTURE_2D, i, glInternalFormat, mipWidth, mipHeight, 0, mipSize, (unsigned char *)data + mipOffset); #endif #if defined(GRAPHICS_API_OPENGL_33) - if (format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) + if (format == RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) { GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ONE }; glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask); } - else if (format == PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) + else if (format == RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) { #if defined(GRAPHICS_API_OPENGL_21) GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ALPHA }; @@ -2622,8 +2623,8 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi // Unbind current texture glBindTexture(GL_TEXTURE_2D, 0); - if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Texture loaded successfully (%ix%i | %s | %i mipmaps)", id, width, height, rlGetPixelFormatName(format), mipmapCount); - else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load texture"); + if (id > 0) TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Texture loaded successfully (%ix%i | %s | %i mipmaps)", id, width, height, rlGetPixelFormatName(format), mipmapCount); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: Failed to load texture"); return id; } @@ -2661,7 +2662,7 @@ unsigned int rlLoadTextureDepth(int width, int height, bool useRenderBuffer) glBindTexture(GL_TEXTURE_2D, 0); - TRACELOG(LOG_INFO, "TEXTURE: Depth texture loaded successfully"); + TRACELOG(RL_LOG_INFO, "TEXTURE: Depth texture loaded successfully"); } else { @@ -2673,7 +2674,7 @@ unsigned int rlLoadTextureDepth(int width, int height, bool useRenderBuffer) glBindRenderbuffer(GL_RENDERBUFFER, 0); - TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Depth renderbuffer loaded successfully (%i bits)", id, (RLGL.ExtSupported.maxDepthBits >= 24)? RLGL.ExtSupported.maxDepthBits : 16); + TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Depth renderbuffer loaded successfully (%i bits)", id, (RLGL.ExtSupported.maxDepthBits >= 24)? RLGL.ExtSupported.maxDepthBits : 16); } #endif @@ -2703,32 +2704,32 @@ unsigned int rlLoadTextureCubemap(void *data, int size, int format) { if (data == NULL) { - if (format < PIXELFORMAT_COMPRESSED_DXT1_RGB) + if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) { - if (format == PIXELFORMAT_UNCOMPRESSED_R32G32B32) + if (format == RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32) { // Instead of using a sized internal texture format (GL_RGB16F, GL_RGB32F), we let the driver to choose the better format for us (GL_RGB) if (RLGL.ExtSupported.texFloat32) glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, GL_RGB, size, size, 0, GL_RGB, GL_FLOAT, NULL); - else TRACELOG(LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); + else TRACELOG(RL_LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); } - else if ((format == PIXELFORMAT_UNCOMPRESSED_R32) || (format == PIXELFORMAT_UNCOMPRESSED_R32G32B32A32)) TRACELOG(LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); + else if ((format == RL_PIXELFORMAT_UNCOMPRESSED_R32) || (format == RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32)) TRACELOG(RL_LOG_WARNING, "TEXTURES: Cubemap requested format not supported"); else glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, glFormat, glType, NULL); } - else TRACELOG(LOG_WARNING, "TEXTURES: Empty cubemap creation does not support compressed format"); + else TRACELOG(RL_LOG_WARNING, "TEXTURES: Empty cubemap creation does not support compressed format"); } else { - if (format < PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, glFormat, glType, (unsigned char *)data + i*dataSize); + if (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, glFormat, glType, (unsigned char *)data + i*dataSize); else glCompressedTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, dataSize, (unsigned char *)data + i*dataSize); } #if defined(GRAPHICS_API_OPENGL_33) - if (format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) + if (format == RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE) { GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ONE }; glTexParameteriv(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask); } - else if (format == PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) + else if (format == RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) { #if defined(GRAPHICS_API_OPENGL_21) GLint swizzleMask[] = { GL_RED, GL_RED, GL_RED, GL_ALPHA }; @@ -2753,8 +2754,8 @@ unsigned int rlLoadTextureCubemap(void *data, int size, int format) glBindTexture(GL_TEXTURE_CUBE_MAP, 0); #endif - if (id > 0) TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Cubemap texture loaded successfully (%ix%i)", id, size, size); - else TRACELOG(LOG_WARNING, "TEXTURE: Failed to load cubemap texture"); + if (id > 0) TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Cubemap texture loaded successfully (%ix%i)", id, size, size); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: Failed to load cubemap texture"); return id; } @@ -2768,11 +2769,11 @@ void rlUpdateTexture(unsigned int id, int offsetX, int offsetY, int width, int h unsigned int glInternalFormat, glFormat, glType; rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - if ((glInternalFormat != -1) && (format < PIXELFORMAT_COMPRESSED_DXT1_RGB)) + if ((glInternalFormat != -1) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) { glTexSubImage2D(GL_TEXTURE_2D, 0, offsetX, offsetY, width, height, glFormat, glType, (unsigned char *)data); } - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Failed to update for current texture format (%i)", id, format); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Failed to update for current texture format (%i)", id, format); } // Get OpenGL internal formats and data type from raylib PixelFormat @@ -2786,44 +2787,44 @@ void rlGetGlTextureFormats(int format, unsigned int *glInternalFormat, unsigned { #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_21) || defined(GRAPHICS_API_OPENGL_ES2) // NOTE: on OpenGL ES 2.0 (WebGL), internalFormat must match format and options allowed are: GL_LUMINANCE, GL_RGB, GL_RGBA - case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: *glInternalFormat = GL_LUMINANCE_ALPHA; *glFormat = GL_LUMINANCE_ALPHA; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_R5G6B5: *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_UNSIGNED_SHORT_5_6_5; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8: *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_5_5_5_1; break; - case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_4_4_4_4; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: *glInternalFormat = GL_LUMINANCE_ALPHA; *glFormat = GL_LUMINANCE_ALPHA; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R5G6B5: *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_UNSIGNED_SHORT_5_6_5; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8: *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_5_5_5_1; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_4_4_4_4; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_BYTE; break; #if !defined(GRAPHICS_API_OPENGL_11) - case PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float - case PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float - case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_LUMINANCE; *glFormat = GL_LUMINANCE; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB; *glFormat = GL_RGB; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; // NOTE: Requires extension OES_texture_float #endif #elif defined(GRAPHICS_API_OPENGL_33) - case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: *glInternalFormat = GL_R8; *glFormat = GL_RED; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: *glInternalFormat = GL_RG8; *glFormat = GL_RG; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_R5G6B5: *glInternalFormat = GL_RGB565; *glFormat = GL_RGB; *glType = GL_UNSIGNED_SHORT_5_6_5; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8: *glInternalFormat = GL_RGB8; *glFormat = GL_RGB; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: *glInternalFormat = GL_RGB5_A1; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_5_5_5_1; break; - case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: *glInternalFormat = GL_RGBA4; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_4_4_4_4; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: *glInternalFormat = GL_RGBA8; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_BYTE; break; - case PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_R32F; *glFormat = GL_RED; *glType = GL_FLOAT; break; - case PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB32F; *glFormat = GL_RGB; *glType = GL_FLOAT; break; - case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA32F; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: *glInternalFormat = GL_R8; *glFormat = GL_RED; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: *glInternalFormat = GL_RG8; *glFormat = GL_RG; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R5G6B5: *glInternalFormat = GL_RGB565; *glFormat = GL_RGB; *glType = GL_UNSIGNED_SHORT_5_6_5; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8: *glInternalFormat = GL_RGB8; *glFormat = GL_RGB; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: *glInternalFormat = GL_RGB5_A1; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_5_5_5_1; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: *glInternalFormat = GL_RGBA4; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_SHORT_4_4_4_4; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: *glInternalFormat = GL_RGBA8; *glFormat = GL_RGBA; *glType = GL_UNSIGNED_BYTE; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_R32F; *glFormat = GL_RED; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGB32F; *glFormat = GL_RGB; *glType = GL_FLOAT; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: if (RLGL.ExtSupported.texFloat32) *glInternalFormat = GL_RGBA32F; *glFormat = GL_RGBA; *glType = GL_FLOAT; break; #endif #if !defined(GRAPHICS_API_OPENGL_11) - case PIXELFORMAT_COMPRESSED_DXT1_RGB: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; - case PIXELFORMAT_COMPRESSED_DXT1_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; break; - case PIXELFORMAT_COMPRESSED_DXT3_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; - case PIXELFORMAT_COMPRESSED_DXT5_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; - case PIXELFORMAT_COMPRESSED_ETC1_RGB: if (RLGL.ExtSupported.texCompETC1) *glInternalFormat = GL_ETC1_RGB8_OES; break; // NOTE: Requires OpenGL ES 2.0 or OpenGL 4.3 - case PIXELFORMAT_COMPRESSED_ETC2_RGB: if (RLGL.ExtSupported.texCompETC2) *glInternalFormat = GL_COMPRESSED_RGB8_ETC2; break; // NOTE: Requires OpenGL ES 3.0 or OpenGL 4.3 - case PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: if (RLGL.ExtSupported.texCompETC2) *glInternalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC; break; // NOTE: Requires OpenGL ES 3.0 or OpenGL 4.3 - case PIXELFORMAT_COMPRESSED_PVRT_RGB: if (RLGL.ExtSupported.texCompPVRT) *glInternalFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG; break; // NOTE: Requires PowerVR GPU - case PIXELFORMAT_COMPRESSED_PVRT_RGBA: if (RLGL.ExtSupported.texCompPVRT) *glInternalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG; break; // NOTE: Requires PowerVR GPU - case PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: if (RLGL.ExtSupported.texCompASTC) *glInternalFormat = GL_COMPRESSED_RGBA_ASTC_4x4_KHR; break; // NOTE: Requires OpenGL ES 3.1 or OpenGL 4.3 - case PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: if (RLGL.ExtSupported.texCompASTC) *glInternalFormat = GL_COMPRESSED_RGBA_ASTC_8x8_KHR; break; // NOTE: Requires OpenGL ES 3.1 or OpenGL 4.3 + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; break; + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; break; + case RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; break; + case RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA: if (RLGL.ExtSupported.texCompDXT) *glInternalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; break; + case RL_PIXELFORMAT_COMPRESSED_ETC1_RGB: if (RLGL.ExtSupported.texCompETC1) *glInternalFormat = GL_ETC1_RGB8_OES; break; // NOTE: Requires OpenGL ES 2.0 or OpenGL 4.3 + case RL_PIXELFORMAT_COMPRESSED_ETC2_RGB: if (RLGL.ExtSupported.texCompETC2) *glInternalFormat = GL_COMPRESSED_RGB8_ETC2; break; // NOTE: Requires OpenGL ES 3.0 or OpenGL 4.3 + case RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: if (RLGL.ExtSupported.texCompETC2) *glInternalFormat = GL_COMPRESSED_RGBA8_ETC2_EAC; break; // NOTE: Requires OpenGL ES 3.0 or OpenGL 4.3 + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGB: if (RLGL.ExtSupported.texCompPVRT) *glInternalFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG; break; // NOTE: Requires PowerVR GPU + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA: if (RLGL.ExtSupported.texCompPVRT) *glInternalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG; break; // NOTE: Requires PowerVR GPU + case RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: if (RLGL.ExtSupported.texCompASTC) *glInternalFormat = GL_COMPRESSED_RGBA_ASTC_4x4_KHR; break; // NOTE: Requires OpenGL ES 3.1 or OpenGL 4.3 + case RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: if (RLGL.ExtSupported.texCompASTC) *glInternalFormat = GL_COMPRESSED_RGBA_ASTC_8x8_KHR; break; // NOTE: Requires OpenGL ES 3.1 or OpenGL 4.3 #endif - default: TRACELOG(LOG_WARNING, "TEXTURE: Current format not supported (%i)", format); break; + default: TRACELOG(RL_LOG_WARNING, "TEXTURE: Current format not supported (%i)", format); break; } } @@ -2848,7 +2849,7 @@ void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int if (texIsPOT) { // WARNING: Manual mipmap generation only works for RGBA 32bit textures! - if (format == PIXELFORMAT_UNCOMPRESSED_R8G8B8A8) + if (format == RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8) { // Retrieve texture data from VRAM void *texData = rlReadTexturePixels(id, width, height, format); @@ -2878,9 +2879,9 @@ void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps = mipmapCount + 1; RL_FREE(texData); // Once mipmaps have been generated and data has been uploaded to GPU VRAM, we can discard RAM data - TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Mipmaps generated manually on CPU side, total: %i", texture->id, texture->mipmaps); + TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Mipmaps generated manually on CPU side, total: %i", texture->id, texture->mipmaps); } - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps for provided texture format", texture->id); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps for provided texture format", texture->id); } #endif #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -2896,10 +2897,10 @@ void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int #define MAX(a,b) (((a)>(b))?(a):(b)) *mipmaps = 1 + (int)floor(log(MAX(width, height))/log(2)); - TRACELOG(LOG_INFO, "TEXTURE: [ID %i] Mipmaps generated automatically, total: %i", id, *mipmaps); + TRACELOG(RL_LOG_INFO, "TEXTURE: [ID %i] Mipmaps generated automatically, total: %i", id, *mipmaps); } #endif - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps", id); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps", id); glBindTexture(GL_TEXTURE_2D, 0); } @@ -2930,12 +2931,12 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); unsigned int size = rlGetPixelDataSize(width, height, format); - if ((glInternalFormat != -1) && (format < PIXELFORMAT_COMPRESSED_DXT1_RGB)) + if ((glInternalFormat != -1) && (format < RL_PIXELFORMAT_COMPRESSED_DXT1_RGB)) { pixels = RL_MALLOC(size); glGetTexImage(GL_TEXTURE_2D, 0, glFormat, glType, pixels); } - else TRACELOG(LOG_WARNING, "TEXTURE: [ID %i] Data retrieval not suported for pixel format (%i)", id, format); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Data retrieval not suported for pixel format (%i)", id, format); glBindTexture(GL_TEXTURE_2D, 0); #endif @@ -2959,7 +2960,7 @@ void *rlReadTexturePixels(unsigned int id, int width, int height, int format) glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, id, 0); // We read data as RGBA because FBO texture is configured as RGBA, despite binding another texture format - pixels = (unsigned char *)RL_MALLOC(rlGetPixelDataSize(width, height, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)); + pixels = (unsigned char *)RL_MALLOC(rlGetPixelDataSize(width, height, RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8)); glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -3073,12 +3074,12 @@ bool rlFramebufferComplete(unsigned int id) { switch (status) { - case GL_FRAMEBUFFER_UNSUPPORTED: TRACELOG(LOG_WARNING, "FBO: [ID %i] Framebuffer is unsupported", id); break; - case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: TRACELOG(LOG_WARNING, "FBO: [ID %i] Framebuffer has incomplete attachment", id); break; + case GL_FRAMEBUFFER_UNSUPPORTED: TRACELOG(RL_LOG_WARNING, "FBO: [ID %i] Framebuffer is unsupported", id); break; + case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: TRACELOG(RL_LOG_WARNING, "FBO: [ID %i] Framebuffer has incomplete attachment", id); break; #if defined(GRAPHICS_API_OPENGL_ES2) - case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS: TRACELOG(LOG_WARNING, "FBO: [ID %i] Framebuffer has incomplete dimensions", id); break; + case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS: TRACELOG(RL_LOG_WARNING, "FBO: [ID %i] Framebuffer has incomplete dimensions", id); break; #endif - case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: TRACELOG(LOG_WARNING, "FBO: [ID %i] Framebuffer has a missing attachment", id); break; + case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: TRACELOG(RL_LOG_WARNING, "FBO: [ID %i] Framebuffer has a missing attachment", id); break; default: break; } } @@ -3113,7 +3114,7 @@ void rlUnloadFramebuffer(unsigned int id) glBindFramebuffer(GL_FRAMEBUFFER, 0); glDeleteFramebuffers(1, &id); - TRACELOG(LOG_INFO, "FBO: [ID %i] Unloaded framebuffer from VRAM (GPU)", id); + TRACELOG(RL_LOG_INFO, "FBO: [ID %i] Unloaded framebuffer from VRAM (GPU)", id); #endif } @@ -3297,7 +3298,7 @@ void rlUnloadVertexArray(unsigned int vaoId) { glBindVertexArray(0); glDeleteVertexArrays(1, &vaoId); - TRACELOG(LOG_INFO, "VAO: [ID %i] Unloaded vertex array data from VRAM (GPU)", vaoId); + TRACELOG(RL_LOG_INFO, "VAO: [ID %i] Unloaded vertex array data from VRAM (GPU)", vaoId); } #endif } @@ -3306,7 +3307,7 @@ void rlUnloadVertexBuffer(unsigned int vboId) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) glDeleteBuffers(1, &vboId); - //TRACELOG(LOG_INFO, "VBO: Unloaded vertex data from VRAM (GPU)"); + //TRACELOG(RL_LOG_INFO, "VBO: Unloaded vertex data from VRAM (GPU)"); #endif } @@ -3345,7 +3346,7 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (id == 0) { - TRACELOG(LOG_WARNING, "SHADER: Failed to load custom shader code"); + TRACELOG(RL_LOG_WARNING, "SHADER: Failed to load custom shader code"); id = RLGL.State.defaultShaderId; } } @@ -3392,8 +3393,8 @@ unsigned int rlCompileShader(const char *shaderCode, int type) { switch (type) { - case GL_VERTEX_SHADER: TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to compile vertex shader code", shader); break; - case GL_FRAGMENT_SHADER: TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to compile fragment shader code", shader); break; + case GL_VERTEX_SHADER: TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to compile vertex shader code", shader); break; + case GL_FRAGMENT_SHADER: TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to compile fragment shader code", shader); break; //case GL_GEOMETRY_SHADER: //case GL_COMPUTE_SHADER: default: break; @@ -3407,7 +3408,7 @@ unsigned int rlCompileShader(const char *shaderCode, int type) int length = 0; char *log = RL_CALLOC(maxLength, sizeof(char)); glGetShaderInfoLog(shader, maxLength, &length, log); - TRACELOG(LOG_WARNING, "SHADER: [ID %i] Compile error: %s", shader, log); + TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Compile error: %s", shader, log); RL_FREE(log); } } @@ -3415,8 +3416,8 @@ unsigned int rlCompileShader(const char *shaderCode, int type) { switch (type) { - case GL_VERTEX_SHADER: TRACELOG(LOG_INFO, "SHADER: [ID %i] Vertex shader compiled successfully", shader); break; - case GL_FRAGMENT_SHADER: TRACELOG(LOG_INFO, "SHADER: [ID %i] Fragment shader compiled successfully", shader); break; + case GL_VERTEX_SHADER: TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Vertex shader compiled successfully", shader); break; + case GL_FRAGMENT_SHADER: TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Fragment shader compiled successfully", shader); break; //case GL_GEOMETRY_SHADER: //case GL_COMPUTE_SHADER: default: break; @@ -3440,12 +3441,12 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) glAttachShader(program, fShaderId); // NOTE: Default attribute shader locations must be binded before linking - glBindAttribLocation(program, 0, DEFAULT_SHADER_ATTRIB_NAME_POSITION); - glBindAttribLocation(program, 1, DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD); - glBindAttribLocation(program, 2, DEFAULT_SHADER_ATTRIB_NAME_NORMAL); - glBindAttribLocation(program, 3, DEFAULT_SHADER_ATTRIB_NAME_COLOR); - glBindAttribLocation(program, 4, DEFAULT_SHADER_ATTRIB_NAME_TANGENT); - glBindAttribLocation(program, 5, DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2); + glBindAttribLocation(program, 0, RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION); + glBindAttribLocation(program, 1, RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD); + glBindAttribLocation(program, 2, RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL); + glBindAttribLocation(program, 3, RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR); + glBindAttribLocation(program, 4, RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT); + glBindAttribLocation(program, 5, RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2); // NOTE: If some attrib name is no found on the shader, it locations becomes -1 @@ -3457,7 +3458,7 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) if (success == GL_FALSE) { - TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to link shader program", program); + TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to link shader program", program); int maxLength = 0; glGetProgramiv(program, GL_INFO_LOG_LENGTH, &maxLength); @@ -3467,7 +3468,7 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) int length = 0; char *log = RL_CALLOC(maxLength, sizeof(char)); glGetProgramInfoLog(program, maxLength, &length, log); - TRACELOG(LOG_WARNING, "SHADER: [ID %i] Link error: %s", program, log); + TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Link error: %s", program, log); RL_FREE(log); } @@ -3475,7 +3476,7 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) program = 0; } - else TRACELOG(LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); + else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); #endif return program; } @@ -3486,7 +3487,7 @@ void rlUnloadShaderProgram(unsigned int id) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) glDeleteProgram(id); - TRACELOG(LOG_INFO, "SHADER: [ID %i] Unloaded shader program data from VRAM (GPU)", id); + TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Unloaded shader program data from VRAM (GPU)", id); #endif } @@ -3497,8 +3498,8 @@ int rlGetLocationUniform(unsigned int shaderId, const char *uniformName) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) location = glGetUniformLocation(shaderId, uniformName); - if (location == -1) TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to find shader uniform: %s", shaderId, uniformName); - else TRACELOG(LOG_INFO, "SHADER: [ID %i] Shader uniform (%s) set at location: %i", shaderId, uniformName, location); + if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader uniform: %s", shaderId, uniformName); + else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader uniform (%s) set at location: %i", shaderId, uniformName, location); #endif return location; } @@ -3510,8 +3511,8 @@ int rlGetLocationAttrib(unsigned int shaderId, const char *attribName) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) location = glGetAttribLocation(shaderId, attribName); - if (location == -1) TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to find shader attribute: %s", shaderId, attribName); - else TRACELOG(LOG_INFO, "SHADER: [ID %i] Shader attribute (%s) set at location: %i", shaderId, attribName, location); + if (location == -1) TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to find shader attribute: %s", shaderId, attribName); + else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Shader attribute (%s) set at location: %i", shaderId, attribName, location); #endif return location; } @@ -3522,16 +3523,16 @@ void rlSetUniform(int locIndex, const void *value, int uniformType, int count) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) switch (uniformType) { - case SHADER_UNIFORM_FLOAT: glUniform1fv(locIndex, count, (float *)value); break; - case SHADER_UNIFORM_VEC2: glUniform2fv(locIndex, count, (float *)value); break; - case SHADER_UNIFORM_VEC3: glUniform3fv(locIndex, count, (float *)value); break; - case SHADER_UNIFORM_VEC4: glUniform4fv(locIndex, count, (float *)value); break; - case SHADER_UNIFORM_INT: glUniform1iv(locIndex, count, (int *)value); break; - case SHADER_UNIFORM_IVEC2: glUniform2iv(locIndex, count, (int *)value); break; - case SHADER_UNIFORM_IVEC3: glUniform3iv(locIndex, count, (int *)value); break; - case SHADER_UNIFORM_IVEC4: glUniform4iv(locIndex, count, (int *)value); break; - case SHADER_UNIFORM_SAMPLER2D: glUniform1iv(locIndex, count, (int *)value); break; - default: TRACELOG(LOG_WARNING, "SHADER: Failed to set uniform value, data type not recognized"); + case RL_SHADER_UNIFORM_FLOAT: glUniform1fv(locIndex, count, (float *)value); break; + case RL_SHADER_UNIFORM_VEC2: glUniform2fv(locIndex, count, (float *)value); break; + case RL_SHADER_UNIFORM_VEC3: glUniform3fv(locIndex, count, (float *)value); break; + case RL_SHADER_UNIFORM_VEC4: glUniform4fv(locIndex, count, (float *)value); break; + case RL_SHADER_UNIFORM_INT: glUniform1iv(locIndex, count, (int *)value); break; + case RL_SHADER_UNIFORM_IVEC2: glUniform2iv(locIndex, count, (int *)value); break; + case RL_SHADER_UNIFORM_IVEC3: glUniform3iv(locIndex, count, (int *)value); break; + case RL_SHADER_UNIFORM_IVEC4: glUniform4iv(locIndex, count, (int *)value); break; + case RL_SHADER_UNIFORM_SAMPLER2D: glUniform1iv(locIndex, count, (int *)value); break; + default: TRACELOG(RL_LOG_WARNING, "SHADER: Failed to set uniform value, data type not recognized"); } #endif } @@ -3542,11 +3543,11 @@ void rlSetVertexAttributeDefault(int locIndex, const void *value, int attribType #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) switch (attribType) { - case SHADER_ATTRIB_FLOAT: if (count == 1) glVertexAttrib1fv(locIndex, (float *)value); break; - case SHADER_ATTRIB_VEC2: if (count == 2) glVertexAttrib2fv(locIndex, (float *)value); break; - case SHADER_ATTRIB_VEC3: if (count == 3) glVertexAttrib3fv(locIndex, (float *)value); break; - case SHADER_ATTRIB_VEC4: if (count == 4) glVertexAttrib4fv(locIndex, (float *)value); break; - default: TRACELOG(LOG_WARNING, "SHADER: Failed to set attrib default value, data type not recognized"); + case RL_SHADER_ATTRIB_FLOAT: if (count == 1) glVertexAttrib1fv(locIndex, (float *)value); break; + case RL_SHADER_ATTRIB_VEC2: if (count == 2) glVertexAttrib2fv(locIndex, (float *)value); break; + case RL_SHADER_ATTRIB_VEC3: if (count == 3) glVertexAttrib3fv(locIndex, (float *)value); break; + case RL_SHADER_ATTRIB_VEC4: if (count == 4) glVertexAttrib4fv(locIndex, (float *)value); break; + default: TRACELOG(RL_LOG_WARNING, "SHADER: Failed to set attrib default value, data type not recognized"); } #endif } @@ -3851,27 +3852,27 @@ const char *rlGetPixelFormatName(unsigned int format) { switch (format) { - case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: return "GRAYSCALE"; break; // 8 bit per pixel (no alpha) - case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: return "GRAY_ALPHA"; break; // 8*2 bpp (2 channels) - case PIXELFORMAT_UNCOMPRESSED_R5G6B5: return "R5G6B5"; break; // 16 bpp - case PIXELFORMAT_UNCOMPRESSED_R8G8B8: return "R8G8B8"; break; // 24 bpp - case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: return "R5G5B5A1"; break; // 16 bpp (1 bit alpha) - case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: return "R4G4B4A4"; break; // 16 bpp (4 bit alpha) - case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: return "R8G8B8A8"; break; // 32 bpp - case PIXELFORMAT_UNCOMPRESSED_R32: return "R32"; break; // 32 bpp (1 channel - float) - case PIXELFORMAT_UNCOMPRESSED_R32G32B32: return "R32G32B32"; break; // 32*3 bpp (3 channels - float) - case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: return "R32G32B32A32"; break; // 32*4 bpp (4 channels - float) - case PIXELFORMAT_COMPRESSED_DXT1_RGB: return "DXT1_RGB"; break; // 4 bpp (no alpha) - case PIXELFORMAT_COMPRESSED_DXT1_RGBA: return "DXT1_RGBA"; break; // 4 bpp (1 bit alpha) - case PIXELFORMAT_COMPRESSED_DXT3_RGBA: return "DXT3_RGBA"; break; // 8 bpp - case PIXELFORMAT_COMPRESSED_DXT5_RGBA: return "DXT5_RGBA"; break; // 8 bpp - case PIXELFORMAT_COMPRESSED_ETC1_RGB: return "ETC1_RGB"; break; // 4 bpp - case PIXELFORMAT_COMPRESSED_ETC2_RGB: return "ETC2_RGB"; break; // 4 bpp - case PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: return "ETC2_RGBA"; break; // 8 bpp - case PIXELFORMAT_COMPRESSED_PVRT_RGB: return "PVRT_RGB"; break; // 4 bpp - case PIXELFORMAT_COMPRESSED_PVRT_RGBA: return "PVRT_RGBA"; break; // 4 bpp - case PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: return "ASTC_4x4_RGBA"; break; // 8 bpp - case PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: return "ASTC_8x8_RGBA"; break; // 2 bpp + case RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: return "GRAYSCALE"; break; // 8 bit per pixel (no alpha) + case RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: return "GRAY_ALPHA"; break; // 8*2 bpp (2 channels) + case RL_PIXELFORMAT_UNCOMPRESSED_R5G6B5: return "R5G6B5"; break; // 16 bpp + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8: return "R8G8B8"; break; // 24 bpp + case RL_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: return "R5G5B5A1"; break; // 16 bpp (1 bit alpha) + case RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: return "R4G4B4A4"; break; // 16 bpp (4 bit alpha) + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: return "R8G8B8A8"; break; // 32 bpp + case RL_PIXELFORMAT_UNCOMPRESSED_R32: return "R32"; break; // 32 bpp (1 channel - float) + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: return "R32G32B32"; break; // 32*3 bpp (3 channels - float) + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: return "R32G32B32A32"; break; // 32*4 bpp (4 channels - float) + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: return "DXT1_RGB"; break; // 4 bpp (no alpha) + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA: return "DXT1_RGBA"; break; // 4 bpp (1 bit alpha) + case RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA: return "DXT3_RGBA"; break; // 8 bpp + case RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA: return "DXT5_RGBA"; break; // 8 bpp + case RL_PIXELFORMAT_COMPRESSED_ETC1_RGB: return "ETC1_RGB"; break; // 4 bpp + case RL_PIXELFORMAT_COMPRESSED_ETC2_RGB: return "ETC2_RGB"; break; // 4 bpp + case RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: return "ETC2_RGBA"; break; // 8 bpp + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGB: return "PVRT_RGB"; break; // 4 bpp + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA: return "PVRT_RGBA"; break; // 4 bpp + case RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: return "ASTC_4x4_RGBA"; break; // 8 bpp + case RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: return "ASTC_8x8_RGBA"; break; // 2 bpp default: return "UNKNOWN"; break; } } @@ -3971,19 +3972,19 @@ static void rlLoadShaderDefault(void) if (RLGL.State.defaultShaderId > 0) { - TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader loaded successfully", RLGL.State.defaultShaderId); + TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Default shader loaded successfully", RLGL.State.defaultShaderId); // Set default shader locations: attributes locations - RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_POSITION] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexPosition"); - RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_TEXCOORD01] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexTexCoord"); - RLGL.State.defaultShaderLocs[SHADER_LOC_VERTEX_COLOR] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexColor"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_VERTEX_POSITION] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexPosition"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_VERTEX_TEXCOORD01] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexTexCoord"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_VERTEX_COLOR] = glGetAttribLocation(RLGL.State.defaultShaderId, "vertexColor"); // Set default shader locations: uniform locations - RLGL.State.defaultShaderLocs[SHADER_LOC_MATRIX_MVP] = glGetUniformLocation(RLGL.State.defaultShaderId, "mvp"); - RLGL.State.defaultShaderLocs[SHADER_LOC_COLOR_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "colDiffuse"); - RLGL.State.defaultShaderLocs[SHADER_LOC_MAP_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "texture0"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_MATRIX_MVP] = glGetUniformLocation(RLGL.State.defaultShaderId, "mvp"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_COLOR_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "colDiffuse"); + RLGL.State.defaultShaderLocs[RL_SHADER_LOC_MAP_DIFFUSE] = glGetUniformLocation(RLGL.State.defaultShaderId, "texture0"); } - else TRACELOG(LOG_WARNING, "SHADER: [ID %i] Failed to load default shader", RLGL.State.defaultShaderId); + else TRACELOG(RL_LOG_WARNING, "SHADER: [ID %i] Failed to load default shader", RLGL.State.defaultShaderId); } // Unload default shader @@ -4001,7 +4002,7 @@ static void rlUnloadShaderDefault(void) RL_FREE(RLGL.State.defaultShaderLocs); - TRACELOG(LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShaderId); + TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Default shader unloaded successfully", RLGL.State.defaultShaderId); } #if defined(SUPPORT_GL_DETAILS_INFO) @@ -4116,7 +4117,7 @@ static int rlGenTextureMipmapsData(unsigned char *data, int baseWidth, int baseH unsigned char *temp = RL_REALLOC(data, size); if (temp != NULL) data = temp; - else TRACELOG(LOG_WARNING, "TEXTURE: Failed to re-allocate required mipmaps memory"); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: Failed to re-allocate required mipmaps memory"); width = baseWidth; height = baseHeight; @@ -4222,27 +4223,27 @@ static int rlGetPixelDataSize(int width, int height, int format) switch (format) { - case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: bpp = 8; break; - case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: - case PIXELFORMAT_UNCOMPRESSED_R5G6B5: - case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: - case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: bpp = 16; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: bpp = 32; break; - case PIXELFORMAT_UNCOMPRESSED_R8G8B8: bpp = 24; break; - case PIXELFORMAT_UNCOMPRESSED_R32: bpp = 32; break; - case PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 32*3; break; - case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 32*4; break; - case PIXELFORMAT_COMPRESSED_DXT1_RGB: - case PIXELFORMAT_COMPRESSED_DXT1_RGBA: - case PIXELFORMAT_COMPRESSED_ETC1_RGB: - case PIXELFORMAT_COMPRESSED_ETC2_RGB: - case PIXELFORMAT_COMPRESSED_PVRT_RGB: - case PIXELFORMAT_COMPRESSED_PVRT_RGBA: bpp = 4; break; - case PIXELFORMAT_COMPRESSED_DXT3_RGBA: - case PIXELFORMAT_COMPRESSED_DXT5_RGBA: - case PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: - case PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: bpp = 8; break; - case PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: bpp = 2; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAYSCALE: bpp = 8; break; + case RL_PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: + case RL_PIXELFORMAT_UNCOMPRESSED_R5G6B5: + case RL_PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: + case RL_PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: bpp = 16; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: bpp = 32; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8: bpp = 24; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32: bpp = 32; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32: bpp = 32*3; break; + case RL_PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: bpp = 32*4; break; + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGB: + case RL_PIXELFORMAT_COMPRESSED_DXT1_RGBA: + case RL_PIXELFORMAT_COMPRESSED_ETC1_RGB: + case RL_PIXELFORMAT_COMPRESSED_ETC2_RGB: + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGB: + case RL_PIXELFORMAT_COMPRESSED_PVRT_RGBA: bpp = 4; break; + case RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA: + case RL_PIXELFORMAT_COMPRESSED_DXT5_RGBA: + case RL_PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA: + case RL_PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: bpp = 8; break; + case RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: bpp = 2; break; default: break; } @@ -4252,8 +4253,8 @@ static int rlGetPixelDataSize(int width, int height, int format) // if texture is smaller, minimum dataSize is 8 or 16 if ((width < 4) && (height < 4)) { - if ((format >= PIXELFORMAT_COMPRESSED_DXT1_RGB) && (format < PIXELFORMAT_COMPRESSED_DXT3_RGBA)) dataSize = 8; - else if ((format >= PIXELFORMAT_COMPRESSED_DXT3_RGBA) && (format < PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA)) dataSize = 16; + if ((format >= RL_PIXELFORMAT_COMPRESSED_DXT1_RGB) && (format < RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA)) dataSize = 8; + else if ((format >= RL_PIXELFORMAT_COMPRESSED_DXT3_RGBA) && (format < RL_PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA)) dataSize = 16; } return dataSize; From 1613057881a2554231bc8169ee483d7f153e57ff Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 13:45:01 +0200 Subject: [PATCH 012/570] Update raudio.c --- src/raudio.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index e25d153a8..9a4a6c944 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -70,11 +70,10 @@ #include // Required for: va_list, va_start(), vfprintf(), va_end() #else #include "raylib.h" // Declares module functions - -// Check if config flags have been externally provided on compilation line -#if !defined(EXTERNAL_CONFIG_FLAGS) - #include "config.h" // Defines module configuration flags -#endif + // Check if config flags have been externally provided on compilation line + #if !defined(EXTERNAL_CONFIG_FLAGS) + #include "config.h" // Defines module configuration flags + #endif #include "utils.h" // Required for: fopen() Android mapping #endif From a8e9e1387f0abaa46557dd2076973cd30784148c Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 13:47:21 +0200 Subject: [PATCH 013/570] REVIEWED: Avoid UBSAN warnings #1891 --- src/rlgl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index ece72f8c0..10cde3095 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3227,7 +3227,8 @@ void rlDrawVertexArray(int offset, int count) void rlDrawVertexArrayElements(int offset, int count, void *buffer) { - glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset); + if (buffer == 0) glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, offset); + else glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset); } void rlDrawVertexArrayInstanced(int offset, int count, int instances) @@ -3240,7 +3241,8 @@ void rlDrawVertexArrayInstanced(int offset, int count, int instances) void rlDrawVertexArrayElementsInstanced(int offset, int count, void *buffer, int instances) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset, instances); + if (buffer == 0) glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, offset, instances); + else glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset, instances); #endif } From dffd1435e95eb56b68e3dd7362f0a0190cb8a582 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 13:50:33 +0200 Subject: [PATCH 014/570] Revert "REVIEWED: Avoid UBSAN warnings #1891" This reverts commit a8e9e1387f0abaa46557dd2076973cd30784148c. --- src/rlgl.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 10cde3095..ece72f8c0 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3227,8 +3227,7 @@ void rlDrawVertexArray(int offset, int count) void rlDrawVertexArrayElements(int offset, int count, void *buffer) { - if (buffer == 0) glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, offset); - else glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset); + glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset); } void rlDrawVertexArrayInstanced(int offset, int count, int instances) @@ -3241,8 +3240,7 @@ void rlDrawVertexArrayInstanced(int offset, int count, int instances) void rlDrawVertexArrayElementsInstanced(int offset, int count, void *buffer, int instances) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - if (buffer == 0) glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, offset, instances); - else glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset, instances); + glDrawElementsInstanced(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset, instances); #endif } From 0f8cfd603193d3bba45bdf0c073277600de2bc06 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 30 Jul 2021 13:52:00 +0200 Subject: [PATCH 015/570] Update rlgl_standalone.c --- examples/others/rlgl_standalone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index 0ddae3179..6df5b8412 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -52,7 +52,7 @@ #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 #define RAYMATH_STATIC_INLINE -#include "raymath.h" // Vector3, Quaternion and Matrix functionality +#include "raymath.h" // Vector2, Vector3, Quaternion and Matrix functionality #if defined(__EMSCRIPTEN__) #define GLFW_INCLUDE_ES2 From b805754aa17c87d413dd13bdac864a1aba5ee4f4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 18:10:26 +0200 Subject: [PATCH 016/570] REVIEWED: Avoid bool type collisions --- src/raylib.h | 10 +++++++--- src/rlgl.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index f3d56a017..facad9935 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -102,9 +102,12 @@ #ifndef PI #define PI 3.14159265358979323846f #endif - -#define DEG2RAD (PI/180.0f) -#define RAD2DEG (180.0f/PI) +#ifndef DEG2RAD + #define DEG2RAD (PI/180.0f) +#endif +#ifndef RAD2DEG + #define RAD2DEG (180.0f/PI) +#endif // Allow custom memory allocators #ifndef RL_MALLOC @@ -184,6 +187,7 @@ #include #elif !defined(__cplusplus) && !defined(bool) typedef enum bool { false, true } bool; + #define RL_BOOL_TYPE #endif // Vector2, 2 components diff --git a/src/rlgl.h b/src/rlgl.h index ece72f8c0..980be611f 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -291,7 +291,7 @@ typedef struct rlRenderBatch { #if defined(__STDC__) && __STDC_VERSION__ >= 199901L #include -#elif !defined(__cplusplus) && !defined(bool) +#elif !defined(__cplusplus) && !defined(bool) && !defined(RL_BOOL_TYPE) // Boolean type typedef enum bool { false, true } bool; #endif From 73c8ddc8bf60dda51bffd5803a5a22f40737d2f4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 18:36:06 +0200 Subject: [PATCH 017/570] REVIEWED: raylib_opengl_interop --- ...engl_interop.c => raylib_opengl_interop.c} | 74 +++++++++++------- ..._interop.png => raylib_opengl_interop.png} | Bin 2 files changed, 44 insertions(+), 30 deletions(-) rename examples/others/{opengl_interop.c => raylib_opengl_interop.c} (68%) rename examples/others/{opengl_interop.png => raylib_opengl_interop.png} (100%) diff --git a/examples/others/opengl_interop.c b/examples/others/raylib_opengl_interop.c similarity index 68% rename from examples/others/opengl_interop.c rename to examples/others/raylib_opengl_interop.c index 5d435f2a8..2ecc637d5 100644 --- a/examples/others/opengl_interop.c +++ b/examples/others/raylib_opengl_interop.c @@ -2,7 +2,7 @@ * * raylib [shaders] example - OpenGL point particle system * -* This example has been created using raylib 2ad3eb1 (www.raylib.com) +* This example has been created using raylib 3.8 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * * Example contributed by Stephan Soller (@arkanis - http://arkanis.de/) @@ -24,8 +24,9 @@ ********************************************************************************************/ #include "raylib.h" -#include "rlgl.h" -#include "glad.h" +#include "rlgl.h" // Required for: rlDrawRenderBatchActive(), rlGetMatrixModelview(), rlGetMatrixProjection() +#include "glad.h" // Required for: OpenGL functionality +#include "raymath.h" // Required for: MatrixMultiply(), MatrixToFloat() #if defined(PLATFORM_DESKTOP) #define GLSL_VERSION 330 @@ -33,6 +34,15 @@ #define GLSL_VERSION 100 #endif +#define MAX_PARTICLES 1000 + +// Particle type +typedef struct Particle { + float x; + float y; + float period; +} Particle; + int main() { // Initialization @@ -42,32 +52,34 @@ int main() InitWindow(screenWidth, screenHeight, "raylib - point particles"); - Shader shader = LoadShader( - TextFormat("resources/shaders/glsl%i/point_particle.vs", GLSL_VERSION), - TextFormat("resources/shaders/glsl%i/point_particle.fs", GLSL_VERSION)); + Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/point_particle.vs", GLSL_VERSION), + TextFormat("resources/shaders/glsl%i/point_particle.fs", GLSL_VERSION)); + int currentTimeLoc = GetShaderLocation(shader, "currentTime"); int colorLoc = GetShaderLocation(shader, "color"); // Initialize the vertex buffer for the particles and assign each particle random values - struct { float x, y, period; } particles[10000]; - const size_t particleCount = sizeof(particles) / sizeof(particles[0]); - for (size_t i = 0; i < particleCount; i++) + Particle particles[MAX_PARTICLES] = { 0 }; + + for (int i = 0; i < MAX_PARTICLES; i++) { - particles[i].x = GetRandomValue(20, screenWidth - 20); - particles[i].y = GetRandomValue(50, screenHeight - 20); - // Give each particle a slightly different period. But don't spread it to much. This way the particles line up - // every so often and you get a glimps of what is going on. - particles[i].period = GetRandomValue(10, 30) / 10.0f; + particles[i].x = (float)GetRandomValue(20, screenWidth - 20); + particles[i].y = (float)GetRandomValue(50, screenHeight - 20); + + // Give each particle a slightly different period. But don't spread it to much. + // This way the particles line up every so often and you get a glimps of what is going on. + particles[i].period = (float)GetRandomValue(10, 30)/10.0f; } - // Create a plain OpenGL vertex buffer with the data and an vertex array object that feeds the data from the buffer - // into the vertexPosition shader attribute. - GLuint vao = 0, vbo = 0; + // Create a plain OpenGL vertex buffer with the data and an vertex array object + // that feeds the data from the buffer into the vertexPosition shader attribute. + GLuint vao = 0; + GLuint vbo = 0; glGenVertexArrays(1, &vao); glBindVertexArray(vao); glGenBuffers(1, &vbo); glBindBuffer(GL_ARRAY_BUFFER, vbo); - glBufferData(GL_ARRAY_BUFFER, sizeof(particles), particles, GL_STATIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, MAX_PARTICLES*sizeof(Particle), particles, GL_STATIC_DRAW); // Note: LoadShader() automatically fetches the attribute index of "vertexPosition" and saves it in shader.locs[SHADER_LOC_VERTEX_POSITION] glVertexAttribPointer(shader.locs[SHADER_LOC_VERTEX_POSITION], 3, GL_FLOAT, GL_FALSE, 0, 0); glEnableVertexAttribArray(0); @@ -89,32 +101,33 @@ int main() ClearBackground(WHITE); DrawRectangle(10, 10, 210, 30, MAROON); - DrawText(TextFormat("%zu particles in one vertex buffer", particleCount), 20, 20, 10, RAYWHITE); + DrawText(TextFormat("%zu particles in one vertex buffer", MAX_PARTICLES), 20, 20, 10, RAYWHITE); + + rlDrawRenderBatchActive(); // Draw iternal buffers data (previous draw calls) // Switch to plain OpenGL //------------------------------------------------------------------------------ - // rlglDraw() in raylib 3.5 - rlDrawRenderBatchActive(); glUseProgram(shader.id); + glUniform1f(currentTimeLoc, GetTime()); Vector4 color = ColorNormalize((Color){ 255, 0, 0, 128 }); - glUniform4fv(colorLoc, 1, (float*)&color); + glUniform4fv(colorLoc, 1, (float *)&color); - // The the current model view projection matrix so the particle system is displayed and transformed - // (e.g. by cameras) just like everything else. - // GetMatrixModelview() and GetMatrixProjection() in raylib 3.5 + // Get the current modelview and projection matrix so the particle system is displayed and transformed Matrix modelViewProjection = MatrixMultiply(rlGetMatrixModelview(), rlGetMatrixProjection()); + glUniformMatrix4fv(shader.locs[SHADER_LOC_MATRIX_MVP], 1, false, MatrixToFloat(modelViewProjection)); glBindVertexArray(vao); - glDrawArrays(GL_POINTS, 0, particleCount); + glDrawArrays(GL_POINTS, 0, MAX_PARTICLES); glBindVertexArray(0); + glUseProgram(0); - - // And back to raylib again //------------------------------------------------------------------------------ + DrawFPS(screenWidth - 100, 10); + EndDrawing(); //---------------------------------------------------------------------------------- } @@ -124,8 +137,9 @@ int main() glDeleteBuffers(1, &vbo); glDeleteVertexArrays(1, &vao); - UnloadShader(shader); - CloseWindow(); // Close window and OpenGL context + UnloadShader(shader); // Unload shader + + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- return 0; diff --git a/examples/others/opengl_interop.png b/examples/others/raylib_opengl_interop.png similarity index 100% rename from examples/others/opengl_interop.png rename to examples/others/raylib_opengl_interop.png From 559f1919c6105d58dbc32ac0b9f4ba143ed15195 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 18:41:44 +0200 Subject: [PATCH 018/570] REVIEWED: Improved font loading info --- src/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text.c b/src/text.c index e16547f38..0371a0cec 100644 --- a/src/text.c +++ b/src/text.c @@ -266,7 +266,7 @@ extern void LoadFontDefault(void) defaultFont.baseSize = (int)defaultFont.recs[0].height; - TRACELOG(LOG_INFO, "FONT: Default font loaded successfully"); + TRACELOG(LOG_INFO, "FONT: [ID %i] Default font texture loaded successfully", defaultFont.texture.id); } // Unload raylib default font From 7013e609260d4abe820e884a2465ce91078f0fd4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 18:44:07 +0200 Subject: [PATCH 019/570] Update models_rlgl_solar_system.c --- examples/models/models_rlgl_solar_system.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/models/models_rlgl_solar_system.c b/examples/models/models_rlgl_solar_system.c index 97d692453..24394bec2 100644 --- a/examples/models/models_rlgl_solar_system.c +++ b/examples/models/models_rlgl_solar_system.c @@ -14,6 +14,8 @@ #include "raylib.h" #include "rlgl.h" +#include // Required for: cosf(), sinf() + //------------------------------------------------------------------------------------ // Module Functions Declaration //------------------------------------------------------------------------------------ From 3e75a2109dcc48154fc2e47243a2e365c727ffc6 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 19:08:13 +0200 Subject: [PATCH 020/570] REVIEWED: rlgl module header info --- src/rlgl.h | 72 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 980be611f..b6da19fa2 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2,13 +2,18 @@ * * rlgl v4.0 - OpenGL abstraction layer * -* rlgl is a wrapper for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) to -* pseudo-OpenGL 1.1 style functions (rlVertex, rlTranslate, rlRotate...). +* rlgl is an abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) +* to pseudo-OpenGL 1.1 immediate-mode style functions (rlVertex, rlTranslate, rlRotate...) * * When chosing an OpenGL version greater than OpenGL 1.1, rlgl stores vertex data on internal -* VBO buffers (and VAOs if available). It requires calling 3 functions: -* rlglInit() - Initialize internal buffers and auxiliary resources -* rlglClose() - De-initialize internal buffers data and other auxiliar resources +* buffers loaded at initialization. It requires calling 2 functions: +* - rlglInit(): Initialize internal buffers and auxiliary resources +* - rlglClose(): De-initialize internal buffers data and other auxiliar resources +* +* The following resources are loaded when calling rlglInit(): +* - Default batch (RLGL.defaultBatch): RenderBatch system to accumulate vertex data +* - Default texture (RLGL.defaultTextureId): 1x1 white pixel R8G8B8A8 +* - Default shader (RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs) * * CONFIGURATION: * @@ -32,8 +37,42 @@ * #define SUPPORT_GL_DETAILS_INFO * Show OpenGL extensions and capabilities detailed logs on init * +* rlgl capabilities could be customized just defining some internal +* values before library inclusion (default values listed): +* +* #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch limits +* #define DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +* #define DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +* #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack +* #define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh +* #define MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported +* #define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported +* #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance +* #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance +* +* When loading a shader, the following vertex attribute and uniform +* location names are tried to be set automatically: +* +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Binded by default to shader location: 1 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Binded by default to shader location: 2 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Binded by default to shader location: 3 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Binded by default to shader location: 4 +* #define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Binded by default to shader location: 5 +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_PROJECTION "matProjection" // projection matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_MODEL "matModel" // model matrix +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_NORMAL "matNormal" // normal matrix (transpose(inverse(matModelView)) +* #define RL_DEFAULT_SHADER_UNIFORM_NAME_COLOR "colDiffuse" // color diffuse (base tint color, multiplied by texture color) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE0 "texture0" // texture0 (texture slot active 0) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE1 "texture1" // texture1 (texture slot active 1) +* #define RL_DEFAULT_SHADER_SAMPLER2D_NAME_TEXTURE2 "texture2" // texture2 (texture slot active 2) +* * DEPENDENCIES: -* GLAD - OpenGL extensions loading (OpenGL 3.3 Core only) +* +* - OpenGL libraries (depending on platform and OpenGL version selected) +* - GLAD OpenGL extensions loading library (only for OpenGL 3.3 Core) * * * LICENSE: zlib/libpng @@ -617,15 +656,6 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #if defined(RLGL_IMPLEMENTATION) -// Check if config flags have been externally provided on compilation line -#if !defined(EXTERNAL_CONFIG_FLAGS) - #include "config.h" // Defines module configuration flags -#endif - -#include // Required for: malloc(), free() -#include // Required for: strcmp(), strlen() [Used in rlglInit(), on extensions loading] -#include // Required for: sqrtf(), sinf(), cosf(), floor(), log() - #if defined(GRAPHICS_API_OPENGL_11) #if defined(__APPLE__) #include // OpenGL 1.1 library for OSX @@ -676,6 +706,10 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad #endif #endif +#include // Required for: malloc(), free() +#include // Required for: strcmp(), strlen() [Used in rlglInit(), on extensions loading] +#include // Required for: sqrtf(), sinf(), cosf(), floor(), log() + //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- @@ -886,8 +920,8 @@ static PFNGLVERTEXATTRIBDIVISOREXTPROC glVertexAttribDivisor = NULL; // Module specific Functions Declaration //---------------------------------------------------------------------------------- #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) -static void rlLoadShaderDefault(void); // Load default shader (RLGL.State.defaultShader) -static void rlUnloadShaderDefault(void); // Unload default shader (RLGL.State.defaultShader) +static void rlLoadShaderDefault(void); // Load default shader +static void rlUnloadShaderDefault(void); // Unload default shader #if defined(SUPPORT_GL_DETAILS_INFO) static char *rlGetCompressedFormatName(int format); // Get compressed format official GL identifier name #endif // SUPPORT_GL_DETAILS_INFO @@ -3883,7 +3917,7 @@ const char *rlGetPixelFormatName(unsigned int format) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Load default shader (just vertex positioning and texture coloring) // NOTE: This shader program is used for internal buffers -// NOTE: It uses global variable: RLGL.State.defaultShader +// NOTE: Loaded: RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs static void rlLoadShaderDefault(void) { RLGL.State.defaultShaderLocs = (int *)RL_CALLOC(MAX_SHADER_LOCATIONS, sizeof(int)); @@ -3988,7 +4022,7 @@ static void rlLoadShaderDefault(void) } // Unload default shader -// NOTE: It uses global variable: RLGL.State.defaultShader +// NOTE: Unloads: RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs static void rlUnloadShaderDefault(void) { glUseProgram(0); From 5b6d83b53331190db632d68de7d5beb6539ebf3a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 19:46:44 +0200 Subject: [PATCH 021/570] REVIEWED: rlgl defines for consistency --- examples/others/rlgl_standalone.c | 11 +++- src/config.h | 25 ++++----- src/core.c | 4 +- src/models.c | 7 ++- src/raylib.h | 2 +- src/rlgl.h | 93 ++++++++++++++----------------- 6 files changed, 74 insertions(+), 68 deletions(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index 6df5b8412..c8c0b0deb 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -48,6 +48,16 @@ * ********************************************************************************************/ +// NOTE: rlgl can be configured just re-defining the following values: +//#define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits +//#define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +//#define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +//#define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) +//#define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack +//#define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported +//#define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance +//#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance + #define RLGL_IMPLEMENTATION #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 3.3+ or ES2 @@ -57,7 +67,6 @@ #if defined(__EMSCRIPTEN__) #define GLFW_INCLUDE_ES2 #endif - #include "GLFW/glfw3.h" // Windows/Context and inputs management #include // Required for: printf() diff --git a/src/config.h b/src/config.h index 084c235db..b7358d7e7 100644 --- a/src/config.h +++ b/src/config.h @@ -87,22 +87,17 @@ // Show OpenGL extensions and capabilities detailed logs on init //#define SUPPORT_GL_DETAILS_INFO 1 -#if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) - #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch limits -#elif defined(GRAPHICS_API_OPENGL_ES2) - #define DEFAULT_BATCH_BUFFER_ELEMENTS 2048 // Default internal render batch limits -#endif +//#define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 4096 // Default internal render batch elements limits +#define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +#define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +#define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) -#define DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) -#define DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +#define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack -#define MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack -#define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh -#define MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported -#define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported +#define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported -#define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance -#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance +#define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance +#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance // Default shader vertex attribute names to set location points // NOTE: When a new shader is loaded, the following locations are tried to be set for convenience @@ -191,6 +186,10 @@ // NOTE: Some generated meshes DO NOT include generated texture coordinates #define SUPPORT_MESH_GENERATION 1 +// models: Configuration values +//------------------------------------------------------------------------------------ +#define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported +#define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh //------------------------------------------------------------------------------------ // Module: audio - Configuration Flags diff --git a/src/core.c b/src/core.c index 264921229..b03216cc2 100644 --- a/src/core.c +++ b/src/core.c @@ -2296,10 +2296,10 @@ Shader LoadShader(const char *vsFileName, const char *fsFileName) RLAPI Shader LoadShaderFromMemory(const char *vsCode, const char *fsCode) { Shader shader = { 0 }; - shader.locs = (int *)RL_CALLOC(MAX_SHADER_LOCATIONS, sizeof(int)); + shader.locs = (int *)RL_CALLOC(RL_MAX_SHADER_LOCATIONS, sizeof(int)); // NOTE: All locations must be reseted to -1 (no location) - for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) shader.locs[i] = -1; + for (int i = 0; i < RL_MAX_SHADER_LOCATIONS; i++) shader.locs[i] = -1; shader.id = rlLoadShaderCode(vsCode, fsCode); diff --git a/src/models.c b/src/models.c index 870c5e8cb..bce9c8d82 100644 --- a/src/models.c +++ b/src/models.c @@ -92,7 +92,12 @@ //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- -// ... +#ifndef MAX_MATERIAL_MAPS + #define MAX_MATERIAL_MAPS 12 // Maximum number of maps supported +#endif +#ifndef MAX_MESH_VERTEX_BUFFERS + #define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh +#endif //---------------------------------------------------------------------------------- // Types and Structures Definition diff --git a/src/raylib.h b/src/raylib.h index facad9935..781c14202 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -348,7 +348,7 @@ typedef struct Mesh { // Shader typedef struct Shader { unsigned int id; // Shader program id - int *locs; // Shader locations array (MAX_SHADER_LOCATIONS) + int *locs; // Shader locations array (RL_MAX_SHADER_LOCATIONS) } Shader; // MaterialMap diff --git a/src/rlgl.h b/src/rlgl.h index b6da19fa2..2784af703 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -40,15 +40,15 @@ * rlgl capabilities could be customized just defining some internal * values before library inclusion (default values listed): * -* #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch limits -* #define DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) -* #define DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) -* #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack -* #define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh -* #define MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported -* #define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported -* #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance -* #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance +* #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits +* #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +* #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +* #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) +* +* #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of internal Matrix stack +* #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported +* #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance +* #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance * * When loading a shader, the following vertex attribute and uniform * location names are tried to be set automatically: @@ -163,54 +163,47 @@ //---------------------------------------------------------------------------------- // Defines and Macros //---------------------------------------------------------------------------------- -// Default internal render batch limits -#ifndef DEFAULT_BATCH_BUFFER_ELEMENTS + +// Default internal render batch elements limits +#ifndef RL_DEFAULT_BATCH_BUFFER_ELEMENTS #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) // This is the maximum amount of elements (quads) per batch // NOTE: Be careful with text, every letter maps to a quad - #define DEFAULT_BATCH_BUFFER_ELEMENTS 8192 + #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 #endif #if defined(GRAPHICS_API_OPENGL_ES2) // We reduce memory sizes for embedded systems (RPI and HTML5) // NOTE: On HTML5 (emscripten) this is allocated on heap, // by default it's only 16MB!...just take care... - #define DEFAULT_BATCH_BUFFER_ELEMENTS 2048 + #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 2048 #endif #endif -#ifndef DEFAULT_BATCH_BUFFERS - #define DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) +#ifndef RL_DEFAULT_BATCH_BUFFERS + #define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering) #endif -#ifndef DEFAULT_BATCH_DRAWCALLS - #define DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) +#ifndef RL_DEFAULT_BATCH_DRAWCALLS + #define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture) #endif -#ifndef MAX_BATCH_ACTIVE_TEXTURES - #define MAX_BATCH_ACTIVE_TEXTURES 4 // Maximum number of additional textures that can be activated on batch drawing (SetShaderValueTexture()) +#ifndef RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS + #define RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS 4 // Maximum number of textures units that can be activated on batch drawing (SetShaderValueTexture()) #endif // Internal Matrix stack -#ifndef MAX_MATRIX_STACK_SIZE - #define MAX_MATRIX_STACK_SIZE 32 // Maximum size of Matrix stack +#ifndef RL_MAX_MATRIX_STACK_SIZE + #define RL_MAX_MATRIX_STACK_SIZE 32 // Maximum size of Matrix stack #endif -// Vertex buffers id limit -#ifndef MAX_MESH_VERTEX_BUFFERS - #define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh -#endif - -// Shader and material limits -#ifndef MAX_SHADER_LOCATIONS - #define MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported -#endif -#ifndef MAX_MATERIAL_MAPS - #define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported +// Shader limits +#ifndef RL_MAX_SHADER_LOCATIONS + #define RL_MAX_SHADER_LOCATIONS 32 // Maximum number of shader locations supported #endif // Projection matrix culling #ifndef RL_CULL_DISTANCE_NEAR - #define RL_CULL_DISTANCE_NEAR 0.01 // Default near cull distance + #define RL_CULL_DISTANCE_NEAR 0.01 // Default near cull distance #endif #ifndef RL_CULL_DISTANCE_FAR - #define RL_CULL_DISTANCE_FAR 1000.0 // Default far cull distance + #define RL_CULL_DISTANCE_FAR 1000.0 // Default far cull distance #endif // Texture parameters (equivalent to OpenGL defines) @@ -848,11 +841,11 @@ typedef struct rlglData { Matrix projection; // Default projection matrix Matrix transform; // Transform matrix to be used with rlTranslate, rlRotate, rlScale bool transformRequired; // Require transform matrix application to current draw-call vertex (if required) - Matrix stack[MAX_MATRIX_STACK_SIZE];// Matrix stack for push/pop + Matrix stack[RL_MAX_MATRIX_STACK_SIZE];// Matrix stack for push/pop int stackCounter; // Matrix stack counter unsigned int defaultTextureId; // Default texture used on shapes/poly drawing (required by shader) - unsigned int activeTextureId[MAX_BATCH_ACTIVE_TEXTURES]; // Active texture ids to be enabled on batch drawing (0 active by default) + unsigned int activeTextureId[RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS]; // Active texture ids to be enabled on batch drawing (0 active by default) unsigned int defaultVShaderId; // Default vertex shader id (used by default shader program) unsigned int defaultFShaderId; // Default fragment shader id (used by default shader program) unsigned int defaultShaderId; // Default shader program id, supports vertex color and diffuse texture @@ -985,7 +978,7 @@ void rlMatrixMode(int mode) // Push the current matrix into RLGL.State.stack void rlPushMatrix(void) { - if (RLGL.State.stackCounter >= MAX_MATRIX_STACK_SIZE) TRACELOG(RL_LOG_ERROR, "RLGL: Matrix stack overflow (MAX_MATRIX_STACK_SIZE)"); + if (RLGL.State.stackCounter >= RL_MAX_MATRIX_STACK_SIZE) TRACELOG(RL_LOG_ERROR, "RLGL: Matrix stack overflow (RL_MAX_MATRIX_STACK_SIZE)"); if (RLGL.State.currentMatrixMode == RL_MODELVIEW) { @@ -1231,7 +1224,7 @@ void rlBegin(int mode) } } - if (RLGL.currentBatch->drawsCounter >= DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawsCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode = mode; RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount = 0; @@ -1422,7 +1415,7 @@ void rlSetTexture(unsigned int id) } } - if (RLGL.currentBatch->drawsCounter >= DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawsCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].textureId = id; RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount = 0; @@ -1746,11 +1739,11 @@ void rlglInit(int width, int height) RLGL.State.currentShaderLocs = RLGL.State.defaultShaderLocs; // Init default vertex arrays buffers - RLGL.defaultBatch = rlLoadRenderBatch(DEFAULT_BATCH_BUFFERS, DEFAULT_BATCH_BUFFER_ELEMENTS); + RLGL.defaultBatch = rlLoadRenderBatch(RL_DEFAULT_BATCH_BUFFERS, RL_DEFAULT_BATCH_BUFFER_ELEMENTS); RLGL.currentBatch = &RLGL.defaultBatch; // Init stack matrices (emulating OpenGL 1.1) - for (int i = 0; i < MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = rlMatrixIdentity(); + for (int i = 0; i < RL_MAX_MATRIX_STACK_SIZE; i++) RLGL.State.stack[i] = rlMatrixIdentity(); // Init internal matrices RLGL.State.transform = rlMatrixIdentity(); @@ -2217,9 +2210,9 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) // Init draw calls tracking system //-------------------------------------------------------------------------------------------- - batch.draws = (rlDrawCall *)RL_MALLOC(DEFAULT_BATCH_DRAWCALLS*sizeof(rlDrawCall)); + batch.draws = (rlDrawCall *)RL_MALLOC(RL_DEFAULT_BATCH_DRAWCALLS*sizeof(rlDrawCall)); - for (int i = 0; i < DEFAULT_BATCH_DRAWCALLS; i++) + for (int i = 0; i < RL_DEFAULT_BATCH_DRAWCALLS; i++) { batch.draws[i].mode = RL_QUADS; batch.draws[i].vertexCount = 0; @@ -2391,7 +2384,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // Activate additional sampler textures // Those additional textures will be common for all draw calls of the batch - for (int i = 0; i < MAX_BATCH_ACTIVE_TEXTURES; i++) + for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) { if (RLGL.State.activeTextureId[i] > 0) { @@ -2456,7 +2449,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) RLGL.State.modelview = matModelView; // Reset RLGL.currentBatch->draws array - for (int i = 0; i < DEFAULT_BATCH_DRAWCALLS; i++) + for (int i = 0; i < RL_DEFAULT_BATCH_DRAWCALLS; i++) { batch->draws[i].mode = RL_QUADS; batch->draws[i].vertexCount = 0; @@ -2464,7 +2457,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) } // Reset active texture units for next batch - for (int i = 0; i < MAX_BATCH_ACTIVE_TEXTURES; i++) RLGL.State.activeTextureId[i] = 0; + for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) RLGL.State.activeTextureId[i] = 0; // Reset draws counter to one draw for the batch batch->drawsCounter = 1; @@ -3605,11 +3598,11 @@ void rlSetUniformSampler(int locIndex, unsigned int textureId) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Check if texture is already active - for (int i = 0; i < MAX_BATCH_ACTIVE_TEXTURES; i++) if (RLGL.State.activeTextureId[i] == textureId) return; + for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) if (RLGL.State.activeTextureId[i] == textureId) return; // Register a new active texture for the internal batch system // NOTE: Default texture is always activated as GL_TEXTURE0 - for (int i = 0; i < MAX_BATCH_ACTIVE_TEXTURES; i++) + for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) { if (RLGL.State.activeTextureId[i] == 0) { @@ -3920,10 +3913,10 @@ const char *rlGetPixelFormatName(unsigned int format) // NOTE: Loaded: RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs static void rlLoadShaderDefault(void) { - RLGL.State.defaultShaderLocs = (int *)RL_CALLOC(MAX_SHADER_LOCATIONS, sizeof(int)); + RLGL.State.defaultShaderLocs = (int *)RL_CALLOC(RL_MAX_SHADER_LOCATIONS, sizeof(int)); // NOTE: All locations must be reseted to -1 (no location) - for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) RLGL.State.defaultShaderLocs[i] = -1; + for (int i = 0; i < RL_MAX_SHADER_LOCATIONS; i++) RLGL.State.defaultShaderLocs[i] = -1; // Vertex shader directly defined, no external file required const char *defaultVShaderCode = From aa67903f96846d473e3de6f34c166bc4e78b9fdb Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 31 Jul 2021 19:58:30 +0200 Subject: [PATCH 022/570] Improve rlgl description --- src/rlgl.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 2784af703..76b5114af 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1,20 +1,24 @@ /********************************************************************************************** * -* rlgl v4.0 - OpenGL abstraction layer +* rlgl v4.0 * -* rlgl is an abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) -* to pseudo-OpenGL 1.1 immediate-mode style functions (rlVertex, rlTranslate, rlRotate...) +* An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) +* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...) * -* When chosing an OpenGL version greater than OpenGL 1.1, rlgl stores vertex data on internal -* buffers loaded at initialization. It requires calling 2 functions: -* - rlglInit(): Initialize internal buffers and auxiliary resources -* - rlglClose(): De-initialize internal buffers data and other auxiliar resources +* When chosing an OpenGL backend different than OpenGL 1.1, some internal buffer are +* initialized on rlglInit() to accumulate vertex data. * -* The following resources are loaded when calling rlglInit(): +* When an internal state change is required all the stored vertex data is renderer in batch, +* additioanlly, rlDrawRenderBatchActive() could be called to force flushing of the batch. +* +* Some additional resources are also loaded for convenience, here the complete list: * - Default batch (RLGL.defaultBatch): RenderBatch system to accumulate vertex data * - Default texture (RLGL.defaultTextureId): 1x1 white pixel R8G8B8A8 * - Default shader (RLGL.State.defaultShaderId, RLGL.State.defaultShaderLocs) * +* Internal buffer (and additional resources) must be manually unloaded calling rlglClose(). +* +* * CONFIGURATION: * * #define GRAPHICS_API_OPENGL_11 From 07e0b105156b08718500fe4e2c74e583361278a8 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 7 Aug 2021 11:28:35 +0200 Subject: [PATCH 023/570] Added rayex, elixir binding --- BINDINGS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BINDINGS.md b/BINDINGS.md index 87a076b00..b154dc7b2 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -96,6 +96,7 @@ Some people ported raylib to other languages in form of bindings or wrappers to | raylib-never | 3.0 | [Never](https://github.com/never-lang/never) | https://github.com/never-lang/raylib-never | | hb-raylib | 3.5 | [Harbour](https://harbour.github.io) | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib | | Relib | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | https://github.com/RedCubeDev-ByteSpace/Relib | +| rayex | 3.7 | [elixir](https://elixir-lang.org/) | https://github.com/shiryel/rayex | | raylib.cbl | 2.0 | [COBOL](https://en.wikipedia.org/wiki/COBOL) | *[code examples](https://github.com/Martinfx/Cobol/tree/master/OpenCobol/Games/raylib)* | ### Utility Wrapers From 7ca9131fd46e6928910cd995f4dc4240f36e2560 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 7 Aug 2021 11:58:39 +0200 Subject: [PATCH 024/570] Update rlgl_standalone.c --- examples/others/rlgl_standalone.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index c8c0b0deb..cc0eda2db 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -2,18 +2,17 @@ * * raylib [rlgl] example - Using rlgl module as standalone module * -* NOTE: This example requires OpenGL 3.3 or ES2 versions for shaders support, +* rlgl library is an abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, ES 2.0) +* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...) +* +* NOTE: This example requires OpenGL 3.3 or OpenGL ES 2.0 for shaders support, * OpenGL 1.1 does not support shaders but it can also be used. * * DEPENDENCIES: -* rlgl.h - OpenGL 1.1 immediate-mode style coding translation layer -* glad.h - OpenGL extensions initialization library (required by rlgl) -* raymath.h - 3D math library (required by rlgl) * glfw3 - Windows and context initialization library -* -* rlgl library is provided as a single-file header-only library, this library -* allows coding in a pseudo-OpenGL 1.1 style while translating calls to multiple -* OpenGL versions backends (1.1, 2.1, 3.3, ES 2.0). +* rlgl.h - OpenGL abstraction layer to OpenGL 1.1, 3.3 or ES2 +* glad.h - OpenGL extensions initialization library (required by rlgl) +* raymath.h - 3D math library * * WINDOWS COMPILATION: * gcc -o rlgl_standalone.exe rlgl_standalone.c -s -Iexternal\include -I..\..\src \ @@ -21,15 +20,16 @@ * * APPLE COMPILATION: * gcc -o rlgl_standalone rlgl_standalone.c -I../../src -Iexternal/include -Lexternal/lib \ -* -lglfw3 -std=c99 -framework CoreVideo -framework OpenGL -framework OpenAL \ -* -framework IOKit -framework Cocoa -Wno-deprecated-declarations +* -lglfw3 -framework CoreVideo -framework OpenGL -framework IOKit -framework Cocoa +* -Wno-deprecated-declarations -std=c99 -DGRAPHICS_API_OPENGL_33 +* * * LICENSE: zlib/libpng * * This example is licensed under an unmodified zlib/libpng license, which is an OSI-certified, * BSD-like license that allows static linking with closed source software: * -* Copyright (c) 2014-2019 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2021 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. @@ -107,7 +107,7 @@ static void DrawCube(Vector3 position, float width, float height, float length, static void DrawCubeWires(Vector3 position, float width, float height, float length, Color color); static void DrawRectangleV(Vector2 position, Vector2 size, Color color); -// NOTE: We used raymath to get this functionality but it can be implemented here +// NOTE: We use raymath to get this functionality but it could be implemented in this module //static Matrix MatrixIdentity(void); //static Matrix MatrixOrtho(double left, double right, double bottom, double top, double near, double far); //static Matrix MatrixPerspective(double fovy, double aspect, double near, double far); @@ -144,7 +144,6 @@ int main(void) glfwWindowHint( GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE ); #endif - GLFWwindow *window = glfwCreateWindow(screenWidth, screenHeight, "rlgl standalone", NULL, NULL); if (!window) @@ -219,8 +218,8 @@ int main(void) // Draw '2D' elements in the scene (GUI) //----------------------------------------------- -#define RLGL_CREATE_MATRIX_MANUALLY -#if defined(RLGL_CREATE_MATRIX_MANUALLY) +#define RLGL_SET_MATRIX_MANUALLY +#if defined(RLGL_SET_MATRIX_MANUALLY) matProj = MatrixOrtho(0.0, screenWidth, screenHeight, 0.0, 0.0, 1.0); matView = MatrixIdentity(); @@ -237,7 +236,7 @@ int main(void) #endif DrawRectangleV((Vector2){ 10.0f, 10.0f }, (Vector2){ 780.0f, 20.0f }, DARKGRAY); - // Draw internal render batch buffers (3D data) + // Draw internal render batch buffers (2D data) rlDrawRenderBatchActive(); //----------------------------------------------- From e6fe8169c27825580e9b0e73ae633e89dc83b786 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Sat, 7 Aug 2021 17:30:48 -0400 Subject: [PATCH 025/570] Fix Makefile to build WASM examples. (#1906) * Fix Makefile to build WASM examples. - Add --preload-file flag before specifying the resource dir - Add empty resource dir to `shapes/` (otherwise wasm-ld will fail) - Add wasm outputs to .gitigore * Delete .gitignore Co-authored-by: Ray --- .gitignore | 6 ++++++ examples/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9153a03ea..00c9bdcec 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,12 @@ packages/ *.bc *.so +# Ignore wasm data in examples/ +examples/**/*.wasm +examples/**/*.data +examples/**/*.js +examples/**/*.html + # Ignore files build by xcode *.mode*v* *.pbxuser diff --git a/examples/Makefile b/examples/Makefile index bded27e53..5abf0c708 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -244,7 +244,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) # --memory-init-file 0 # to avoid an external memory initialization code file (.mem) # --preload-file resources # specify a resources folder for data compilation # --source-map-base # allow debugging in browser with source map - CFLAGS += -s USE_GLFW=3 -s ASYNCIFY -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 $(dir $<)resources@resources + CFLAGS += -s USE_GLFW=3 -s ASYNCIFY -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 --preload-file $(dir $<)resources@resources # NOTE: Simple raylib examples are compiled to be interpreter with asyncify, that way, # we can compile same code for ALL platforms with no change required, but, working on bigger From 5e63cd3c97a8b45c5effa961b00b533223c4e44f Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 8 Aug 2021 11:29:24 +0200 Subject: [PATCH 026/570] ADDED: GenMeshCone() #1903 --- src/external/par_shapes.h | 163 ++++++++++++++++++++++++++++++-------- src/models.c | 55 +++++++++++++ src/raylib.h | 1 + 3 files changed, 188 insertions(+), 31 deletions(-) diff --git a/src/external/par_shapes.h b/src/external/par_shapes.h index 8b65e384a..f44987a30 100644 --- a/src/external/par_shapes.h +++ b/src/external/par_shapes.h @@ -21,8 +21,7 @@ // coordinates (one per vertex). That's it! If you need something fancier, // look elsewhere. // -// The MIT License -// Copyright (c) 2015 Philip Rideout +// Distributed under the MIT License, see bottom of file. #ifndef PAR_SHAPES_H #define PAR_SHAPES_H @@ -32,21 +31,17 @@ extern "C" { #endif #include - -// Ray: commented to avoid conflict with raylib bool -/* #if !defined(_MSC_VER) # include #else // MSVC # if _MSC_VER >= 1800 # include # else // stdbool.h missing prior to MSVC++ 12.0 (VS2013) -//# define bool int -//# define true 1 -//# define false 0 +# define bool int +# define true 1 +# define false 0 # endif #endif -*/ #ifndef PAR_SHAPES_T #define PAR_SHAPES_T uint16_t @@ -71,6 +66,14 @@ void par_shapes_free_mesh(par_shapes_mesh*); // both 1.0, but they can easily be changed with par_shapes_scale. par_shapes_mesh* par_shapes_create_cylinder(int slices, int stacks); +// Cone is similar to cylinder but the radius diminishes to zero as Z increases. +// Again, height and radius are 1.0, but can be changed with par_shapes_scale. +par_shapes_mesh* par_shapes_create_cone(int slices, int stacks); + +// Create a disk of radius 1.0 with texture coordinates and normals by squashing +// a cone flat on the Z=0 plane. +par_shapes_mesh* par_shapes_create_parametric_disk(int slices, int stacks); + // Create a donut that sits on the Z=0 plane with the specified inner radius. // The outer radius can be controlled with par_shapes_scale. par_shapes_mesh* par_shapes_create_torus(int slices, int stacks, float radius); @@ -172,6 +175,17 @@ par_shapes_mesh* par_shapes_weld(par_shapes_mesh const*, float epsilon, // Compute smooth normals by averaging adjacent facet normals. void par_shapes_compute_normals(par_shapes_mesh* m); +// Global Config --------------------------------------------------------------- + +void par_shapes_set_epsilon_welded_normals(float epsilon); +void par_shapes_set_epsilon_degenerate_sphere(float epsilon); + +// Advanced -------------------------------------------------------------------- + +void par_shapes__compute_welded_normals(par_shapes_mesh* m); +void par_shapes__connect(par_shapes_mesh* scene, par_shapes_mesh* cylinder, + int slices); + #ifndef PAR_PI #define PAR_PI (3.14159265359) #define PAR_MIN(a, b) (a > b ? b : a) @@ -205,11 +219,15 @@ void par_shapes_compute_normals(par_shapes_mesh* m); #include #include +static float par_shapes__epsilon_welded_normals = 0.001; +static float par_shapes__epsilon_degenerate_sphere = 0.0001; + static void par_shapes__sphere(float const* uv, float* xyz, void*); static void par_shapes__hemisphere(float const* uv, float* xyz, void*); static void par_shapes__plane(float const* uv, float* xyz, void*); static void par_shapes__klein(float const* uv, float* xyz, void*); static void par_shapes__cylinder(float const* uv, float* xyz, void*); +static void par_shapes__cone(float const* uv, float* xyz, void*); static void par_shapes__torus(float const* uv, float* xyz, void*); static void par_shapes__trefoil(float const* uv, float* xyz, void*); @@ -298,11 +316,12 @@ static float par_shapes__sqrdist3(float const* a, float const* b) return dx * dx + dy * dy + dz * dz; } -static void par_shapes__compute_welded_normals(par_shapes_mesh* m) +void par_shapes__compute_welded_normals(par_shapes_mesh* m) { + const float epsilon = par_shapes__epsilon_welded_normals; m->normals = PAR_MALLOC(float, m->npoints * 3); PAR_SHAPES_T* weldmap = PAR_MALLOC(PAR_SHAPES_T, m->npoints); - par_shapes_mesh* welded = par_shapes_weld(m, 0.01, weldmap); + par_shapes_mesh* welded = par_shapes_weld(m, epsilon, weldmap); par_shapes_compute_normals(welded); float* pdst = m->normals; for (int i = 0; i < m->npoints; i++, pdst += 3) { @@ -325,6 +344,24 @@ par_shapes_mesh* par_shapes_create_cylinder(int slices, int stacks) stacks, 0); } +par_shapes_mesh* par_shapes_create_cone(int slices, int stacks) +{ + if (slices < 3 || stacks < 1) { + return 0; + } + return par_shapes_create_parametric(par_shapes__cone, slices, + stacks, 0); +} + +par_shapes_mesh* par_shapes_create_parametric_disk(int slices, int stacks) +{ + par_shapes_mesh* m = par_shapes_create_cone(slices, stacks); + if (m) { + par_shapes_scale(m, 1.0f, 1.0f, 0.0f); + } + return m; +} + par_shapes_mesh* par_shapes_create_parametric_sphere(int slices, int stacks) { if (slices < 3 || stacks < 3) { @@ -332,7 +369,7 @@ par_shapes_mesh* par_shapes_create_parametric_sphere(int slices, int stacks) } par_shapes_mesh* m = par_shapes_create_parametric(par_shapes__sphere, slices, stacks, 0); - par_shapes_remove_degenerate(m, 0.0001); + par_shapes_remove_degenerate(m, par_shapes__epsilon_degenerate_sphere); return m; } @@ -343,7 +380,7 @@ par_shapes_mesh* par_shapes_create_hemisphere(int slices, int stacks) } par_shapes_mesh* m = par_shapes_create_parametric(par_shapes__hemisphere, slices, stacks, 0); - par_shapes_remove_degenerate(m, 0.0001); + par_shapes_remove_degenerate(m, par_shapes__epsilon_degenerate_sphere); return m; } @@ -579,6 +616,15 @@ static void par_shapes__cylinder(float const* uv, float* xyz, void* userdata) xyz[2] = uv[0]; } +static void par_shapes__cone(float const* uv, float* xyz, void* userdata) +{ + float r = 1.0f - uv[0]; + float theta = uv[1] * 2 * PAR_PI; + xyz[0] = r * sinf(theta); + xyz[1] = r * cosf(theta); + xyz[2] = uv[0]; +} + static void par_shapes__torus(float const* uv, float* xyz, void* userdata) { float major = 1; @@ -620,6 +666,14 @@ static void par_shapes__trefoil(float const* uv, float* xyz, void* userdata) xyz[2] = z + d * ww[2] * sin(v); } +void par_shapes_set_epsilon_welded_normals(float epsilon) { + par_shapes__epsilon_welded_normals = epsilon; +} + +void par_shapes_set_epsilon_degenerate_sphere(float epsilon) { + par_shapes__epsilon_degenerate_sphere = epsilon; +} + void par_shapes_merge(par_shapes_mesh* dst, par_shapes_mesh const* src) { PAR_SHAPES_T offset = dst->npoints; @@ -744,15 +798,15 @@ void par_shapes_rotate(par_shapes_mesh* mesh, float radians, float const* axis) p[1] = y; p[2] = z; } - p = mesh->normals; - if (p) { - for (int i = 0; i < mesh->npoints; i++, p += 3) { - float x = col0[0] * p[0] + col1[0] * p[1] + col2[0] * p[2]; - float y = col0[1] * p[0] + col1[1] * p[1] + col2[1] * p[2]; - float z = col0[2] * p[0] + col1[2] * p[1] + col2[2] * p[2]; - p[0] = x; - p[1] = y; - p[2] = z; + float* n = mesh->normals; + if (n) { + for (int i = 0; i < mesh->npoints; i++, n += 3) { + float x = col0[0] * n[0] + col1[0] * n[1] + col2[0] * n[2]; + float y = col0[1] * n[0] + col1[1] * n[1] + col2[1] * n[2]; + float z = col0[2] * n[0] + col1[2] * n[1] + col2[2] * n[2]; + n[0] = x; + n[1] = y; + n[2] = z; } } } @@ -765,6 +819,27 @@ void par_shapes_scale(par_shapes_mesh* m, float x, float y, float z) *points++ *= y; *points++ *= z; } + float* n = m->normals; + if (n && !(x == y && y == z)) { + bool x_zero = x == 0; + bool y_zero = y == 0; + bool z_zero = z == 0; + if (!x_zero && !y_zero && !z_zero) { + x = 1.0f / x; + y = 1.0f / y; + z = 1.0f / z; + } else { + x = x_zero && !y_zero && !z_zero; + y = y_zero && !x_zero && !z_zero; + z = z_zero && !x_zero && !y_zero; + } + for (int i = 0; i < m->npoints; i++, n += 3) { + n[0] *= x; + n[1] *= y; + n[2] *= z; + par_shapes__normalize3(n); + } + } } void par_shapes_merge_and_free(par_shapes_mesh* dst, par_shapes_mesh* src) @@ -1098,8 +1173,8 @@ static par_shapes_mesh* par_shapes__apply_turtle(par_shapes_mesh* mesh, return m; } -static void par_shapes__connect(par_shapes_mesh* scene, - par_shapes_mesh* cylinder, int slices) +void par_shapes__connect(par_shapes_mesh* scene, par_shapes_mesh* cylinder, + int slices) { int stacks = 1; int npoints = (slices + 1) * (stacks + 1); @@ -1118,7 +1193,8 @@ static void par_shapes__connect(par_shapes_mesh* scene, // Create the new triangle list. int ntriangles = scene->ntriangles + 2 * slices * stacks; PAR_SHAPES_T* triangles = PAR_MALLOC(PAR_SHAPES_T, ntriangles * 3); - memcpy(triangles, scene->triangles, 2 * scene->ntriangles * 3); + memcpy(triangles, scene->triangles, + sizeof(PAR_SHAPES_T) * scene->ntriangles * 3); int v = scene->npoints - (slices + 1); PAR_SHAPES_T* face = triangles + scene->ntriangles * 3; for (int stack = 0; stack < stacks; stack++) { @@ -1154,7 +1230,7 @@ par_shapes_mesh* par_shapes_create_lsystem(char const* text, int slices, while (cmd) { char *arg = strtok(0, " "); if (!arg) { - //puts("lsystem error: unexpected end of program."); + puts("lsystem error: unexpected end of program."); break; } if (!strcmp(cmd, "rule")) { @@ -1208,7 +1284,6 @@ par_shapes_mesh* par_shapes_create_lsystem(char const* text, int slices, // For testing purposes, dump out the parsed program. #ifdef TEST_PARSE - /* for (int i = 0; i < nrules; i++) { par_shapes__rule rule = rules[i]; printf("rule %s.%d\n", rule.name, rule.weight); @@ -1217,7 +1292,6 @@ par_shapes_mesh* par_shapes_create_lsystem(char const* text, int slices, printf("\t%s %s\n", cmd.cmd, cmd.arg); } } - */ #endif // Instantiate the aggregated shape and the template shapes. @@ -1258,7 +1332,8 @@ par_shapes_mesh* par_shapes_create_lsystem(char const* text, int slices, par_shapes__command* cmd = rule->commands + (frame->pc++); #ifdef DUMP_TRACE - //printf("%5s %5s %5s:%d %03d\n", cmd->cmd, cmd->arg, rule->name, frame->pc - 1, stackptr); + printf("%5s %5s %5s:%d %03d\n", cmd->cmd, cmd->arg, rule->name, + frame->pc - 1, stackptr); #endif float value; @@ -1620,7 +1695,7 @@ static void par_shapes__weld_points(par_shapes_mesh* mesh, int gridsize, PAR_SHAPES_T binvalue = *(bins + binindex); if (binvalue > 0) { if (nbins == 8) { - //printf("Epsilon value is too large.\n"); + printf("Epsilon value is too large.\n"); break; } nearby[nbins++] = binindex; @@ -1632,8 +1707,9 @@ static void par_shapes__weld_points(par_shapes_mesh* mesh, int gridsize, // Check for colocated points in each nearby bin. for (int b = 0; b < nbins; b++) { int binindex = nearby[b]; - PAR_SHAPES_T binvalue = *(bins + binindex); + PAR_SHAPES_T binvalue = bins[binindex]; PAR_SHAPES_T nindex = binvalue - 1; + assert(nindex < mesh->npoints); while (true) { // If this isn't "self" and it's colocated, then weld it! @@ -1699,6 +1775,9 @@ static void par_shapes__weld_points(par_shapes_mesh* mesh, int gridsize, PAR_SHAPES_T b = weldmap[tsrc[1]]; PAR_SHAPES_T c = weldmap[tsrc[2]]; if (a != b && a != c && b != c) { + assert(a < mesh->npoints); + assert(b < mesh->npoints); + assert(c < mesh->npoints); *tdst++ = a; *tdst++ = b; *tdst++ = c; @@ -2049,3 +2128,25 @@ void par_shapes_remove_degenerate(par_shapes_mesh* mesh, float mintriarea) #endif // PAR_SHAPES_IMPLEMENTATION #endif // PAR_SHAPES_H + +// par_shapes is distributed under the MIT license: +// +// Copyright (c) 2019 Philip Rideout +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. diff --git a/src/models.c b/src/models.c index bce9c8d82..2b6f9a589 100644 --- a/src/models.c +++ b/src/models.c @@ -2084,6 +2084,61 @@ Mesh GenMeshCylinder(float radius, float height, int slices) return mesh; } +// Generate cone/pyramid mesh +Mesh GenMeshCone(float radius, float height, int slices) +{ + Mesh mesh = { 0 }; + + if (slices >= 3) + { + // Instance a cone that sits on the Z=0 plane using the given tessellation + // levels across the UV domain. Think of "slices" like a number of pizza + // slices, and "stacks" like a number of stacked rings. + // Height and radius are both 1.0, but they can easily be changed with par_shapes_scale + par_shapes_mesh *cone = par_shapes_create_cone(slices, 8); + par_shapes_scale(cone, radius, radius, height); + par_shapes_rotate(cone, -PI/2.0f, (float[]){ 1, 0, 0 }); + par_shapes_rotate(cone, PI/2.0f, (float[]){ 0, 1, 0 }); + + // Generate an orientable disk shape (bottom cap) + par_shapes_mesh *capBottom = par_shapes_create_disk(radius, slices, (float[]){ 0, 0, 0 }, (float[]){ 0, 0, -1 }); + capBottom->tcoords = PAR_MALLOC(float, 2*capBottom->npoints); + for (int i = 0; i < 2*capBottom->npoints; i++) capBottom->tcoords[i] = 0.95f; + par_shapes_rotate(capBottom, PI/2.0f, (float[]){ 1, 0, 0 }); + + par_shapes_merge_and_free(cone, capBottom); + + mesh.vertices = (float *)RL_MALLOC(cone->ntriangles*3*3*sizeof(float)); + mesh.texcoords = (float *)RL_MALLOC(cone->ntriangles*3*2*sizeof(float)); + mesh.normals = (float *)RL_MALLOC(cone->ntriangles*3*3*sizeof(float)); + + mesh.vertexCount = cone->ntriangles*3; + mesh.triangleCount = cone->ntriangles; + + for (int k = 0; k < mesh.vertexCount; k++) + { + mesh.vertices[k*3] = cone->points[cone->triangles[k]*3]; + mesh.vertices[k*3 + 1] = cone->points[cone->triangles[k]*3 + 1]; + mesh.vertices[k*3 + 2] = cone->points[cone->triangles[k]*3 + 2]; + + mesh.normals[k*3] = cone->normals[cone->triangles[k]*3]; + mesh.normals[k*3 + 1] = cone->normals[cone->triangles[k]*3 + 1]; + mesh.normals[k*3 + 2] = cone->normals[cone->triangles[k]*3 + 2]; + + mesh.texcoords[k*2] = cone->tcoords[cone->triangles[k]*2]; + mesh.texcoords[k*2 + 1] = cone->tcoords[cone->triangles[k]*2 + 1]; + } + + par_shapes_free_mesh(cone); + + // Upload vertex data to GPU (static mesh) + UploadMesh(&mesh, false); + } + else TRACELOG(LOG_WARNING, "MESH: Failed to generate mesh: cone"); + + return mesh; +} + // Generate torus mesh Mesh GenMeshTorus(float radius, float size, int radSeg, int sides) { diff --git a/src/raylib.h b/src/raylib.h index 781c14202..92e592e90 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1428,6 +1428,7 @@ RLAPI Mesh GenMeshCube(float width, float height, float length); RLAPI Mesh GenMeshSphere(float radius, int rings, int slices); // Generate sphere mesh (standard sphere) RLAPI Mesh GenMeshHemiSphere(float radius, int rings, int slices); // Generate half-sphere mesh (no bottom cap) RLAPI Mesh GenMeshCylinder(float radius, float height, int slices); // Generate cylinder mesh +RLAPI Mesh GenMeshCone(float radius, float height, int slices); // Generate cone/pyramid mesh RLAPI Mesh GenMeshTorus(float radius, float size, int radSeg, int sides); // Generate torus mesh RLAPI Mesh GenMeshKnot(float radius, float size, int radSeg, int sides); // Generate trefoil knot mesh RLAPI Mesh GenMeshHeightmap(Image heightmap, Vector3 size); // Generate heightmap mesh from image data From ee72497eef324aaac0abede3bfe6a89b0e1d8fb7 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 8 Aug 2021 13:02:51 +0200 Subject: [PATCH 027/570] REVIEWED: Some warnings... --- src/models.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/models.c b/src/models.c index 2b6f9a589..68785347e 100644 --- a/src/models.c +++ b/src/models.c @@ -79,6 +79,7 @@ #define PAR_SHAPES_IMPLEMENTATION #include "external/par_shapes.h" // Shapes 3d parametric generation + #undef bool #endif #if defined(_WIN32) @@ -3178,11 +3179,10 @@ RayCollision GetRayCollisionBox(Ray ray, BoundingBox box) collision.normal = Vector3Scale(collision.normal, 2.01f); collision.normal = Vector3Divide(collision.normal, Vector3Subtract(box.max, box.min)); // The relevant elemets of the vector are now slightly larger than 1.0f (or smaller than -1.0f) - // and the others are somewhere between -1.0 and 1.0 - // casting to int is exactly our wanted normal! - collision.normal.x = (int)collision.normal.x; - collision.normal.y = (int)collision.normal.y; - collision.normal.z = (int)collision.normal.z; + // and the others are somewhere between -1.0 and 1.0 casting to int is exactly our wanted normal! + collision.normal.x = (float)((int)collision.normal.x); + collision.normal.y = (float)((int)collision.normal.y); + collision.normal.z = (float)((int)collision.normal.z); collision.normal = Vector3Normalize(collision.normal); @@ -4992,7 +4992,7 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo { output->framePoses[frame] = RL_MALLOC(output->boneCount*sizeof(Transform)); - for (unsigned int i = 0; i < output->boneCount; i++) + for (int i = 0; i < output->boneCount; i++) { if (data->nodes[i].has_translation) memcpy(&output->framePoses[frame][i].translation, data->nodes[i].translation, 3*sizeof(float)); else output->framePoses[frame][i].translation = Vector3Zero(); @@ -5185,7 +5185,7 @@ void LoadGLTFMesh(cgltf_data* data, cgltf_mesh* mesh, Model* outModel, Matrix cu outModel->meshes[(*primitiveIndex)].vertices = ReadGLTFValuesAs(acc, cgltf_component_type_r_32f, false); // Transform using the nodes matrix attributes - for (unsigned int v = 0; v < outModel->meshes[(*primitiveIndex)].vertexCount; v++) + for (int v = 0; v < outModel->meshes[(*primitiveIndex)].vertexCount; v++) { Vector3 vertex = { outModel->meshes[(*primitiveIndex)].vertices[(v*3 + 0)], @@ -5211,7 +5211,7 @@ void LoadGLTFMesh(cgltf_data* data, cgltf_mesh* mesh, Model* outModel, Matrix cu outModel->meshes[(*primitiveIndex)].normals = ReadGLTFValuesAs(acc, cgltf_component_type_r_32f, false); // Transform using the nodes matrix attributes - for (unsigned int v = 0; v < outModel->meshes[(*primitiveIndex)].vertexCount; v++) + for (int v = 0; v < outModel->meshes[(*primitiveIndex)].vertexCount; v++) { Vector3 normal = { outModel->meshes[(*primitiveIndex)].normals[(v*3 + 0)], From a135d9c25d668640c43bbaffa54903b2c55f80f4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 8 Aug 2021 13:23:04 +0200 Subject: [PATCH 028/570] REVIEWED: Avoid conflict with bool --- src/external/par_shapes.h | 3 +++ src/models.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/external/par_shapes.h b/src/external/par_shapes.h index f44987a30..994a605a9 100644 --- a/src/external/par_shapes.h +++ b/src/external/par_shapes.h @@ -31,6 +31,8 @@ extern "C" { #endif #include +// Ray (@raysan5): Commented to avoid conflict with raylib bool +/* #if !defined(_MSC_VER) # include #else // MSVC @@ -42,6 +44,7 @@ extern "C" { # define false 0 # endif #endif +*/ #ifndef PAR_SHAPES_T #define PAR_SHAPES_T uint16_t diff --git a/src/models.c b/src/models.c index 68785347e..329d8d4a8 100644 --- a/src/models.c +++ b/src/models.c @@ -79,7 +79,6 @@ #define PAR_SHAPES_IMPLEMENTATION #include "external/par_shapes.h" // Shapes 3d parametric generation - #undef bool #endif #if defined(_WIN32) From 311fe8f35b8dbe79af162b10ea980824b92115b4 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 8 Aug 2021 21:09:11 +0200 Subject: [PATCH 029/570] Replaced TABS by spaces --- src/raymath.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raymath.h b/src/raymath.h index 2eb7bbd0d..0909eb7e5 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -138,11 +138,11 @@ typedef struct Matrix { // NOTE: Helper types to be used instead of array return types for *ToFloat functions typedef struct float3 { - float v[3]; + float v[3]; } float3; typedef struct float16 { - float v[16]; + float v[16]; } float16; #include // Required for: sinf(), cosf(), tan(), atan2f(), sqrtf(), fminf(), fmaxf(), fabs() From e3f0a11053beae4c21249e814b2714a717f9bdb2 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 10 Aug 2021 17:48:31 +0200 Subject: [PATCH 030/570] Update CHANGELOG --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c37aa3162..54bf0db61 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,17 @@ changelog Current Release: raylib 3.7.0 (26 April 2021) +------------------------------------------------------------------------- +Release: raylib 4.0 (November? 2021) +------------------------------------------------------------------------- +KEY CHANGES: + - + - + - + +Detailed changes: + + ------------------------------------------------------------------------- Release: raylib 3.7 (26 April 2021) ------------------------------------------------------------------------- From ef9fdd0fa5dcfbf4c3c538b56d285230e8d6af1e Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Tue, 10 Aug 2021 12:38:32 -0400 Subject: [PATCH 031/570] Document Get{Key,Char}Pressed return value. (#1909) I think it is useful to know what the empty behavior is in cases where you are enumerating key presses (e.g. implementing "press any key to continue"). --- src/raylib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 92e592e90..f02f46f66 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1077,8 +1077,8 @@ RLAPI bool IsKeyDown(int key); // Check if a key RLAPI bool IsKeyReleased(int key); // Check if a key has been released once RLAPI bool IsKeyUp(int key); // Check if a key is NOT being pressed RLAPI void SetExitKey(int key); // Set a custom key to exit program (default is ESC) -RLAPI int GetKeyPressed(void); // Get key pressed (keycode), call it multiple times for keys queued -RLAPI int GetCharPressed(void); // Get char pressed (unicode), call it multiple times for chars queued +RLAPI int GetKeyPressed(void); // Get key pressed (keycode), call it multiple times for keys queued. Returns 0 when the queue is empty. +RLAPI int GetCharPressed(void); // Get char pressed (unicode), call it multiple times for chars queued. Returns 0 when the queue is empty. // Input-related functions: gamepads RLAPI bool IsGamepadAvailable(int gamepad); // Check if a gamepad is available From 0ba49cce45405a688f7e7893e203f7d3f0bc780c Mon Sep 17 00:00:00 2001 From: Tommi Sinivuo <600815+TommiSinivuo@users.noreply.github.com> Date: Wed, 11 Aug 2021 12:56:05 +0300 Subject: [PATCH 032/570] Add *.so.* to .gitignore to ignore build artifacts (#1912) When building a shared Raylib library on Linux, the build process produces 3 files: libraylib.so (symlink), libraylib.so.381 (symlink) and libraylib.so.3.8.1 (the library). Only the first one of these (.so) is currently ignored by Git. Adding *.so.* to .gitinore makes Git ignore the rest of them as well. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 00c9bdcec..dcfa5bce2 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ packages/ *.a *.bc *.so +*.so.* # Ignore wasm data in examples/ examples/**/*.wasm From 5a259fa10ffb1ad44528d2678d3781cddd0bb1c0 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 11 Aug 2021 18:31:32 +0200 Subject: [PATCH 033/570] WARNING: REMOVED: DrawTextRec() and DrawTextRecEx() - DrawTextRec() and DrawTextRecEx() have been moved to example, those functions could be very specific depending on user needs so it's better to give the user the full source in case of special requirements instead of allowing a function with +10 input parameters. --- examples/text/text_rectangle_bounds.c | 144 +++++++++++++++++++++++++ examples/text/text_unicode.c | 146 ++++++++++++++++++++++++++ src/raylib.h | 3 - src/text.c | 133 ----------------------- 4 files changed, 290 insertions(+), 136 deletions(-) diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index 9754cd456..c763fb2ec 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -13,6 +13,10 @@ #include "raylib.h" +static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits +static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection + +// Main entry point int main(void) { // Initialization @@ -119,4 +123,144 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris //-------------------------------------------------------------------------------------- return 0; +} + +//-------------------------------------------------------------------------------------- +// Module functions definition +//-------------------------------------------------------------------------------------- + +// Draw text using font inside rectangle limits +static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) +{ + DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); +} + +// Draw text using font inside rectangle limits with support for text selection +static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) +{ + int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop + + float textOffsetY = 0; // Offset between lines (on line break '\n') + float textOffsetX = 0.0f; // Offset X to next character to draw + + float scaleFactor = fontSize/(float)font.baseSize; // Character rectangle scaling factor + + // Word/character wrapping mechanism variables + enum { MEASURE_STATE = 0, DRAW_STATE = 1 }; + int state = wordWrap? MEASURE_STATE : DRAW_STATE; + + int startLine = -1; // Index where to begin drawing (where a line begins) + int endLine = -1; // Index where to stop drawing (where a line ends) + int lastk = -1; // Holds last value of the character position + + for (int i = 0, k = 0; i < length; i++, k++) + { + // Get next codepoint from byte string and glyph index in font + int codepointByteCount = 0; + int codepoint = GetCodepoint(&text[i], &codepointByteCount); + int index = GetGlyphIndex(font, codepoint); + + // NOTE: Normally we exit the decoding sequence as soon as a bad byte is found (and return 0x3f) + // but we need to draw all of the bad bytes using the '?' symbol moving one byte + if (codepoint == 0x3f) codepointByteCount = 1; + i += (codepointByteCount - 1); + + float glyphWidth = 0; + if (codepoint != '\n') + { + glyphWidth = (font.chars[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.chars[index].advanceX*scaleFactor; + + if (i + 1 < length) glyphWidth = glyphWidth + spacing; + } + + // NOTE: When wordWrap is ON we first measure how much of the text we can draw before going outside of the rec container + // We store this info in startLine and endLine, then we change states, draw the text between those two variables + // and change states again and again recursively until the end of the text (or until we get outside of the container). + // When wordWrap is OFF we don't need the measure state so we go to the drawing state immediately + // and begin drawing on the next line before we can get outside the container. + if (state == MEASURE_STATE) + { + // TODO: There are multiple types of spaces in UNICODE, maybe it's a good idea to add support for more + // Ref: http://jkorpela.fi/chars/spaces.html + if ((codepoint == ' ') || (codepoint == '\t') || (codepoint == '\n')) endLine = i; + + if ((textOffsetX + glyphWidth) > rec.width) + { + endLine = (endLine < 1)? i : endLine; + if (i == endLine) endLine -= codepointByteCount; + if ((startLine + codepointByteCount) == endLine) endLine = (i - codepointByteCount); + + state = !state; + } + else if ((i + 1) == length) + { + endLine = i; + state = !state; + } + else if (codepoint == '\n') state = !state; + + if (state == DRAW_STATE) + { + textOffsetX = 0; + i = startLine; + glyphWidth = 0; + + // Save character position when we switch states + int tmp = lastk; + lastk = k - 1; + k = tmp; + } + } + else + { + if (codepoint == '\n') + { + if (!wordWrap) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + } + } + else + { + if (!wordWrap && ((textOffsetX + glyphWidth) > rec.width)) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + } + + // When text overflows rectangle height limit, just stop drawing + if ((textOffsetY + font.baseSize*scaleFactor) > rec.height) break; + + // Draw selection background + bool isGlyphSelected = false; + if ((selectStart >= 0) && (k >= selectStart) && (k < (selectStart + selectLength))) + { + DrawRectangleRec((Rectangle){ rec.x + textOffsetX - 1, rec.y + textOffsetY, glyphWidth, (float)font.baseSize*scaleFactor }, selectBackTint); + isGlyphSelected = true; + } + + // Draw current character glyph + if ((codepoint != ' ') && (codepoint != '\t')) + { + DrawTextCodepoint(font, codepoint, (Vector2){ rec.x + textOffsetX, rec.y + textOffsetY }, fontSize, isGlyphSelected? selectTint : tint); + } + } + + if (wordWrap && (i == endLine)) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + startLine = endLine; + endLine = -1; + glyphWidth = 0; + selectStart += lastk - k; + k = lastk; + + state = !state; + } + } + + textOffsetX += glyphWidth; + } } \ No newline at end of file diff --git a/examples/text/text_unicode.c b/examples/text/text_unicode.c index fa336de7f..2954a28e1 100644 --- a/examples/text/text_unicode.c +++ b/examples/text/text_unicode.c @@ -133,6 +133,9 @@ struct { //-------------------------------------------------------------------------------------- static void RandomizeEmoji(void); // Fills the emoji array with random emojis +static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits +static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection + //-------------------------------------------------------------------------------------- // Global variables //-------------------------------------------------------------------------------------- @@ -145,6 +148,9 @@ struct { static int hovered = -1, selected = -1; +//-------------------------------------------------------------------------------------- +// Main entry point +//-------------------------------------------------------------------------------------- int main(int argc, char **argv) { // Initialization @@ -317,3 +323,143 @@ static void RandomizeEmoji(void) emoji[i].message = GetRandomValue(0, SIZEOF(messages) - 1); } } + +//-------------------------------------------------------------------------------------- +// Module functions definition +//-------------------------------------------------------------------------------------- + +// Draw text using font inside rectangle limits +static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) +{ + DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); +} + +// Draw text using font inside rectangle limits with support for text selection +static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) +{ + int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop + + float textOffsetY = 0; // Offset between lines (on line break '\n') + float textOffsetX = 0.0f; // Offset X to next character to draw + + float scaleFactor = fontSize/(float)font.baseSize; // Character rectangle scaling factor + + // Word/character wrapping mechanism variables + enum { MEASURE_STATE = 0, DRAW_STATE = 1 }; + int state = wordWrap? MEASURE_STATE : DRAW_STATE; + + int startLine = -1; // Index where to begin drawing (where a line begins) + int endLine = -1; // Index where to stop drawing (where a line ends) + int lastk = -1; // Holds last value of the character position + + for (int i = 0, k = 0; i < length; i++, k++) + { + // Get next codepoint from byte string and glyph index in font + int codepointByteCount = 0; + int codepoint = GetCodepoint(&text[i], &codepointByteCount); + int index = GetGlyphIndex(font, codepoint); + + // NOTE: Normally we exit the decoding sequence as soon as a bad byte is found (and return 0x3f) + // but we need to draw all of the bad bytes using the '?' symbol moving one byte + if (codepoint == 0x3f) codepointByteCount = 1; + i += (codepointByteCount - 1); + + float glyphWidth = 0; + if (codepoint != '\n') + { + glyphWidth = (font.chars[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.chars[index].advanceX*scaleFactor; + + if (i + 1 < length) glyphWidth = glyphWidth + spacing; + } + + // NOTE: When wordWrap is ON we first measure how much of the text we can draw before going outside of the rec container + // We store this info in startLine and endLine, then we change states, draw the text between those two variables + // and change states again and again recursively until the end of the text (or until we get outside of the container). + // When wordWrap is OFF we don't need the measure state so we go to the drawing state immediately + // and begin drawing on the next line before we can get outside the container. + if (state == MEASURE_STATE) + { + // TODO: There are multiple types of spaces in UNICODE, maybe it's a good idea to add support for more + // Ref: http://jkorpela.fi/chars/spaces.html + if ((codepoint == ' ') || (codepoint == '\t') || (codepoint == '\n')) endLine = i; + + if ((textOffsetX + glyphWidth) > rec.width) + { + endLine = (endLine < 1)? i : endLine; + if (i == endLine) endLine -= codepointByteCount; + if ((startLine + codepointByteCount) == endLine) endLine = (i - codepointByteCount); + + state = !state; + } + else if ((i + 1) == length) + { + endLine = i; + state = !state; + } + else if (codepoint == '\n') state = !state; + + if (state == DRAW_STATE) + { + textOffsetX = 0; + i = startLine; + glyphWidth = 0; + + // Save character position when we switch states + int tmp = lastk; + lastk = k - 1; + k = tmp; + } + } + else + { + if (codepoint == '\n') + { + if (!wordWrap) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + } + } + else + { + if (!wordWrap && ((textOffsetX + glyphWidth) > rec.width)) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + } + + // When text overflows rectangle height limit, just stop drawing + if ((textOffsetY + font.baseSize*scaleFactor) > rec.height) break; + + // Draw selection background + bool isGlyphSelected = false; + if ((selectStart >= 0) && (k >= selectStart) && (k < (selectStart + selectLength))) + { + DrawRectangleRec((Rectangle){ rec.x + textOffsetX - 1, rec.y + textOffsetY, glyphWidth, (float)font.baseSize*scaleFactor }, selectBackTint); + isGlyphSelected = true; + } + + // Draw current character glyph + if ((codepoint != ' ') && (codepoint != '\t')) + { + DrawTextCodepoint(font, codepoint, (Vector2){ rec.x + textOffsetX, rec.y + textOffsetY }, fontSize, isGlyphSelected? selectTint : tint); + } + } + + if (wordWrap && (i == endLine)) + { + textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; + textOffsetX = 0; + startLine = endLine; + endLine = -1; + glyphWidth = 0; + selectStart += lastk - k; + k = lastk; + + state = !state; + } + } + + textOffsetX += glyphWidth; + } +} \ No newline at end of file diff --git a/src/raylib.h b/src/raylib.h index f02f46f66..fc64858ea 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1329,9 +1329,6 @@ RLAPI void UnloadFont(Font font); RLAPI void DrawFPS(int posX, int posY); // Draw current FPS RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters -//RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); -RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits -RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) // Text misc. functions diff --git a/src/text.c b/src/text.c index 0371a0cec..f12518f46 100644 --- a/src/text.c +++ b/src/text.c @@ -890,140 +890,7 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f } } -// Draw text using font inside rectangle limits -void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) { - DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); -} - -// Draw text using font inside rectangle limits with support for text selection -void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) -{ - int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop - - float textOffsetY = 0; // Offset between lines (on line break '\n') - float textOffsetX = 0.0f; // Offset X to next character to draw - - float scaleFactor = fontSize/(float)font.baseSize; // Character quad scaling factor - - // Word/character wrapping mechanism variables - enum { MEASURE_STATE = 0, DRAW_STATE = 1 }; - int state = wordWrap? MEASURE_STATE : DRAW_STATE; - - int startLine = -1; // Index where to begin drawing (where a line begins) - int endLine = -1; // Index where to stop drawing (where a line ends) - int lastk = -1; // Holds last value of the character position - - for (int i = 0, k = 0; i < length; i++, k++) - { - // Get next codepoint from byte string and glyph index in font - int codepointByteCount = 0; - int codepoint = GetCodepoint(&text[i], &codepointByteCount); - int index = GetGlyphIndex(font, codepoint); - - // NOTE: Normally we exit the decoding sequence as soon as a bad byte is found (and return 0x3f) - // but we need to draw all of the bad bytes using the '?' symbol moving one byte - if (codepoint == 0x3f) codepointByteCount = 1; - i += (codepointByteCount - 1); - - float glyphWidth = 0; - if (codepoint != '\n') - { - glyphWidth = (font.chars[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.chars[index].advanceX*scaleFactor; - - if (i + 1 < length) glyphWidth = glyphWidth + spacing; - } - - // NOTE: When wordWrap is ON we first measure how much of the text we can draw before going outside of the rec container - // We store this info in startLine and endLine, then we change states, draw the text between those two variables - // and change states again and again recursively until the end of the text (or until we get outside of the container). - // When wordWrap is OFF we don't need the measure state so we go to the drawing state immediately - // and begin drawing on the next line before we can get outside the container. - if (state == MEASURE_STATE) - { - // TODO: There are multiple types of spaces in UNICODE, maybe it's a good idea to add support for more - // Ref: http://jkorpela.fi/chars/spaces.html - if ((codepoint == ' ') || (codepoint == '\t') || (codepoint == '\n')) endLine = i; - - if ((textOffsetX + glyphWidth) > rec.width) - { - endLine = (endLine < 1)? i : endLine; - if (i == endLine) endLine -= codepointByteCount; - if ((startLine + codepointByteCount) == endLine) endLine = (i - codepointByteCount); - - state = !state; - } - else if ((i + 1) == length) - { - endLine = i; - state = !state; - } - else if (codepoint == '\n') state = !state; - - if (state == DRAW_STATE) - { - textOffsetX = 0; - i = startLine; - glyphWidth = 0; - - // Save character position when we switch states - int tmp = lastk; - lastk = k - 1; - k = tmp; - } - } - else - { - if (codepoint == '\n') - { - if (!wordWrap) - { - textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; - textOffsetX = 0; - } - } - else - { - if (!wordWrap && ((textOffsetX + glyphWidth) > rec.width)) - { - textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; - textOffsetX = 0; - } - - // When text overflows rectangle height limit, just stop drawing - if ((textOffsetY + font.baseSize*scaleFactor) > rec.height) break; - - // Draw selection background - bool isGlyphSelected = false; - if ((selectStart >= 0) && (k >= selectStart) && (k < (selectStart + selectLength))) - { - DrawRectangleRec((Rectangle){ rec.x + textOffsetX - 1, rec.y + textOffsetY, glyphWidth, (float)font.baseSize*scaleFactor }, selectBackTint); - isGlyphSelected = true; - } - - // Draw current character glyph - if ((codepoint != ' ') && (codepoint != '\t')) - { - DrawTextCodepoint(font, codepoint, (Vector2){ rec.x + textOffsetX, rec.y + textOffsetY }, fontSize, isGlyphSelected? selectTint : tint); - } - } - - if (wordWrap && (i == endLine)) - { - textOffsetY += (font.baseSize + font.baseSize/2)*scaleFactor; - textOffsetX = 0; - startLine = endLine; - endLine = -1; - glyphWidth = 0; - selectStart += lastk - k; - k = lastk; - - state = !state; - } - } - - textOffsetX += glyphWidth; - } } // Draw one character (codepoint) From b55418effd288d9989b86d34831c8d60a5c6c7a7 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 11 Aug 2021 18:31:56 +0200 Subject: [PATCH 034/570] ADDED: DrawTextPro() with text rotation support --- src/raylib.h | 3 ++- src/text.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index fc64858ea..438a079dc 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1328,7 +1328,8 @@ RLAPI void UnloadFont(Font font); // Text drawing functions RLAPI void DrawFPS(int posX, int posY); // Draw current FPS RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) -RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters +RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters +RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); // Draw text using Font and pro parameters (rotation) RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) // Text misc. functions diff --git a/src/text.c b/src/text.c index f12518f46..d8c3a6b7f 100644 --- a/src/text.c +++ b/src/text.c @@ -890,7 +890,17 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f } } +// Draw text using Font and pro parameters (rotation) +void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint) { + rlPushMatrix(); + + rlTranslatef(origin.x, origin.y, 0.0f); + rlRotatef(rotation, 0.0f, 0.0f, 1.0f); + + DrawTextEx(font, text, position, fontSize, spacing, tint); + + rlPopMatrix(); } // Draw one character (codepoint) From 7e27c2ffa82337c6b4649295b4df1c7e1829c7fc Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 11 Aug 2021 18:53:06 +0200 Subject: [PATCH 035/570] TODO: DrawTextPro() rotation not working? --- src/text.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/text.c b/src/text.c index d8c3a6b7f..891c5497c 100644 --- a/src/text.c +++ b/src/text.c @@ -893,12 +893,15 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f // Draw text using Font and pro parameters (rotation) void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint) { + // TODO: Not working... why??? + rlPushMatrix(); - rlTranslatef(origin.x, origin.y, 0.0f); + //rlTranslatef(position.x, position.y, 0.0f); rlRotatef(rotation, 0.0f, 0.0f, 1.0f); + rlTranslatef(-origin.x, -origin.y, 0.0f); - DrawTextEx(font, text, position, fontSize, spacing, tint); + DrawTextEx(font, text, (Vector2){ position.x, position.y }, fontSize, spacing, tint); rlPopMatrix(); } From b6541b7a558304f8a6e27533195c898ea728b712 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 11 Aug 2021 19:02:15 +0200 Subject: [PATCH 036/570] REVIEWED: DrawTextPro() WARNING: DrawTextPro() requires including `rlgl.h`, before it was only dependant on `textures` module. --- src/text.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/text.c b/src/text.c index 891c5497c..1724153f9 100644 --- a/src/text.c +++ b/src/text.c @@ -53,6 +53,8 @@ #include "config.h" // Defines module configuration flags #endif +#include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 -> Only DrawTextPro() + #include // Required for: malloc(), free() #include // Required for: vsprintf() #include // Required for: strcmp(), strstr(), strcpy(), strncpy() [Used in TextReplace()], sscanf() [Used in LoadBMFont()] @@ -893,15 +895,13 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f // Draw text using Font and pro parameters (rotation) void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint) { - // TODO: Not working... why??? - rlPushMatrix(); - //rlTranslatef(position.x, position.y, 0.0f); + rlTranslatef(position.x, position.y, 0.0f); rlRotatef(rotation, 0.0f, 0.0f, 1.0f); rlTranslatef(-origin.x, -origin.y, 0.0f); - DrawTextEx(font, text, (Vector2){ position.x, position.y }, fontSize, spacing, tint); + DrawTextEx(font, text, (Vector2){ 0.0f, 0.0f }, fontSize, spacing, tint); rlPopMatrix(); } From 621a8766a812e508037e580c4e5d8419d12977be Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 11 Aug 2021 21:16:39 +0200 Subject: [PATCH 037/570] WARNING: BREAKING: Renamed `CharInfo` to `GlyphInfo` and more... This commit introduces some breaking changes for library consistency, hopefully not too dramatic... Here the full list: - RENAMED: struct `CharInfo` to `GlyphInfo`, actually that's the correct naming for the data contained. It contains the character glyph metrics and the glyph image; in the past it also contained rectangle within the font atlas but that data has been moved to `Font` struct directly, so, `GlyphInfo` is a more correct name. - RENAMED: `CodepointToUtf8()` to `CodepointToUTF8()`, capitalization of UTF-8 is the correct form, it would also require de hyphen but it can be omitted in this case. - RENAMED: `TextToUtf8()` to `TextCodepointsToUTF8` for consistency and more detail on the functionality. - ADDED: `GetGlyphInfo()` to get glyph info for a specific codepoint - ADDED: `GetGlyphAtlasRec()` to get glyph rectangle within the generated font atlas - Some additional tweaks for consistency --- src/raylib.h | 52 ++++++++++++++++++++-------------------- src/text.c | 67 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 72 insertions(+), 47 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 438a079dc..7f8728137 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -282,23 +282,23 @@ typedef struct NPatchInfo { int layout; // Layout of the n-patch: 3x3, 1x3 or 3x1 } NPatchInfo; -// CharInfo, font character info -typedef struct CharInfo { +// GlyphInfo, font characters glyphs info +typedef struct GlyphInfo { int value; // Character value (Unicode) int offsetX; // Character offset X when drawing int offsetY; // Character offset Y when drawing int advanceX; // Character advance position X Image image; // Character image data -} CharInfo; +} GlyphInfo; -// Font, font texture and CharInfo array data +// Font, font texture and GlyphInfo array data typedef struct Font { int baseSize; // Base size (default chars height) int charsCount; // Number of characters int charsPadding; // Padding around the chars Texture2D texture; // Characters texture atlas Rectangle *recs; // Characters rectangles in texture - CharInfo *chars; // Characters info data + GlyphInfo *chars; // Characters glyphs info data } Font; // Camera, defines position/orientation in 3d space @@ -1077,8 +1077,8 @@ RLAPI bool IsKeyDown(int key); // Check if a key RLAPI bool IsKeyReleased(int key); // Check if a key has been released once RLAPI bool IsKeyUp(int key); // Check if a key is NOT being pressed RLAPI void SetExitKey(int key); // Set a custom key to exit program (default is ESC) -RLAPI int GetKeyPressed(void); // Get key pressed (keycode), call it multiple times for keys queued. Returns 0 when the queue is empty. -RLAPI int GetCharPressed(void); // Get char pressed (unicode), call it multiple times for chars queued. Returns 0 when the queue is empty. +RLAPI int GetKeyPressed(void); // Get key pressed (keycode), call it multiple times for keys queued, returns 0 when the queue is empty +RLAPI int GetCharPressed(void); // Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty // Input-related functions: gamepads RLAPI bool IsGamepadAvailable(int gamepad); // Check if a gamepad is available @@ -1217,7 +1217,7 @@ RLAPI Image GenImageGradientRadial(int width, int height, float density, Color i RLAPI Image GenImageChecked(int width, int height, int checksX, int checksY, Color col1, Color col2); // Generate image: checked RLAPI Image GenImageWhiteNoise(int width, int height, float factor); // Generate image: white noise RLAPI Image GenImagePerlinNoise(int width, int height, int offsetX, int offsetY, float scale); // Generate image: perlin noise -RLAPI Image GenImageCellular(int width, int height, int tileSize); // Generate image: cellular algorithm. Bigger tileSize means bigger cells +RLAPI Image GenImageCellular(int width, int height, int tileSize); // Generate image: cellular algorithm, bigger tileSize means bigger cells // Image manipulation functions RLAPI Image ImageCopy(Image image); // Create an image duplicate (useful for transformations) @@ -1320,9 +1320,9 @@ RLAPI Font LoadFont(const char *fileName); RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount); // Load font from file with extended parameters RLAPI Font LoadFontFromImage(Image image, Color key, int firstChar); // Load font from Image (XNA style) RLAPI Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount); // Load font from memory buffer, fileType refers to extension: i.e. '.ttf' -RLAPI CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use -RLAPI Image GenImageFontAtlas(const CharInfo *chars, Rectangle **recs, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info -RLAPI void UnloadFontData(CharInfo *chars, int charsCount); // Unload font chars info data (RAM) +RLAPI GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use +RLAPI Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **recs, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info +RLAPI void UnloadFontData(GlyphInfo *chars, int charsCount); // Unload font chars info data (RAM) RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM) // Text drawing functions @@ -1332,20 +1332,30 @@ RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontS RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); // Draw text using Font and pro parameters (rotation) RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) -// Text misc. functions +// Text font info functions RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // Measure string size for Font -RLAPI int GetGlyphIndex(Font font, int codepoint); // Get index position for a unicode character on font +RLAPI int GetGlyphIndex(Font font, int codepoint); // Get glyph index position in font for a codepoint (unicode character), fallback to '?' if not found +RLAPI GlyphInfo GetGlyphInfo(Font font, int codepoint); // Get glyph font info data for a codepoint (unicode character), fallback to '?' if not found +RLAPI Rectangle GetGlyphAtlasRec(Font font, int codepoint); // Get glyph rectangle in font atlas for a codepoint (unicode character), fallback to '?' if not found -// Text strings management functions (no utf8 strings, only byte chars) +// Text codepoints management functions (unicode characters) +RLAPI int *LoadCodepoints(const char *text, int *count); // Load all codepoints from a UTF-8 text string, codepoints count returned by parameter +RLAPI void UnloadCodepoints(int *codepoints); // Unload codepoints data from memory +RLAPI int GetCodepointsCount(const char *text); // Get total number of codepoints in a UTF-8 encoded string +RLAPI int GetCodepoint(const char *text, int *bytesProcessed); // Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure +RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength); // Encode one codepoint into UTF-8 byte array (array length returned as parameter) +RLAPI char *TextCodepointsToUTF8(int *codepoints, int length); // Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!) + +// Text strings management functions (no UTF-8 strings, only byte chars) // NOTE: Some strings allocate memory internally for returned strings, just be careful! RLAPI int TextCopy(char *dst, const char *src); // Copy one string to another, returns bytes copied RLAPI bool TextIsEqual(const char *text1, const char *text2); // Check if two text string are equal RLAPI unsigned int TextLength(const char *text); // Get text length, checks for '\0' ending -RLAPI const char *TextFormat(const char *text, ...); // Text formatting with variables (sprintf style) +RLAPI const char *TextFormat(const char *text, ...); // Text formatting with variables (sprintf() style) RLAPI const char *TextSubtext(const char *text, int position, int length); // Get a piece of a text string -RLAPI char *TextReplace(char *text, const char *replace, const char *by); // Replace text string (memory must be freed!) -RLAPI char *TextInsert(const char *text, const char *insert, int position); // Insert text in a position (memory must be freed!) +RLAPI char *TextReplace(char *text, const char *replace, const char *by); // Replace text string (WARNING: memory must be freed!) +RLAPI char *TextInsert(const char *text, const char *insert, int position); // Insert text in a position (WARNING: memory must be freed!) RLAPI const char *TextJoin(const char **textList, int count, const char *delimiter); // Join text strings with delimiter RLAPI const char **TextSplit(const char *text, char delimiter, int *count); // Split text into multiple strings RLAPI void TextAppend(char *text, const char *append, int *position); // Append text at specific position and move cursor! @@ -1354,14 +1364,6 @@ RLAPI const char *TextToUpper(const char *text); // Get upp RLAPI const char *TextToLower(const char *text); // Get lower case version of provided string RLAPI const char *TextToPascal(const char *text); // Get Pascal case notation version of provided string RLAPI int TextToInteger(const char *text); // Get integer value from text (negative values not supported) -RLAPI char *TextToUtf8(int *codepoints, int length); // Encode text codepoint into utf8 text (memory must be freed!) - -// UTF8 text strings management functions -RLAPI int *LoadCodepoints(const char *text, int *count); // Load all codepoints from a UTF8 text string, codepoints count returned by parameter -RLAPI void UnloadCodepoints(int *codepoints); // Unload codepoints data from memory -RLAPI int GetCodepointsCount(const char *text); // Get total number of characters (codepoints) in a UTF8 encoded string -RLAPI int GetCodepoint(const char *text, int *bytesProcessed); // Get next codepoint in a UTF8 encoded string, 0x3f('?') is returned on failure -RLAPI const char *CodepointToUtf8(int codepoint, int *byteLength); // Encode codepoint into utf8 text (char array length returned as parameter) //------------------------------------------------------------------------------------ // Basic 3d Shapes Drawing Functions (Module: models) diff --git a/src/text.c b/src/text.c index 1724153f9..9d336f218 100644 --- a/src/text.c +++ b/src/text.c @@ -53,6 +53,7 @@ #include "config.h" // Defines module configuration flags #endif +#include "utils.h" // Required for: LoadFileText() #include "rlgl.h" // OpenGL abstraction layer to OpenGL 1.1, 2.1, 3.3+ or ES2 -> Only DrawTextPro() #include // Required for: malloc(), free() @@ -61,8 +62,6 @@ #include // Required for: va_list, va_start(), vsprintf(), va_end() [Used in TextFormat()] #include // Requried for: toupper(), tolower() [Used in TextToUpper(), TextToLower()] -#include "utils.h" // Required for: LoadFileText() - #if defined(SUPPORT_FILEFORMAT_TTF) #define STB_RECT_PACK_IMPLEMENTATION #include "external/stb_rect_pack.h" // Required for: ttf font rectangles packaging @@ -127,7 +126,7 @@ extern void LoadFontDefault(void) { #define BIT_CHECK(a,b) ((a) & (1u << (b))) - // NOTE: Using UTF8 encoding table for Unicode U+0000..U+00FF Basic Latin + Latin-1 Supplement + // NOTE: Using UTF-8 encoding table for Unicode U+0000..U+00FF Basic Latin + Latin-1 Supplement // Ref: http://www.utf8-chartable.de/unicode-utf8-table.pl defaultFont.charsCount = 224; // Number of chars included in our default font @@ -226,7 +225,7 @@ extern void LoadFontDefault(void) // Allocate space for our characters info data // NOTE: This memory should be freed at end! --> CloseWindow() - defaultFont.chars = (CharInfo *)RL_MALLOC(defaultFont.charsCount*sizeof(CharInfo)); + defaultFont.chars = (GlyphInfo *)RL_MALLOC(defaultFont.charsCount*sizeof(GlyphInfo)); defaultFont.recs = (Rectangle *)RL_MALLOC(defaultFont.charsCount*sizeof(Rectangle)); int currentLine = 0; @@ -455,7 +454,7 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) // We got tempCharValues and tempCharsRecs populated with chars data // Now we move temp data to sized charValues and charRecs arrays - font.chars = (CharInfo *)RL_MALLOC(font.charsCount*sizeof(CharInfo)); + font.chars = (GlyphInfo *)RL_MALLOC(font.charsCount*sizeof(GlyphInfo)); font.recs = (Rectangle *)RL_MALLOC(font.charsCount*sizeof(Rectangle)); for (int i = 0; i < font.charsCount; i++) @@ -525,7 +524,7 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int // Load font data for further use // NOTE: Requires TTF font memory data and can generate SDF data -CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type) +GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type) { // NOTE: Using some SDF generation default values, // trades off precision with ability to handle *smaller* sizes @@ -542,7 +541,7 @@ CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize #define FONT_BITMAP_ALPHA_THRESHOLD 80 // Bitmap (B&W) font generation alpha threshold #endif - CharInfo *chars = NULL; + GlyphInfo *chars = NULL; #if defined(SUPPORT_FILEFORMAT_TTF) // Load font data (including pixel data) from TTF memory file @@ -575,7 +574,7 @@ CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize genFontChars = true; } - chars = (CharInfo *)RL_MALLOC(charsCount*sizeof(CharInfo)); + chars = (GlyphInfo *)RL_MALLOC(charsCount*sizeof(GlyphInfo)); // NOTE: Using simple packaging, one char after another for (int i = 0; i < charsCount; i++) @@ -651,7 +650,7 @@ CharInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize // Generate image font atlas using chars info // NOTE: Packing method: 0-Default, 1-Skyline #if defined(SUPPORT_FILEFORMAT_TTF) -Image GenImageFontAtlas(const CharInfo *chars, Rectangle **charRecs, int charsCount, int fontSize, int padding, int packMethod) +Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsCount, int fontSize, int padding, int packMethod) { Image atlas = { 0 }; @@ -794,7 +793,7 @@ Image GenImageFontAtlas(const CharInfo *chars, Rectangle **charRecs, int charsCo #endif // Unload font chars info data (RAM) -void UnloadFontData(CharInfo *chars, int charsCount) +void UnloadFontData(GlyphInfo *chars, int charsCount) { for (int i = 0; i < charsCount; i++) UnloadImage(chars[i].image); @@ -1003,6 +1002,7 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing } // Get index position for a unicode character on font +// NOTE: If codepoint is not found in the font it fallbacks to '?' int GetGlyphIndex(Font font, int codepoint) { #ifndef GLYPH_NOTFOUND_CHAR_FALLBACK @@ -1029,6 +1029,28 @@ int GetGlyphIndex(Font font, int codepoint) #endif } +// Get glyph font info data for a codepoint (unicode character) +// NOTE: If codepoint is not found in the font it fallbacks to '?' +GlyphInfo GetGlyphInfo(Font font, int codepoint) +{ + GlyphInfo info = { 0 }; + + info = font.chars[GetGlyphIndex(font, codepoint)]; + + return info; +} + +// Get glyph rectangle in font atlas for a codepoint (unicode character) +// NOTE: If codepoint is not found in the font it fallbacks to '?' +Rectangle GetGlyphAtlasRec(Font font, int codepoint) +{ + Rectangle rec = { 0 }; + + rec = font.recs[GetGlyphIndex(font, codepoint)]; + + return rec; +} + //---------------------------------------------------------------------------------- // Text strings management functions //---------------------------------------------------------------------------------- @@ -1326,7 +1348,7 @@ const char *TextToUpper(const char *text) buffer[i] = (char)toupper(text[i]); //if ((text[i] >= 'a') && (text[i] <= 'z')) buffer[i] = text[i] - 32; - // TODO: Support Utf8 diacritics! + // TODO: Support UTF-8 diacritics! //if ((text[i] >= 'à') && (text[i] <= 'ý')) buffer[i] = text[i] - 32; } else { buffer[i] = '\0'; break; } @@ -1379,10 +1401,10 @@ const char *TextToPascal(const char *text) return buffer; } -// Encode text codepoint into utf8 text +// Encode text codepoint into UTF-8 text // REQUIRES: memcpy() // WARNING: Allocated memory should be manually freed -char *TextToUtf8(int *codepoints, int length) +char *TextCodepointsToUTF8(int *codepoints, int length) { // We allocate enough memory fo fit all possible codepoints // NOTE: 5 bytes for every codepoint should be enough @@ -1392,7 +1414,7 @@ char *TextToUtf8(int *codepoints, int length) for (int i = 0, bytes = 0; i < length; i++) { - utf8 = CodepointToUtf8(codepoints[i], &bytes); + utf8 = CodepointToUTF8(codepoints[i], &bytes); memcpy(text + size, utf8, bytes); size += bytes; } @@ -1406,7 +1428,8 @@ char *TextToUtf8(int *codepoints, int length) } // Encode codepoint into utf8 text (char array length returned as parameter) -RLAPI const char *CodepointToUtf8(int codepoint, int *byteLength) +// NOTE: It uses a static array to store UTF-8 bytes +RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength) { static char utf8[6] = { 0 }; int length = 0; @@ -1443,7 +1466,7 @@ RLAPI const char *CodepointToUtf8(int codepoint, int *byteLength) return utf8; } -// Load all codepoints from a UTF8 text string, codepoints count returned by parameter +// Load all codepoints from a UTF-8 text string, codepoints count returned by parameter int *LoadCodepoints(const char *text, int *count) { int textLength = TextLength(text); @@ -1475,8 +1498,8 @@ void UnloadCodepoints(int *codepoints) RL_FREE(codepoints); } -// Get total number of characters(codepoints) in a UTF8 encoded text, until '\0' is found -// NOTE: If an invalid UTF8 sequence is encountered a '?'(0x3f) codepoint is counted instead +// Get total number of characters(codepoints) in a UTF-8 encoded text, until '\0' is found +// NOTE: If an invalid UTF-8 sequence is encountered a '?'(0x3f) codepoint is counted instead int GetCodepointsCount(const char *text) { unsigned int len = 0; @@ -1497,8 +1520,8 @@ int GetCodepointsCount(const char *text) } #endif // SUPPORT_TEXT_MANIPULATION -// Get next codepoint in a UTF8 encoded text, scanning until '\0' is found -// When a invalid UTF8 byte is encountered we exit as soon as possible and a '?'(0x3f) codepoint is returned +// Get next codepoint in a UTF-8 encoded text, scanning until '\0' is found +// When a invalid UTF-8 byte is encountered we exit as soon as possible and a '?'(0x3f) codepoint is returned // Total number of bytes processed are returned as a parameter // NOTE: the standard says U+FFFD should be returned in case of errors // but that character is not supported by the default font in raylib @@ -1506,7 +1529,7 @@ int GetCodepointsCount(const char *text) int GetCodepoint(const char *text, int *bytesProcessed) { /* - UTF8 specs from https://www.ietf.org/rfc/rfc3629.txt + UTF-8 specs from https://www.ietf.org/rfc/rfc3629.txt Char. number range | UTF-8 octet sequence (hexadecimal) | (binary) @@ -1725,7 +1748,7 @@ static Font LoadBMFont(const char *fileName) font.baseSize = fontSize; font.charsCount = charsCount; font.charsPadding = 0; - font.chars = (CharInfo *)RL_MALLOC(charsCount*sizeof(CharInfo)); + font.chars = (GlyphInfo *)RL_MALLOC(charsCount*sizeof(GlyphInfo)); font.recs = (Rectangle *)RL_MALLOC(charsCount*sizeof(Rectangle)); int charId, charX, charY, charWidth, charHeight, charOffsetX, charOffsetY, charAdvanceX; From ce3214b82d95165f18a9273ffa1b106947b1d33b Mon Sep 17 00:00:00 2001 From: 630Studios Date: Thu, 12 Aug 2021 02:47:00 -0500 Subject: [PATCH 038/570] [rlgl] rlUpdateVertexBuffer (#1914) * GenMeshTangents Fix * GenMeshTangents Fix - Comment Update * GenMeshTangents Fix - Comment Update final * Code Style Changes * Code Style Changes Final * Code Style Changes Final 2 * GenMeshTangents better handling for issue #1876 * GenMeshTangents better handling for issue #1876 * GenMeshTangents: Better fix for issue #1876 * vboId location fix * rlUpdateVertexBuffer - bufferId is an unsigned int --- src/rlgl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 76b5114af..b6203ae87 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -584,7 +584,7 @@ RLAPI void rlSetTexture(unsigned int id); // Set current texture for r RLAPI unsigned int rlLoadVertexArray(void); // Load vertex array (vao) if supported RLAPI unsigned int rlLoadVertexBuffer(void *buffer, int size, bool dynamic); // Load a vertex buffer attribute RLAPI unsigned int rlLoadVertexBufferElement(void *buffer, int size, bool dynamic); // Load a new attributes element buffer -RLAPI void rlUpdateVertexBuffer(int bufferId, void *data, int dataSize, int offset); // Update GPU buffer with new data +RLAPI void rlUpdateVertexBuffer(unsigned int bufferId, void *data, int dataSize, int offset); // Update GPU buffer with new data RLAPI void rlUnloadVertexArray(unsigned int vaoId); RLAPI void rlUnloadVertexBuffer(unsigned int vboId); RLAPI void rlSetVertexAttribute(unsigned int index, int compSize, int type, bool normalized, int stride, void *pointer); @@ -3209,7 +3209,7 @@ void rlDisableVertexBufferElement(void) // Update GPU buffer with new data // NOTE: dataSize and offset must be provided in bytes -void rlUpdateVertexBuffer(int bufferId, void *data, int dataSize, int offset) +void rlUpdateVertexBuffer(unsigned int bufferId, void *data, int dataSize, int offset) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) glBindBuffer(GL_ARRAY_BUFFER, bufferId); From 26db3915760179c4985a335196d4e8299da2eb6d Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 12 Aug 2021 20:38:57 +0200 Subject: [PATCH 039/570] ADDED: `rlActiveDrawBuffers()` #1911 - ADDED: rlEnableColorBlend()/rlDisableColorBlend() --- src/rlgl.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index b6203ae87..9cb1a2d89 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -525,8 +525,11 @@ RLAPI void rlDisableShader(void); // Disable shader progra // Framebuffer state RLAPI void rlEnableFramebuffer(unsigned int id); // Enable render texture (fbo) RLAPI void rlDisableFramebuffer(void); // Disable render texture (fbo), return to default framebuffer +RLAPI void rlActiveDrawBuffers(int count); // Activate multiple draw color buffers // General render state +RLAPI void rlEnableColorBlend(void); // Enable color blending +RLAPI void rlDisableColorBlend(void); // Disable color blending RLAPI void rlEnableDepthTest(void); // Enable depth test RLAPI void rlDisableDepthTest(void); // Disable depth test RLAPI void rlEnableDepthMask(void); // Enable depth write @@ -1544,6 +1547,49 @@ void rlDisableFramebuffer(void) #endif } +// Activate multiple draw color buffers +// NOTE: One color buffer is always active by default +void rlActiveDrawBuffers(int count) +{ +#if (defined(GRAPHICS_API_OPENGL_33) && defined(SUPPORT_RENDER_TEXTURES_HINT)) + // NOTE: Maximum number of draw buffers supported is implementation dependant, + // it can be queried with glGet*() but it must be at least 8 + //GLint maxDrawBuffers = 0; + //glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers); + + if (count > 0) + { + if (count > 8) TRACELOG(LOG_WARNING, "GL: Max color buffers limited to 8"); + else + { + unsigned int buffers[8] = { + GL_COLOR_ATTACHMENT0, + GL_COLOR_ATTACHMENT1, + GL_COLOR_ATTACHMENT2, + GL_COLOR_ATTACHMENT3, + GL_COLOR_ATTACHMENT4, + GL_COLOR_ATTACHMENT5, + GL_COLOR_ATTACHMENT6, + GL_COLOR_ATTACHMENT7, + }; + + glDrawBuffers(count, buffers); + } + } + else TRACELOG(LOG_WARNING, "GL: One color buffer active by default"); +#endif +} + +//---------------------------------------------------------------------------------- +// General render state configuration +//---------------------------------------------------------------------------------- + +// Enable color blending +void rlEnableColorBlend(void) { glEnable(GL_BLEND); } + +// Disable color blending +void rlDisableColorBlend(void) { glDisable(GL_BLEND); } + // Enable depth test void rlEnableDepthTest(void) { glEnable(GL_DEPTH_TEST); } @@ -1588,11 +1634,9 @@ void rlDisableWireMode(void) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); #endif } + // Set the line drawing width -void rlSetLineWidth(float width) -{ - glLineWidth(width); -} +void rlSetLineWidth(float width) { glLineWidth(width); } // Get the line drawing width float rlGetLineWidth(void) @@ -3209,10 +3253,10 @@ void rlDisableVertexBufferElement(void) // Update GPU buffer with new data // NOTE: dataSize and offset must be provided in bytes -void rlUpdateVertexBuffer(unsigned int bufferId, void *data, int dataSize, int offset) +void rlUpdateVertexBuffer(unsigned int id, void *data, int dataSize, int offset) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - glBindBuffer(GL_ARRAY_BUFFER, bufferId); + glBindBuffer(GL_ARRAY_BUFFER, id); glBufferSubData(GL_ARRAY_BUFFER, offset, dataSize, data); #endif } From 1dff5814be140a69de77b634f2d3e3ddac73243f Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 12 Aug 2021 21:01:09 +0200 Subject: [PATCH 040/570] ADDED: rlUpdateVertexBufferElements() #1915 --- src/rlgl.h | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 9cb1a2d89..6d18638db 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -506,8 +506,8 @@ RLAPI void rlDisableVertexBufferElement(void); // Disable vertex buffer RLAPI void rlEnableVertexAttribute(unsigned int index); // Enable vertex attribute index RLAPI void rlDisableVertexAttribute(unsigned int index);// Disable vertex attribute index #if defined(GRAPHICS_API_OPENGL_11) -RLAPI void rlEnableStatePointer(int vertexAttribType, void *buffer); -RLAPI void rlDisableStatePointer(int vertexAttribType); +RLAPI void rlEnableStatePointer(int vertexAttribType, void *buffer); // Enable attribute state pointer +RLAPI void rlDisableStatePointer(int vertexAttribType); // Disable attribute state pointer #endif // Textures state @@ -3223,6 +3223,7 @@ unsigned int rlLoadVertexBufferElement(void *buffer, int size, bool dynamic) return id; } +// Enable vertex buffer (VBO) void rlEnableVertexBuffer(unsigned int id) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3230,6 +3231,7 @@ void rlEnableVertexBuffer(unsigned int id) #endif } +// Disable vertex buffer (VBO) void rlDisableVertexBuffer(void) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3237,6 +3239,7 @@ void rlDisableVertexBuffer(void) #endif } +// Enable vertex buffer element (VBO element) void rlEnableVertexBufferElement(unsigned int id) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3244,6 +3247,7 @@ void rlEnableVertexBufferElement(unsigned int id) #endif } +// Disable vertex buffer element (VBO element) void rlDisableVertexBufferElement(void) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3251,7 +3255,7 @@ void rlDisableVertexBufferElement(void) #endif } -// Update GPU buffer with new data +// Update vertex buffer with new data // NOTE: dataSize and offset must be provided in bytes void rlUpdateVertexBuffer(unsigned int id, void *data, int dataSize, int offset) { @@ -3261,6 +3265,17 @@ void rlUpdateVertexBuffer(unsigned int id, void *data, int dataSize, int offset) #endif } +// Update vertex buffer elements with new data +// NOTE: dataSize and offset must be provided in bytes +void rlUpdateVertexBufferElements(unsigned int id, void *data, int dataSize, int offset) +{ +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, id); + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, offset, dataSize, data); +#endif +} + +// Enable vertex array object (VAO) bool rlEnableVertexArray(unsigned int vaoId) { bool result = false; @@ -3274,6 +3289,7 @@ bool rlEnableVertexArray(unsigned int vaoId) return result; } +// Disable vertex array object (VAO) void rlDisableVertexArray(void) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3281,6 +3297,7 @@ void rlDisableVertexArray(void) #endif } +// Enable vertex attribute index void rlEnableVertexAttribute(unsigned int index) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3288,6 +3305,7 @@ void rlEnableVertexAttribute(unsigned int index) #endif } +// Disable vertex attribute index void rlDisableVertexAttribute(unsigned int index) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3295,16 +3313,19 @@ void rlDisableVertexAttribute(unsigned int index) #endif } +// Draw vertex array void rlDrawVertexArray(int offset, int count) { glDrawArrays(GL_TRIANGLES, offset, count); } +// Draw vertex array elements void rlDrawVertexArrayElements(int offset, int count, void *buffer) { glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, (unsigned short *)buffer + offset); } +// Draw vertex array instanced void rlDrawVertexArrayInstanced(int offset, int count, int instances) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3312,6 +3333,7 @@ void rlDrawVertexArrayInstanced(int offset, int count, int instances) #endif } +// Draw vertex array elements instanced void rlDrawVertexArrayElementsInstanced(int offset, int count, void *buffer, int instances) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3320,6 +3342,7 @@ void rlDrawVertexArrayElementsInstanced(int offset, int count, void *buffer, int } #if defined(GRAPHICS_API_OPENGL_11) +// Enable vertex state pointer void rlEnableStatePointer(int vertexAttribType, void *buffer) { if (buffer != NULL) glEnableClientState(vertexAttribType); @@ -3334,12 +3357,14 @@ void rlEnableStatePointer(int vertexAttribType, void *buffer) } } +// Disable vertex state pointer void rlDisableStatePointer(int vertexAttribType) { glDisableClientState(vertexAttribType); } #endif +// Load vertex array object (VAO) unsigned int rlLoadVertexArray(void) { unsigned int vaoId = 0; @@ -3352,6 +3377,7 @@ unsigned int rlLoadVertexArray(void) return vaoId; } +// Set vertex attribute void rlSetVertexAttribute(unsigned int index, int compSize, int type, bool normalized, int stride, void *pointer) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3359,6 +3385,7 @@ void rlSetVertexAttribute(unsigned int index, int compSize, int type, bool norma #endif } +// Set vertex attribute divisor void rlSetVertexAttributeDivisor(unsigned int index, int divisor) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3366,6 +3393,7 @@ void rlSetVertexAttributeDivisor(unsigned int index, int divisor) #endif } +// Unload vertex array object (VAO) void rlUnloadVertexArray(unsigned int vaoId) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) @@ -3378,6 +3406,7 @@ void rlUnloadVertexArray(unsigned int vaoId) #endif } +// Unload vertex buffer (VBO) void rlUnloadVertexBuffer(unsigned int vboId) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) From 092435d51c7cbb94105d0b2b34156e0bf28d5980 Mon Sep 17 00:00:00 2001 From: 630Studios Date: Thu, 12 Aug 2021 14:01:40 -0500 Subject: [PATCH 041/570] [Models] Fix for issue #1809 (#1917) * GenMeshTangents Fix * GenMeshTangents Fix - Comment Update * GenMeshTangents Fix - Comment Update final * Code Style Changes * Code Style Changes Final * Code Style Changes Final 2 * GenMeshTangents better handling for issue #1876 * GenMeshTangents better handling for issue #1876 * GenMeshTangents: Better fix for issue #1876 * vboId location fix * rlUpdateVertexBuffer - bufferId is an unsigned int * Fix for issue#1809 - Obj with more materials then mesh caused crash * Fix for issue#1809 - Formatting Update --- src/models.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/models.c b/src/models.c index 329d8d4a8..fd7daee6f 100644 --- a/src/models.c +++ b/src/models.c @@ -3370,7 +3370,7 @@ static Model LoadOBJ(const char *fileName) if (ret != TINYOBJ_SUCCESS) TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load OBJ data", fileName); else TRACELOG(LOG_INFO, "MODEL: [%s] OBJ data loaded successfully: %i meshes/%i materials", fileName, meshCount, materialCount); - model.meshCount = materialCount; // TODO: REVIEW!!! + model.meshCount = materialCount; // Init model materials array if (materialCount > 0) @@ -3389,7 +3389,7 @@ static Model LoadOBJ(const char *fileName) model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); // Count the faces for each material - int *matFaces = RL_CALLOC(meshCount, sizeof(int)); + int *matFaces = RL_CALLOC(materialCount, sizeof(int)); for (unsigned int mi = 0; mi < meshCount; mi++) { @@ -3400,7 +3400,6 @@ static Model LoadOBJ(const char *fileName) matFaces[idx]++; } } - //-------------------------------------- // Create the material meshes From 760cfd361e055326cf459812855d8dd83129c132 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 15 Aug 2021 12:52:12 +0200 Subject: [PATCH 042/570] REVIEWED: `PHYSACDEF` definition and C++ issues #1918 --- src/extras/physac.h | 359 +++++++++++++++++++++----------------------- 1 file changed, 175 insertions(+), 184 deletions(-) diff --git a/src/extras/physac.h b/src/extras/physac.h index 7bcdb0f47..642c25a72 100644 --- a/src/extras/physac.h +++ b/src/extras/physac.h @@ -16,16 +16,9 @@ * If not defined, the library is in header only mode and can be included in other headers * or source files without problems. But only ONE file should hold the implementation. * -* #define PHYSAC_STATIC (defined by default) -* The generated implementation will stay private inside implementation file and all -* internal symbols and functions will only be visible inside that file. -* * #define PHYSAC_DEBUG * Show debug traces log messages about physic bodies creation/destruction, physic system errors, -* some calculations results and NULL reference exceptions -* -* #define PHYSAC_DEFINE_VECTOR2_TYPE -* Forces library to define struct Vector2 data type (float x; float y) +* some calculations results and NULL reference exceptions. * * #define PHYSAC_AVOID_TIMMING_SYSTEM * Disables internal timming system, used by UpdatePhysics() to launch timmed physic steps, @@ -79,14 +72,8 @@ #if !defined(PHYSAC_H) #define PHYSAC_H -#if defined(PHYSAC_STATIC) - #define PHYSACDEF static // Functions just visible to module including this file -#else - #if defined(__cplusplus) - #define PHYSACDEF extern "C" // Functions visible from other files (no name mangling of functions in C++) - #else - #define PHYSACDEF extern // Functions visible from other files - #endif +#ifndef PHYSACDEF + #define PHYSACDEF // We are building or using physac as a static library #endif // Allow custom memory allocators @@ -127,7 +114,7 @@ typedef enum PhysicsShapeType { PHYSICS_CIRCLE = 0, PHYSICS_POLYGON } PhysicsSha // Previously defined to be used in PhysicsShape struct as circular dependencies typedef struct PhysicsBodyData *PhysicsBody; -#if defined(PHYSAC_DEFINE_VECTOR2_TYPE) +#if !defined(RL_VECTOR2_TYPE) // Vector2 type typedef struct Vector2 { float x; @@ -192,13 +179,13 @@ typedef struct PhysicsManifoldData { float staticFriction; // Mixed static friction during collision } PhysicsManifoldData, *PhysicsManifold; -#if defined(__cplusplus) -extern "C" { // Prevents name mangling of functions -#endif - //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- + +#if defined(__cplusplus) +extern "C" { // Prevents name mangling of functions +#endif // Physics system management PHYSACDEF void InitPhysics(void); // Initializes physics system PHYSACDEF void UpdatePhysics(void); // Update physics system @@ -225,7 +212,6 @@ PHYSACDEF int GetPhysicsBodiesCount(void); PHYSACDEF int GetPhysicsShapeType(int index); // Returns the physics body shape type (PHYSICS_CIRCLE or PHYSICS_POLYGON) PHYSACDEF int GetPhysicsShapeVerticesCount(int index); // Returns the amount of vertices of a physics body shape PHYSACDEF Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex); // Returns transformed position of a body shape (body position + vertex transformed position) - #if defined(__cplusplus) } #endif @@ -253,11 +239,17 @@ PHYSACDEF Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex); #if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) // Time management functionality - #include // Required for: time(), clock_gettime() + #include // Required for: time(), clock_gettime() #if defined(_WIN32) + #if defined(__cplusplus) + extern "C" { // Prevents name mangling of functions + #endif // Functions required to query time on Windows int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); + #if defined(__cplusplus) + } + #endif #endif #if defined(__linux__) || defined(__FreeBSD__) #if _POSIX_C_SOURCE < 199309L @@ -366,7 +358,7 @@ static Vector2 MathTriangleBarycenter(Vector2 v1, Vector2 v2, Vector2 v3); //---------------------------------------------------------------------------------- // Initializes physics values, pointers and creates physics loop thread -PHYSACDEF void InitPhysics(void) +void InitPhysics(void) { #if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) // Initialize high resolution timer @@ -377,21 +369,21 @@ PHYSACDEF void InitPhysics(void) } // Sets physics global gravity force -PHYSACDEF void SetPhysicsGravity(float x, float y) +void SetPhysicsGravity(float x, float y) { gravityForce.x = x; gravityForce.y = y; } // Creates a new circle physics body with generic parameters -PHYSACDEF PhysicsBody CreatePhysicsBodyCircle(Vector2 pos, float radius, float density) +PhysicsBody CreatePhysicsBodyCircle(Vector2 pos, float radius, float density) { PhysicsBody body = CreatePhysicsBodyPolygon(pos, radius, PHYSAC_DEFAULT_CIRCLE_VERTICES, density); return body; } // Creates a new rectangle physics body with generic parameters -PHYSACDEF PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density) +PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float height, float density) { // NOTE: Make sure body data is initialized to 0 PhysicsBody body = (PhysicsBody)PHYSAC_CALLOC(sizeof(PhysicsBodyData), 1); @@ -469,7 +461,7 @@ PHYSACDEF PhysicsBody CreatePhysicsBodyRectangle(Vector2 pos, float width, float } // Creates a new polygon physics body with generic parameters -PHYSACDEF PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density) +PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int sides, float density) { PhysicsBody body = (PhysicsBody)PHYSAC_MALLOC(sizeof(PhysicsBodyData)); usedMemory += sizeof(PhysicsBodyData); @@ -551,19 +543,19 @@ PHYSACDEF PhysicsBody CreatePhysicsBodyPolygon(Vector2 pos, float radius, int si } // Adds a force to a physics body -PHYSACDEF void PhysicsAddForce(PhysicsBody body, Vector2 force) +void PhysicsAddForce(PhysicsBody body, Vector2 force) { if (body != NULL) body->force = MathVector2Add(body->force, force); } // Adds an angular force to a physics body -PHYSACDEF void PhysicsAddTorque(PhysicsBody body, float amount) +void PhysicsAddTorque(PhysicsBody body, float amount) { if (body != NULL) body->torque += amount; } // Shatters a polygon shape physics body to little physics bodies with explosion force -PHYSACDEF void PhysicsShatter(PhysicsBody body, Vector2 position, float force) +void PhysicsShatter(PhysicsBody body, Vector2 position, float force) { if (body != NULL) { @@ -700,13 +692,13 @@ PHYSACDEF void PhysicsShatter(PhysicsBody body, Vector2 position, float force) } // Returns the current amount of created physics bodies -PHYSACDEF int GetPhysicsBodiesCount(void) +int GetPhysicsBodiesCount(void) { return physicsBodiesCount; } // Returns a physics body of the bodies pool at a specific index -PHYSACDEF PhysicsBody GetPhysicsBody(int index) +PhysicsBody GetPhysicsBody(int index) { PhysicsBody body = NULL; @@ -722,7 +714,7 @@ PHYSACDEF PhysicsBody GetPhysicsBody(int index) } // Returns the physics body shape type (PHYSICS_CIRCLE or PHYSICS_POLYGON) -PHYSACDEF int GetPhysicsShapeType(int index) +int GetPhysicsShapeType(int index) { int result = -1; @@ -739,7 +731,7 @@ PHYSACDEF int GetPhysicsShapeType(int index) } // Returns the amount of vertices of a physics body shape -PHYSACDEF int GetPhysicsShapeVerticesCount(int index) +int GetPhysicsShapeVerticesCount(int index) { int result = 0; @@ -764,7 +756,7 @@ PHYSACDEF int GetPhysicsShapeVerticesCount(int index) } // Returns transformed position of a body shape (body position + vertex transformed position) -PHYSACDEF Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex) +Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex) { Vector2 position = { 0.0f, 0.0f }; @@ -791,7 +783,7 @@ PHYSACDEF Vector2 GetPhysicsShapeVertex(PhysicsBody body, int vertex) } // Sets physics body shape transform based on radians parameter -PHYSACDEF void SetPhysicsBodyRotation(PhysicsBody body, float radians) +void SetPhysicsBodyRotation(PhysicsBody body, float radians) { if (body != NULL) { @@ -802,7 +794,7 @@ PHYSACDEF void SetPhysicsBodyRotation(PhysicsBody body, float radians) } // Unitializes and destroys a physics body -PHYSACDEF void DestroyPhysicsBody(PhysicsBody body) +void DestroyPhysicsBody(PhysicsBody body) { if (body != NULL) { @@ -844,7 +836,7 @@ PHYSACDEF void DestroyPhysicsBody(PhysicsBody body) } // Destroys created physics bodies and manifolds and resets global values -PHYSACDEF void ResetPhysics(void) +void ResetPhysics(void) { if (physicsBodiesCount > 0) { @@ -886,7 +878,7 @@ PHYSACDEF void ResetPhysics(void) } // Unitializes physics pointers and exits physics loop thread -PHYSACDEF void ClosePhysics(void) +void ClosePhysics(void) { // Unitialize physics manifolds dynamic memory allocations if (physicsManifoldsCount > 0) @@ -912,91 +904,98 @@ PHYSACDEF void ClosePhysics(void) else TRACELOG("[PHYSAC] Physics module closed successfully\n"); } +// Update physics system +// Physics steps are launched at a fixed time step if enabled +void UpdatePhysics(void) +{ +#if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) + static double deltaTimeAccumulator = 0.0; + + // Calculate current time (ms) + currentTime = GetCurrentTime(); + + // Calculate current delta time (ms) + const double delta = currentTime - startTime; + + // Store the time elapsed since the last frame began + deltaTimeAccumulator += delta; + + // Fixed time stepping loop + while (deltaTimeAccumulator >= deltaTime) + { + UpdatePhysicsStep(); + deltaTimeAccumulator -= deltaTime; + } + + // Record the starting of this frame + startTime = currentTime; +#else + UpdatePhysicsStep(); +#endif +} + +void SetPhysicsTimeStep(double delta) +{ + deltaTime = delta; +} + //---------------------------------------------------------------------------------- // Module Internal Functions Definition //---------------------------------------------------------------------------------- -// Finds a valid index for a new physics body initialization -static int FindAvailableBodyIndex() +#if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) +// Initializes hi-resolution MONOTONIC timer +static void InitTimerHiRes(void) { - int index = -1; - for (int i = 0; i < PHYSAC_MAX_BODIES; i++) - { - int currentId = i; +#if defined(_WIN32) + QueryPerformanceFrequency((unsigned long long int *) &frequency); +#endif - // Check if current id already exist in other physics body - for (unsigned int k = 0; k < physicsBodiesCount; k++) - { - if (bodies[k]->id == currentId) - { - currentId++; - break; - } - } +#if defined(__EMSCRIPTEN__) || defined(__linux__) + struct timespec now; + if (clock_gettime(CLOCK_MONOTONIC, &now) == 0) frequency = 1000000000; +#endif - // If it is not used, use it as new physics body id - if (currentId == (int)i) - { - index = (int)i; - break; - } - } +#if defined(__APPLE__) + mach_timebase_info_data_t timebase; + mach_timebase_info(&timebase); + frequency = (timebase.denom*1e9)/timebase.numer; +#endif - return index; + baseClockTicks = (double)GetClockTicks(); // Get MONOTONIC clock time offset + startTime = GetCurrentTime(); // Get current time in milliseconds } -// Creates a default polygon shape with max vertex distance from polygon pivot -static PhysicsVertexData CreateDefaultPolygon(float radius, int sides) +// Get hi-res MONOTONIC time measure in clock ticks +static unsigned long long int GetClockTicks(void) { - PhysicsVertexData data = { 0 }; - data.vertexCount = sides; + unsigned long long int value = 0; - // Calculate polygon vertices positions - for (unsigned int i = 0; i < data.vertexCount; i++) - { - data.positions[i].x = (float)cosf(360.0f/sides*i*PHYSAC_DEG2RAD)*radius; - data.positions[i].y = (float)sinf(360.0f/sides*i*PHYSAC_DEG2RAD)*radius; - } +#if defined(_WIN32) + QueryPerformanceCounter((unsigned long long int *) &value); +#endif - // Calculate polygon faces normals - for (int i = 0; i < (int)data.vertexCount; i++) - { - int nextIndex = (((i + 1) < sides) ? (i + 1) : 0); - Vector2 face = MathVector2Subtract(data.positions[nextIndex], data.positions[i]); +#if defined(__linux__) + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + value = (unsigned long long int)now.tv_sec*(unsigned long long int)1000000000 + (unsigned long long int)now.tv_nsec; +#endif - data.normals[i] = CLITERAL(Vector2){ face.y, -face.x }; - MathVector2Normalize(&data.normals[i]); - } +#if defined(__APPLE__) + value = mach_absolute_time(); +#endif - return data; + return value; } -// Creates a rectangle polygon shape based on a min and max positions -static PhysicsVertexData CreateRectanglePolygon(Vector2 pos, Vector2 size) +// Get current time in milliseconds +static double GetCurrentTime(void) { - PhysicsVertexData data = { 0 }; - data.vertexCount = 4; - - // Calculate polygon vertices positions - data.positions[0] = CLITERAL(Vector2){ pos.x + size.x/2, pos.y - size.y/2 }; - data.positions[1] = CLITERAL(Vector2){ pos.x + size.x/2, pos.y + size.y/2 }; - data.positions[2] = CLITERAL(Vector2){ pos.x - size.x/2, pos.y + size.y/2 }; - data.positions[3] = CLITERAL(Vector2){ pos.x - size.x/2, pos.y - size.y/2 }; - - // Calculate polygon faces normals - for (unsigned int i = 0; i < data.vertexCount; i++) - { - int nextIndex = (((i + 1) < data.vertexCount) ? (i + 1) : 0); - Vector2 face = MathVector2Subtract(data.positions[nextIndex], data.positions[i]); - - data.normals[i] = CLITERAL(Vector2){ face.y, -face.x }; - MathVector2Normalize(&data.normals[i]); - } - - return data; + return (double)(GetClockTicks() - baseClockTicks)/frequency*1000; } +#endif // !PHYSAC_AVOID_TIMMING_SYSTEM // Update physics step (dynamics, collisions and position corrections) -void UpdatePhysicsStep(void) +static void UpdatePhysicsStep(void) { // Clear previous generated collisions information for (int i = (int)physicsManifoldsCount - 1; i >= 0; i--) @@ -1098,39 +1097,84 @@ void UpdatePhysicsStep(void) } } -// Update physics system -// Physics steps are launched at a fixed time step if enabled -PHYSACDEF void UpdatePhysics(void) +// Finds a valid index for a new physics body initialization +static int FindAvailableBodyIndex() { -#if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) - static double deltaTimeAccumulator = 0.0; - - // Calculate current time (ms) - currentTime = GetCurrentTime(); - - // Calculate current delta time (ms) - const double delta = currentTime - startTime; - - // Store the time elapsed since the last frame began - deltaTimeAccumulator += delta; - - // Fixed time stepping loop - while (deltaTimeAccumulator >= deltaTime) + int index = -1; + for (int i = 0; i < PHYSAC_MAX_BODIES; i++) { - UpdatePhysicsStep(); - deltaTimeAccumulator -= deltaTime; + int currentId = i; + + // Check if current id already exist in other physics body + for (unsigned int k = 0; k < physicsBodiesCount; k++) + { + if (bodies[k]->id == currentId) + { + currentId++; + break; + } + } + + // If it is not used, use it as new physics body id + if (currentId == (int)i) + { + index = (int)i; + break; + } } - // Record the starting of this frame - startTime = currentTime; -#else - UpdatePhysicsStep(); -#endif + return index; } -PHYSACDEF void SetPhysicsTimeStep(double delta) +// Creates a default polygon shape with max vertex distance from polygon pivot +static PhysicsVertexData CreateDefaultPolygon(float radius, int sides) { - deltaTime = delta; + PhysicsVertexData data = { 0 }; + data.vertexCount = sides; + + // Calculate polygon vertices positions + for (unsigned int i = 0; i < data.vertexCount; i++) + { + data.positions[i].x = (float)cosf(360.0f/sides*i*PHYSAC_DEG2RAD)*radius; + data.positions[i].y = (float)sinf(360.0f/sides*i*PHYSAC_DEG2RAD)*radius; + } + + // Calculate polygon faces normals + for (int i = 0; i < (int)data.vertexCount; i++) + { + int nextIndex = (((i + 1) < sides) ? (i + 1) : 0); + Vector2 face = MathVector2Subtract(data.positions[nextIndex], data.positions[i]); + + data.normals[i] = CLITERAL(Vector2){ face.y, -face.x }; + MathVector2Normalize(&data.normals[i]); + } + + return data; +} + +// Creates a rectangle polygon shape based on a min and max positions +static PhysicsVertexData CreateRectanglePolygon(Vector2 pos, Vector2 size) +{ + PhysicsVertexData data = { 0 }; + data.vertexCount = 4; + + // Calculate polygon vertices positions + data.positions[0] = CLITERAL(Vector2){ pos.x + size.x/2, pos.y - size.y/2 }; + data.positions[1] = CLITERAL(Vector2){ pos.x + size.x/2, pos.y + size.y/2 }; + data.positions[2] = CLITERAL(Vector2){ pos.x - size.x/2, pos.y + size.y/2 }; + data.positions[3] = CLITERAL(Vector2){ pos.x - size.x/2, pos.y - size.y/2 }; + + // Calculate polygon faces normals + for (unsigned int i = 0; i < data.vertexCount; i++) + { + int nextIndex = (((i + 1) < data.vertexCount) ? (i + 1) : 0); + Vector2 face = MathVector2Subtract(data.positions[nextIndex], data.positions[i]); + + data.normals[i] = CLITERAL(Vector2){ face.y, -face.x }; + MathVector2Normalize(&data.normals[i]); + } + + return data; } // Finds a valid index for a new manifold initialization @@ -1844,59 +1888,6 @@ static Vector2 MathTriangleBarycenter(Vector2 v1, Vector2 v2, Vector2 v3) return result; } -#if !defined(PHYSAC_AVOID_TIMMING_SYSTEM) -// Initializes hi-resolution MONOTONIC timer -static void InitTimerHiRes(void) -{ -#if defined(_WIN32) - QueryPerformanceFrequency((unsigned long long int *) &frequency); -#endif - -#if defined(__EMSCRIPTEN__) || defined(__linux__) - struct timespec now; - if (clock_gettime(CLOCK_MONOTONIC, &now) == 0) frequency = 1000000000; -#endif - -#if defined(__APPLE__) - mach_timebase_info_data_t timebase; - mach_timebase_info(&timebase); - frequency = (timebase.denom*1e9)/timebase.numer; -#endif - - baseClockTicks = (double)GetClockTicks(); // Get MONOTONIC clock time offset - startTime = GetCurrentTime(); // Get current time in milliseconds -} - -// Get hi-res MONOTONIC time measure in clock ticks -static unsigned long long int GetClockTicks(void) -{ - unsigned long long int value = 0; - -#if defined(_WIN32) - QueryPerformanceCounter((unsigned long long int *) &value); -#endif - -#if defined(__linux__) - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - value = (unsigned long long int)now.tv_sec*(unsigned long long int)1000000000 + (unsigned long long int)now.tv_nsec; -#endif - -#if defined(__APPLE__) - value = mach_absolute_time(); -#endif - - return value; -} - -// Get current time in milliseconds -static double GetCurrentTime(void) -{ - return (double)(GetClockTicks() - baseClockTicks)/frequency*1000; -} -#endif // !PHYSAC_AVOID_TIMMING_SYSTEM - - // Returns the cross product of a vector and a value static inline Vector2 MathVector2Product(Vector2 vector, float value) { From 848cdb267a7cc52ee0084185eacffdca2e9b3a31 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 15 Aug 2021 12:58:34 +0200 Subject: [PATCH 043/570] Support C++ usage as standalone library --- src/gestures.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gestures.h b/src/gestures.h index 2ed9f8fd9..355f60817 100644 --- a/src/gestures.h +++ b/src/gestures.h @@ -99,10 +99,6 @@ typedef struct { Vector2 position[4]; } GestureEvent; -#ifdef __cplusplus -extern "C" { // Prevents name mangling of functions -#endif - //---------------------------------------------------------------------------------- // Global Variables Definition //---------------------------------------------------------------------------------- @@ -111,11 +107,15 @@ extern "C" { // Prevents name mangling of functions //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { // Prevents name mangling of functions +#endif + void ProcessGestureEvent(GestureEvent event); // Process gesture event and translate it into gestures void UpdateGestures(void); // Update gestures detected (must be called every frame) - #if defined(GESTURES_STANDALONE) -void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags +void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags bool IsGestureDetected(int gesture); // Check if a gesture have been detected int GetGestureDetected(void); // Get latest detected gesture int GetTouchPointsCount(void); // Get touch points count @@ -141,9 +141,15 @@ float GetGesturePinchAngle(void); // Get gesture pinch ang #if defined(GESTURES_IMPLEMENTATION) #if defined(_WIN32) + #if defined(__cplusplus) + extern "C" { // Prevents name mangling of functions + #endif // Functions required to query time on Windows int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); + #if defined(__cplusplus) + } + #endif #elif defined(__linux__) #if _POSIX_C_SOURCE < 199309L #undef _POSIX_C_SOURCE From aae60e1e440ebd38573195ae81226f01d30f272b Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 15 Aug 2021 13:02:53 +0200 Subject: [PATCH 044/570] REVIEWED: `extern "C"` definition position for consistency Note that `extern "C"` calling convention only affects objects that need to be seen by the linker, in our case only functions... but it would also be required by global variables exposed, if any. --- src/camera.h | 9 +++++---- src/raylib.h | 18 ++++++++---------- src/rlgl.h | 8 +++++--- src/utils.h | 8 +++++--- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/camera.h b/src/camera.h index 35eda8310..084480894 100644 --- a/src/camera.h +++ b/src/camera.h @@ -94,10 +94,6 @@ } CameraProjection; #endif -#ifdef __cplusplus -extern "C" { // Prevents name mangling of functions -#endif - //---------------------------------------------------------------------------------- // Global Variables Definition //---------------------------------------------------------------------------------- @@ -106,6 +102,11 @@ extern "C" { // Prevents name mangling of functions //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { // Prevents name mangling of functions +#endif + #if defined(CAMERA_STANDALONE) void SetCameraMode(Camera camera, int mode); // Set camera mode (multiple camera modes available) void UpdateCamera(Camera *camera); // Update camera position for selected mode diff --git a/src/raylib.h b/src/raylib.h index 7f8728137..4c05aeed8 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -83,17 +83,16 @@ #define RAYLIB_VERSION "3.8-dev" +#ifndef RLAPI + #define RLAPI // We are building or using rlgl as a static library (or Linux shared library) +#endif + #if defined(_WIN32) - // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll #if defined(BUILD_LIBTYPE_SHARED) #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll) #elif defined(USE_LIBTYPE_SHARED) #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll) - #else - #define RLAPI // We are building or using raylib as a static library #endif -#else - #define RLAPI // We are building or using raylib as a static library (or Linux shared library) #endif //---------------------------------------------------------------------------------- @@ -894,11 +893,6 @@ typedef bool (*SaveFileDataCallback)(const char *fileName, void *data, unsigned typedef char *(*LoadFileTextCallback)(const char *fileName); // FileIO: Load text data typedef bool (*SaveFileTextCallback)(const char *fileName, char *text); // FileIO: Save text data - -#if defined(__cplusplus) -extern "C" { // Prevents name mangling of functions -#endif - //------------------------------------------------------------------------------------ // Global Variables Definition //------------------------------------------------------------------------------------ @@ -908,6 +902,10 @@ extern "C" { // Prevents name mangling of functions // Window and Graphics Device Functions (Module: core) //------------------------------------------------------------------------------------ +#if defined(__cplusplus) +extern "C" { // Prevents name mangling of functions +#endif + // Window-related functions RLAPI void InitWindow(int width, int height, const char *title); // Initialize window and OpenGL context RLAPI bool WindowShouldClose(void); // Check if KEY_ESCAPE pressed or Close icon pressed diff --git a/src/rlgl.h b/src/rlgl.h index 6d18638db..3c995c79e 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -457,13 +457,14 @@ typedef enum { RL_SHADER_ATTRIB_VEC4 // Shader attribute type: vec4 (4 float) } rlShaderAttributeDataType; +//------------------------------------------------------------------------------------ +// Functions Declaration - Matrix operations +//------------------------------------------------------------------------------------ + #if defined(__cplusplus) extern "C" { // Prevents name mangling of functions #endif -//------------------------------------------------------------------------------------ -// Functions Declaration - Matrix operations -//------------------------------------------------------------------------------------ RLAPI void rlMatrixMode(int mode); // Choose the current matrix to be transformed RLAPI void rlPushMatrix(void); // Push the current matrix to stack RLAPI void rlPopMatrix(void); // Pop lattest inserted matrix from stack @@ -642,6 +643,7 @@ RLAPI void rlSetMatrixViewOffsetStereo(Matrix right, Matrix left); // Set e // Quick and dirty cube/quad buffers load->draw->unload RLAPI void rlLoadDrawCube(void); // Load and draw a cube RLAPI void rlLoadDrawQuad(void); // Load and draw a quad + #if defined(__cplusplus) } #endif diff --git a/src/utils.h b/src/utils.h index 50f704201..c9b331815 100644 --- a/src/utils.h +++ b/src/utils.h @@ -55,9 +55,7 @@ //---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- -#ifdef __cplusplus -extern "C" { // Prevents name mangling of functions -#endif +//... //---------------------------------------------------------------------------------- // Global Variables Definition @@ -67,6 +65,10 @@ extern "C" { // Prevents name mangling of functions //---------------------------------------------------------------------------------- // Module Functions Declaration //---------------------------------------------------------------------------------- +#ifdef __cplusplus +extern "C" { // Prevents name mangling of functions +#endif + #if defined(PLATFORM_ANDROID) void InitAssetManager(AAssetManager *manager, const char *dataPath); // Initialize asset manager from android app FILE *android_fopen(const char *fileName, const char *mode); // Replacement for fopen() -> Read-only! From 462e7aec526ca2efe45b5d6066964b1f5ed251bb Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 15 Aug 2021 13:25:14 +0200 Subject: [PATCH 045/570] Updated `RAYLIB_VERSION` to `4.0-dev` Several breaking changes have been done lately so I think it's better to mark raylib for next release as 4.0. --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index 4c05aeed8..2e963ddc5 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -81,7 +81,7 @@ #include // Required for: va_list - Only used by TraceLogCallback -#define RAYLIB_VERSION "3.8-dev" +#define RAYLIB_VERSION "4.0-dev" #ifndef RLAPI #define RLAPI // We are building or using rlgl as a static library (or Linux shared library) From e203fb58c6025e28acec1f7340e185c00a1d3e2a Mon Sep 17 00:00:00 2001 From: "Dennis E. Hamilton" Date: Mon, 16 Aug 2021 00:53:14 -0700 Subject: [PATCH 046/570] Match build-windows.bat changes (#1923) The location for manual setting of the vcvarsall.bat location moved to line 38 in the latest change. --- projects/scripts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/scripts/README.md b/projects/scripts/README.md index abb65b77c..b60e0ec88 100644 --- a/projects/scripts/README.md +++ b/projects/scripts/README.md @@ -6,7 +6,7 @@ exception to this however, and that is Windows, because Windows doesn't have a built-in C compiler. On Windows, you'll need to install [Visual Studio][visual-studio] or the [build tools][vs-tools]. If you didn't install them in the default location, write your changes around -line 101 of [`build-windows.bat`](build-windows.bat). +line 38 of [`build-windows.bat`](build-windows.bat). ## Script customization First of all, the scripts have a few variables at the very top, which From 1b4c58b66f670b521d2f707b3fa1be860738b33a Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Aug 2021 11:06:31 +0200 Subject: [PATCH 047/570] WARNING: BREAKING: Use `frameCount` on audio This is a big change for optimization and a more professional understanding of audio. Instead of dealing with samples, now we deal with frames, like miniaudio does, so, avoiding continuous conversions from samples to frames. --- src/raudio.c | 160 ++++++++++++++++++++++++--------------------------- src/raudio.h | 51 ++++++++-------- src/raylib.h | 12 ++-- 3 files changed, 105 insertions(+), 118 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index 9a4a6c944..072dc5d33 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -728,11 +728,11 @@ Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int if (success) { - wave.sampleCount = (unsigned int)wav.totalPCMFrameCount*wav.channels; + wave.frameCount = (unsigned int)wav.totalPCMFrameCount; wave.sampleRate = wav.sampleRate; wave.sampleSize = 16; wave.channels = wav.channels; - wave.data = (short *)RL_MALLOC(wave.sampleCount*sizeof(short)); + wave.data = (short *)RL_MALLOC(wave.frameCount*wave.channels*sizeof(short)); // NOTE: We are forcing conversion to 16bit sample size on reading drwav_read_pcm_frames_s16(&wav, wav.totalPCMFrameCount, wave.data); @@ -754,11 +754,11 @@ Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int wave.sampleRate = info.sample_rate; wave.sampleSize = 16; // By default, ogg data is 16 bit per sample (short) wave.channels = info.channels; - wave.sampleCount = (unsigned int)stb_vorbis_stream_length_in_samples(oggData)*info.channels; // Independent by channel - wave.data = (short *)RL_MALLOC(wave.sampleCount*sizeof(short)); + wave.frameCount = (unsigned int)stb_vorbis_stream_length_in_samples(oggData); // NOTE: It returns frames! + wave.data = (short *)RL_MALLOC(wave.frameCount*wave.channels*sizeof(short)); - // NOTE: Get the number of samples to process (be careful! we ask for number of shorts!) - stb_vorbis_get_samples_short_interleaved(oggData, info.channels, (short *)wave.data, wave.sampleCount); + // NOTE: Get the number of samples to process (be careful! we ask for number of shorts, not bytes!) + stb_vorbis_get_samples_short_interleaved(oggData, info.channels, (short *)wave.data, wave.frameCount*wave.channels); stb_vorbis_close(oggData); } else TRACELOG(LOG_WARNING, "WAVE: Failed to load OGG data"); @@ -773,7 +773,7 @@ Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int wave.data = drflac_open_memory_and_read_pcm_frames_s16(fileData, dataSize, &wave.channels, &wave.sampleRate, &totalFrameCount, NULL); wave.sampleSize = 16; - if (wave.data != NULL) wave.sampleCount = (unsigned int)totalFrameCount*wave.channels; + if (wave.data != NULL) wave.frameCount = (unsigned int)totalFrameCount; else TRACELOG(LOG_WARNING, "WAVE: Failed to load FLAC data"); } #endif @@ -791,7 +791,7 @@ Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int { wave.channels = config.channels; wave.sampleRate = config.sampleRate; - wave.sampleCount = (int)totalFrameCount*wave.channels; + wave.frameCount = (int)totalFrameCount; } else TRACELOG(LOG_WARNING, "WAVE: Failed to load MP3 data"); @@ -835,7 +835,7 @@ Sound LoadSoundFromWave(Wave wave) // First option has been selected, format conversion is done on the loading stage. // The downside is that it uses more memory if the original sound is u8 or s16. ma_format formatIn = ((wave.sampleSize == 8)? ma_format_u8 : ((wave.sampleSize == 16)? ma_format_s16 : ma_format_f32)); - ma_uint32 frameCountIn = wave.sampleCount/wave.channels; + ma_uint32 frameCountIn = wave.frameCount; ma_uint32 frameCount = (ma_uint32)ma_convert_frames(NULL, 0, AUDIO_DEVICE_FORMAT, AUDIO_DEVICE_CHANNELS, AUDIO.System.device.sampleRate, NULL, frameCountIn, formatIn, wave.channels, wave.sampleRate); if (frameCount == 0) TRACELOG(LOG_WARNING, "SOUND: Failed to get frame count for format conversion"); @@ -850,7 +850,7 @@ Sound LoadSoundFromWave(Wave wave) frameCount = (ma_uint32)ma_convert_frames(audioBuffer->data, frameCount, AUDIO_DEVICE_FORMAT, AUDIO_DEVICE_CHANNELS, AUDIO.System.device.sampleRate, wave.data, frameCountIn, formatIn, wave.channels, wave.sampleRate); if (frameCount == 0) TRACELOG(LOG_WARNING, "SOUND: Failed format conversion"); - sound.sampleCount = frameCount*AUDIO_DEVICE_CHANNELS; + sound.frameCount = frameCount; sound.stream.sampleRate = AUDIO.System.device.sampleRate; sound.stream.sampleSize = 32; sound.stream.channels = AUDIO_DEVICE_CHANNELS; @@ -908,7 +908,7 @@ bool ExportWave(Wave wave, const char *fileName) void *fileData = NULL; size_t fileDataSize = 0; success = drwav_init_memory_write(&wav, &fileData, &fileDataSize, &format, NULL); - if (success) success = (int)drwav_write_pcm_frames(&wav, wave.sampleCount/wave.channels, wave.data); + if (success) success = (int)drwav_write_pcm_frames(&wav, wave.frameCount, wave.data); drwav_result result = drwav_uninit(&wav); if (result == DRWAV_SUCCESS) success = SaveFileData(fileName, (unsigned char *)fileData, (unsigned int)fileDataSize); @@ -920,7 +920,7 @@ bool ExportWave(Wave wave, const char *fileName) { // Export raw sample data (without header) // NOTE: It's up to the user to track wave parameters - success = SaveFileData(fileName, wave.data, wave.sampleCount*wave.sampleSize/8); + success = SaveFileData(fileName, wave.data, wave.frameCount*wave.channels*wave.sampleSize/8); } if (success) TRACELOG(LOG_INFO, "FILEIO: [%s] Wave data exported successfully", fileName); @@ -938,7 +938,7 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) #define TEXT_BYTES_PER_LINE 20 #endif - int waveDataSize = wave.sampleCount*wave.channels*wave.sampleSize/8; + int waveDataSize = wave.frameCount*wave.channels*wave.sampleSize/8; // NOTE: Text data buffer size is estimated considering wave data size in bytes // and requiring 6 char bytes for every byte: "0x00, " @@ -966,7 +966,8 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) #endif bytesCount += sprintf(txtData + bytesCount, "// Wave data information\n"); - bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_COUNT %u\n", varFileName, wave.sampleCount); + bytesCount += sprintf(txtData + bytesCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); + bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_COUNT %u\n", varFileName, wave.frameCount*wave.channels); bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_RATE %u\n", varFileName, wave.sampleRate); bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_SIZE %u\n", varFileName, wave.sampleSize); bytesCount += sprintf(txtData + bytesCount, "#define %s_CHANNELS %u\n\n", varFileName, wave.channels); @@ -1111,7 +1112,7 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels) ma_format formatIn = ((wave->sampleSize == 8)? ma_format_u8 : ((wave->sampleSize == 16)? ma_format_s16 : ma_format_f32)); ma_format formatOut = ((sampleSize == 8)? ma_format_u8 : ((sampleSize == 16)? ma_format_s16 : ma_format_f32)); - ma_uint32 frameCountIn = wave->sampleCount/wave->channels; + ma_uint32 frameCountIn = wave->frameCount; ma_uint32 frameCount = (ma_uint32)ma_convert_frames(NULL, 0, formatOut, channels, sampleRate, NULL, frameCountIn, formatIn, wave->channels, wave->sampleRate); if (frameCount == 0) @@ -1129,7 +1130,7 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels) return; } - wave->sampleCount = frameCount*channels; + wave->frameCount = frameCount; wave->sampleSize = sampleSize; wave->sampleRate = sampleRate; wave->channels = channels; @@ -1142,14 +1143,14 @@ Wave WaveCopy(Wave wave) { Wave newWave = { 0 }; - newWave.data = RL_MALLOC(wave.sampleCount*wave.sampleSize/8); + newWave.data = RL_MALLOC(wave.frameCount*wave.channels*wave.sampleSize/8); if (newWave.data != NULL) { // NOTE: Size must be provided in bytes - memcpy(newWave.data, wave.data, wave.sampleCount*wave.sampleSize/8); + memcpy(newWave.data, wave.data, wave.frameCount*wave.channels*wave.sampleSize/8); - newWave.sampleCount = wave.sampleCount; + newWave.frameCount = wave.frameCount; newWave.sampleRate = wave.sampleRate; newWave.sampleSize = wave.sampleSize; newWave.channels = wave.channels; @@ -1163,7 +1164,7 @@ Wave WaveCopy(Wave wave) void WaveCrop(Wave *wave, int initSample, int finalSample) { if ((initSample >= 0) && (initSample < finalSample) && - (finalSample > 0) && ((unsigned int)finalSample < wave->sampleCount)) + (finalSample > 0) && ((unsigned int)finalSample < (wave->frameCount*wave->channels))) { int sampleCount = finalSample - initSample; @@ -1182,11 +1183,11 @@ void WaveCrop(Wave *wave, int initSample, int finalSample) // NOTE 2: Sample data allocated should be freed with UnloadWaveSamples() float *LoadWaveSamples(Wave wave) { - float *samples = (float *)RL_MALLOC(wave.sampleCount*sizeof(float)); + float *samples = (float *)RL_MALLOC(wave.frameCount*wave.channels*sizeof(float)); // NOTE: sampleCount is the total number of interlaced samples (including channels) - for (unsigned int i = 0; i < wave.sampleCount; i++) + for (unsigned int i = 0; i < wave.frameCount*wave.channels; i++) { if (wave.sampleSize == 8) samples[i] = (float)(((unsigned char *)wave.data)[i] - 127)/256.0f; else if (wave.sampleSize == 16) samples[i] = (float)(((short *)wave.data)[i])/32767.0f; @@ -1228,7 +1229,7 @@ Music LoadMusicStream(const char *fileName) if (ctxWav->bitsPerSample == 24) sampleSize = 16; // Forcing conversion to s16 on UpdateMusicStream() music.stream = LoadAudioStream(ctxWav->sampleRate, sampleSize, ctxWav->channels); - music.sampleCount = (unsigned int)ctxWav->totalPCMFrameCount*ctxWav->channels; + music.frameCount = (unsigned int)ctxWav->totalPCMFrameCount; music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1249,7 +1250,7 @@ Music LoadMusicStream(const char *fileName) music.stream = LoadAudioStream(info.sample_rate, 16, info.channels); // WARNING: It seems this function returns length in frames, not samples, so we multiply by channels - music.sampleCount = (unsigned int)stb_vorbis_stream_length_in_samples((stb_vorbis *)music.ctxData)*info.channels; + music.frameCount = (unsigned int)stb_vorbis_stream_length_in_samples((stb_vorbis *)music.ctxData); music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1266,7 +1267,7 @@ Music LoadMusicStream(const char *fileName) drflac *ctxFlac = (drflac *)music.ctxData; music.stream = LoadAudioStream(ctxFlac->sampleRate, ctxFlac->bitsPerSample, ctxFlac->channels); - music.sampleCount = (unsigned int)ctxFlac->totalPCMFrameCount*ctxFlac->channels; + music.frameCount = (unsigned int)ctxFlac->totalPCMFrameCount; music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1284,7 +1285,7 @@ Music LoadMusicStream(const char *fileName) if (result > 0) { music.stream = LoadAudioStream(ctxMp3->sampleRate, 32, ctxMp3->channels); - music.sampleCount = (unsigned int)drmp3_get_pcm_frame_count(ctxMp3)*ctxMp3->channels; + music.frameCount = (unsigned int)drmp3_get_pcm_frame_count(ctxMp3); music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1309,9 +1310,9 @@ Music LoadMusicStream(const char *fileName) // NOTE: Only stereo is supported for XM music.stream = LoadAudioStream(AUDIO.System.device.sampleRate, bits, AUDIO_DEVICE_CHANNELS); - music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm)*2; // 2 channels + music.frameCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm); // NOTE: Always 2 channels (stereo) music.looping = true; // Looping enabled by default - jar_xm_reset(ctxXm); // make sure we start at the beginning of the song + jar_xm_reset(ctxXm); // make sure we start at the beginning of the song musicLoaded = true; } } @@ -1330,7 +1331,7 @@ Music LoadMusicStream(const char *fileName) { // NOTE: Only stereo is supported for MOD music.stream = LoadAudioStream(AUDIO.System.device.sampleRate, 16, AUDIO_DEVICE_CHANNELS); - music.sampleCount = (unsigned int)jar_mod_max_samples(ctxMod)*2; // 2 channels + music.frameCount = (unsigned int)jar_mod_max_samples(ctxMod); // NOTE: Always 2 channels (stereo) music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1367,10 +1368,10 @@ Music LoadMusicStream(const char *fileName) { // Show some music stream info TRACELOG(LOG_INFO, "FILEIO: [%s] Music file loaded successfully", fileName); - TRACELOG(LOG_INFO, " > Total samples: %i", music.sampleCount); TRACELOG(LOG_INFO, " > Sample rate: %i Hz", music.stream.sampleRate); TRACELOG(LOG_INFO, " > Sample size: %i bits", music.stream.sampleSize); TRACELOG(LOG_INFO, " > Channels: %i (%s)", music.stream.channels, (music.stream.channels == 1)? "Mono" : (music.stream.channels == 2)? "Stereo" : "Multi"); + TRACELOG(LOG_INFO, " > Total frames: %i", music.frameCount); } return music; @@ -1402,7 +1403,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d if (ctxWav->bitsPerSample == 24) sampleSize = 16; // Forcing conversion to s16 on UpdateMusicStream() music.stream = LoadAudioStream(ctxWav->sampleRate, sampleSize, ctxWav->channels); - music.sampleCount = (unsigned int)ctxWav->totalPCMFrameCount*ctxWav->channels; + music.frameCount = (unsigned int)ctxWav->totalPCMFrameCount; music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1419,7 +1420,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d drflac *ctxFlac = (drflac *)music.ctxData; music.stream = LoadAudioStream(ctxFlac->sampleRate, ctxFlac->bitsPerSample, ctxFlac->channels); - music.sampleCount = (unsigned int)ctxFlac->totalPCMFrameCount*ctxFlac->channels; + music.frameCount = (unsigned int)ctxFlac->totalPCMFrameCount; music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1437,7 +1438,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d if (success) { music.stream = LoadAudioStream(ctxMp3->sampleRate, 32, ctxMp3->channels); - music.sampleCount = (unsigned int)drmp3_get_pcm_frame_count(ctxMp3)*ctxMp3->channels; + music.frameCount = (unsigned int)drmp3_get_pcm_frame_count(ctxMp3); music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1459,7 +1460,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d music.stream = LoadAudioStream(info.sample_rate, 16, info.channels); // WARNING: It seems this function returns length in frames, not samples, so we multiply by channels - music.sampleCount = (unsigned int)stb_vorbis_stream_length_in_samples((stb_vorbis *)music.ctxData)*info.channels; + music.frameCount = (unsigned int)stb_vorbis_stream_length_in_samples((stb_vorbis *)music.ctxData); music.looping = true; // Looping enabled by default musicLoaded = true; } @@ -1483,7 +1484,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d // NOTE: Only stereo is supported for XM music.stream = LoadAudioStream(AUDIO.System.device.sampleRate, bits, 2); - music.sampleCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm)*2; // 2 channels + music.frameCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm); // NOTE: Always 2 channels (stereo) music.looping = true; // Looping enabled by default jar_xm_reset(ctxXm); // make sure we start at the beginning of the song @@ -1521,7 +1522,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d // NOTE: Only stereo is supported for MOD music.stream = LoadAudioStream(AUDIO.System.device.sampleRate, 16, 2); - music.sampleCount = (unsigned int)jar_mod_max_samples(ctxMod)*2; // 2 channels + music.frameCount = (unsigned int)jar_mod_max_samples(ctxMod); // NOTE: Always 2 channels (stereo) music.looping = true; // Looping enabled by default musicLoaded = true; @@ -1561,10 +1562,10 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d { // Show some music stream info TRACELOG(LOG_INFO, "FILEIO: Music data loaded successfully"); - TRACELOG(LOG_INFO, " > Total samples: %i", music.sampleCount); TRACELOG(LOG_INFO, " > Sample rate: %i Hz", music.stream.sampleRate); TRACELOG(LOG_INFO, " > Sample size: %i bits", music.stream.sampleSize); TRACELOG(LOG_INFO, " > Channels: %i (%s)", music.stream.channels, (music.stream.channels == 1)? "Mono" : (music.stream.channels == 2)? "Stereo" : "Multi"); + TRACELOG(LOG_INFO, " > Total frames: %i", music.frameCount); } return music; @@ -1660,29 +1661,22 @@ void UpdateMusicStream(Music music) { if (music.stream.buffer == NULL) return; -#if defined(SUPPORT_FILEFORMAT_XM) - if (music.ctxType == MUSIC_MODULE_XM) jar_xm_set_max_loop_count(music.ctxData, music.looping ? 0 : 1); -#endif - bool streamEnding = false; - unsigned int subBufferSizeInFrames = music.stream.buffer->sizeInFrames/2; // NOTE: Using dynamic allocation because it could require more than 16KB void *pcm = RL_CALLOC(subBufferSizeInFrames*music.stream.channels*music.stream.sampleSize/8, 1); - int samplesCount = 0; // Total size of data streamed in L+R samples for xm floats, individual L or R for ogg shorts + int frameCountToStream = 0; // Total size of data in frames to be streamed - // TODO: Get the sampleLeft using framesProcessed... but first, get total frames processed correctly... + // TODO: Get the framesLeft using framesProcessed... but first, get total frames processed correctly... //ma_uint32 frameSizeInBytes = ma_get_bytes_per_sample(music.stream.buffer->dsp.formatConverterIn.config.formatIn)*music.stream.buffer->dsp.formatConverterIn.config.channels; - int sampleLeft = music.sampleCount - (music.stream.buffer->framesProcessed*music.stream.channels); - - if (music.ctxType == MUSIC_MODULE_XM && music.looping) sampleLeft = subBufferSizeInFrames*4; + int framesLeft = music.frameCount - music.stream.buffer->framesProcessed; while (IsAudioStreamProcessed(music.stream)) { - if ((sampleLeft/music.stream.channels) >= subBufferSizeInFrames) samplesCount = subBufferSizeInFrames*music.stream.channels; - else samplesCount = sampleLeft; + if (framesLeft >= subBufferSizeInFrames) frameCountToStream = subBufferSizeInFrames; + else frameCountToStream = framesLeft; switch (music.ctxType) { @@ -1690,8 +1684,8 @@ void UpdateMusicStream(Music music) case MUSIC_AUDIO_WAV: { // NOTE: Returns the number of samples to process (not required) - if (music.stream.sampleSize == 16) drwav_read_pcm_frames_s16((drwav *)music.ctxData, samplesCount/music.stream.channels, (short *)pcm); - else if (music.stream.sampleSize == 32) drwav_read_pcm_frames_f32((drwav *)music.ctxData, samplesCount/music.stream.channels, (float *)pcm); + if (music.stream.sampleSize == 16) drwav_read_pcm_frames_s16((drwav *)music.ctxData, frameCountToStream, (short *)pcm); + else if (music.stream.sampleSize == 32) drwav_read_pcm_frames_f32((drwav *)music.ctxData, frameCountToStream, (float *)pcm); } break; #endif @@ -1699,7 +1693,7 @@ void UpdateMusicStream(Music music) case MUSIC_AUDIO_OGG: { // NOTE: Returns the number of samples to process (be careful! we ask for number of shorts!) - stb_vorbis_get_samples_short_interleaved((stb_vorbis *)music.ctxData, music.stream.channels, (short *)pcm, samplesCount); + stb_vorbis_get_samples_short_interleaved((stb_vorbis *)music.ctxData, music.stream.channels, (short *)pcm, frameCountToStream*music.stream.channels); } break; #endif @@ -1707,15 +1701,14 @@ void UpdateMusicStream(Music music) case MUSIC_AUDIO_FLAC: { // NOTE: Returns the number of samples to process (not required) - drflac_read_pcm_frames_s16((drflac *)music.ctxData, samplesCount, (short *)pcm); + drflac_read_pcm_frames_s16((drflac *)music.ctxData, frameCountToStream*music.stream.channels, (short *)pcm); } break; #endif #if defined(SUPPORT_FILEFORMAT_MP3) case MUSIC_AUDIO_MP3: { - // NOTE: samplesCount, actually refers to framesCount and returns the number of frames processed - drmp3_read_pcm_frames_f32((drmp3 *)music.ctxData, samplesCount/music.stream.channels, (float *)pcm); + drmp3_read_pcm_frames_f32((drmp3 *)music.ctxData, frameCountToStream, (float *)pcm); } break; #endif @@ -1723,9 +1716,9 @@ void UpdateMusicStream(Music music) case MUSIC_MODULE_XM: { // NOTE: Internally we consider 2 channels generation, so samplesCount/2 - if (AUDIO_DEVICE_FORMAT == ma_format_f32) jar_xm_generate_samples((jar_xm_context_t *)music.ctxData, (float *)pcm, samplesCount/2); - else if (AUDIO_DEVICE_FORMAT == ma_format_s16) jar_xm_generate_samples_16bit((jar_xm_context_t *)music.ctxData, (short *)pcm, samplesCount/2); - else if (AUDIO_DEVICE_FORMAT == ma_format_u8) jar_xm_generate_samples_8bit((jar_xm_context_t *)music.ctxData, (char *)pcm, samplesCount/2); + if (AUDIO_DEVICE_FORMAT == ma_format_f32) jar_xm_generate_samples((jar_xm_context_t *)music.ctxData, (float *)pcm, frameCountToStream); + else if (AUDIO_DEVICE_FORMAT == ma_format_s16) jar_xm_generate_samples_16bit((jar_xm_context_t *)music.ctxData, (short *)pcm, frameCountToStream); + else if (AUDIO_DEVICE_FORMAT == ma_format_u8) jar_xm_generate_samples_8bit((jar_xm_context_t *)music.ctxData, (char *)pcm, frameCountToStream); } break; #endif @@ -1733,22 +1726,17 @@ void UpdateMusicStream(Music music) case MUSIC_MODULE_MOD: { // NOTE: 3rd parameter (nbsample) specify the number of stereo 16bits samples you want, so sampleCount/2 - jar_mod_fillbuffer((jar_mod_context_t *)music.ctxData, (short *)pcm, samplesCount/2, 0); + jar_mod_fillbuffer((jar_mod_context_t *)music.ctxData, (short *)pcm, frameCountToStream, 0); } break; #endif default: break; } - UpdateAudioStream(music.stream, pcm, samplesCount); + UpdateAudioStream(music.stream, pcm, frameCountToStream); + + framesLeft -= frameCountToStream; - if ((music.ctxType == MUSIC_MODULE_XM) || music.ctxType == MUSIC_MODULE_MOD) - { - if (samplesCount > 1) sampleLeft -= samplesCount/2; - else sampleLeft -= samplesCount; - } - else sampleLeft -= samplesCount; - - if (sampleLeft <= 0) + if (framesLeft <= 0) { streamEnding = true; break; @@ -1795,7 +1783,7 @@ float GetMusicTimeLength(Music music) { float totalSeconds = 0.0f; - totalSeconds = (float)music.sampleCount/(music.stream.sampleRate*music.stream.channels); + totalSeconds = (float)music.frameCount/music.stream.sampleRate; return totalSeconds; } @@ -1803,22 +1791,24 @@ float GetMusicTimeLength(Music music) // Get current music time played (in seconds) float GetMusicTimePlayed(Music music) { -#if defined(SUPPORT_FILEFORMAT_XM) - if (music.ctxType == MUSIC_MODULE_XM) - { - uint64_t samples = 0; - jar_xm_get_position(music.ctxData, NULL, NULL, NULL, &samples); - samples = samples % (music.sampleCount); - - return (float)(samples)/(music.stream.sampleRate*music.stream.channels); - } -#endif float secondsPlayed = 0.0f; if (music.stream.buffer != NULL) { - //ma_uint32 frameSizeInBytes = ma_get_bytes_per_sample(music.stream.buffer->dsp.formatConverterIn.config.formatIn)*music.stream.buffer->dsp.formatConverterIn.config.channels; - unsigned int samplesPlayed = music.stream.buffer->framesProcessed*music.stream.channels; - secondsPlayed = (float)samplesPlayed/(music.stream.sampleRate*music.stream.channels); + #if defined(SUPPORT_FILEFORMAT_XM) + if (music.ctxType == MUSIC_MODULE_XM) + { + uint64_t framesPlayed = 0; + + jar_xm_get_position(music.ctxData, NULL, NULL, NULL, &framesPlayed); + secondsPlayed = (float)framesPlayed/music.stream.sampleRate; + } + else + #endif + { + //ma_uint32 frameSizeInBytes = ma_get_bytes_per_sample(music.stream.buffer->dsp.formatConverterIn.config.formatIn)*music.stream.buffer->dsp.formatConverterIn.config.channels; + unsigned int framesPlayed = music.stream.buffer->framesProcessed; + secondsPlayed = (float)framesPlayed/music.stream.sampleRate; + } } return secondsPlayed; @@ -1867,7 +1857,7 @@ void UnloadAudioStream(AudioStream stream) // Update audio stream buffers with data // NOTE 1: Only updates one buffer of the stream source: unqueue -> update -> queue // NOTE 2: To unqueue a buffer it needs to be processed: IsAudioStreamProcessed() -void UpdateAudioStream(AudioStream stream, const void *data, int samplesCount) +void UpdateAudioStream(AudioStream stream, const void *data, int frameCount) { if (stream.buffer != NULL) { @@ -1896,11 +1886,11 @@ void UpdateAudioStream(AudioStream stream, const void *data, int samplesCount) // Does this API expect a whole buffer to be updated in one go? // Assuming so, but if not will need to change this logic. - if (subBufferSizeInFrames >= (ma_uint32)samplesCount/stream.channels) + if (subBufferSizeInFrames >= (ma_uint32)frameCount) { ma_uint32 framesToWrite = subBufferSizeInFrames; - if (framesToWrite > ((ma_uint32)samplesCount/stream.channels)) framesToWrite = (ma_uint32)samplesCount/stream.channels; + if (framesToWrite > (ma_uint32)frameCount) framesToWrite = (ma_uint32)frameCount; ma_uint32 bytesToWrite = framesToWrite*stream.channels*(stream.sampleSize/8); memcpy(subBuffer, data, bytesToWrite); diff --git a/src/raudio.h b/src/raudio.h index e8a1ebaff..cddb35681 100644 --- a/src/raudio.h +++ b/src/raudio.h @@ -78,49 +78,42 @@ #endif #endif -// Wave type, defines audio wave data +// Wave, audio wave data typedef struct Wave { - unsigned int sampleCount; // Total number of samples - unsigned int sampleRate; // Frequency (samples per second) - unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) - unsigned int channels; // Number of channels (1-mono, 2-stereo) - void *data; // Buffer data pointer + unsigned int frameCount; // Total number of frames (considering channels) + unsigned int sampleRate; // Frequency (samples per second) + unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) + unsigned int channels; // Number of channels (1-mono, 2-stereo, ...) + void *data; // Buffer data pointer } Wave; typedef struct rAudioBuffer rAudioBuffer; -// Audio stream type -// NOTE: Useful to create custom audio streams not bound to a specific file +// AudioStream, custom audio stream typedef struct AudioStream { - unsigned int sampleRate; // Frequency (samples per second) - unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) - unsigned int channels; // Number of channels (1-mono, 2-stereo) + rAudioBuffer *buffer; // Pointer to internal data used by the audio system - rAudioBuffer *buffer; // Pointer to internal data used by the audio system + unsigned int sampleRate; // Frequency (samples per second) + unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) + unsigned int channels; // Number of channels (1-mono, 2-stereo, ...) } AudioStream; -// Sound source type +// Sound typedef struct Sound { - unsigned int sampleCount; // Total number of samples - AudioStream stream; // Audio stream + AudioStream stream; // Audio stream + unsigned int frameCount; // Total number of frames (considering channels) } Sound; -// Music stream type (audio file streaming from memory) -// NOTE: Anything longer than ~10 seconds should be streamed +// Music, audio stream, anything longer than ~10 seconds should be streamed typedef struct Music { - int ctxType; // Type of music context (audio filetype) - void *ctxData; // Audio context data, depends on type + AudioStream stream; // Audio stream + unsigned int frameCount; // Total number of frames (considering channels) + bool looping; // Music looping enable - bool looping; // Music looping enable - unsigned int sampleCount; // Total number of samples - - AudioStream stream; // Audio stream + int ctxType; // Type of music context (audio filetype) + void *ctxData; // Audio context data, depends on type } Music; -#ifdef __cplusplus -extern "C" { // Prevents name mangling of functions -#endif - //---------------------------------------------------------------------------------- // Global Variables Definition //---------------------------------------------------------------------------------- @@ -130,6 +123,10 @@ extern "C" { // Prevents name mangling of functions // Module Functions Declaration //---------------------------------------------------------------------------------- +#ifdef __cplusplus +extern "C" { // Prevents name mangling of functions +#endif + // Audio device management functions void InitAudioDevice(void); // Initialize audio device and context void CloseAudioDevice(void); // Close the audio device and context diff --git a/src/raylib.h b/src/raylib.h index 2e963ddc5..c7b4b282b 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -423,10 +423,10 @@ typedef struct BoundingBox { // Wave, audio wave data typedef struct Wave { - unsigned int sampleCount; // Total number of samples (considering channels!) + unsigned int frameCount; // Total number of frames (considering channels) unsigned int sampleRate; // Frequency (samples per second) unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) - unsigned int channels; // Number of channels (1-mono, 2-stereo) + unsigned int channels; // Number of channels (1-mono, 2-stereo, ...) void *data; // Buffer data pointer } Wave; @@ -438,19 +438,19 @@ typedef struct AudioStream { unsigned int sampleRate; // Frequency (samples per second) unsigned int sampleSize; // Bit depth (bits per sample): 8, 16, 32 (24 not supported) - unsigned int channels; // Number of channels (1-mono, 2-stereo) + unsigned int channels; // Number of channels (1-mono, 2-stereo, ...) } AudioStream; // Sound typedef struct Sound { AudioStream stream; // Audio stream - unsigned int sampleCount; // Total number of samples + unsigned int frameCount; // Total number of frames (considering channels) } Sound; // Music, audio stream, anything longer than ~10 seconds should be streamed typedef struct Music { AudioStream stream; // Audio stream - unsigned int sampleCount; // Total number of samples + unsigned int frameCount; // Total number of frames (considering channels) bool looping; // Music looping enable int ctxType; // Type of music context (audio filetype) @@ -1513,7 +1513,7 @@ RLAPI float GetMusicTimePlayed(Music music); // Get cur // AudioStream management functions RLAPI AudioStream LoadAudioStream(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels); // Load audio stream (to stream raw audio pcm data) RLAPI void UnloadAudioStream(AudioStream stream); // Unload audio stream and free memory -RLAPI void UpdateAudioStream(AudioStream stream, const void *data, int samplesCount); // Update audio stream buffers with data +RLAPI void UpdateAudioStream(AudioStream stream, const void *data, int framesCount); // Update audio stream buffers with data RLAPI bool IsAudioStreamProcessed(AudioStream stream); // Check if any audio stream buffers requires refill RLAPI void PlayAudioStream(AudioStream stream); // Play audio stream RLAPI void PauseAudioStream(AudioStream stream); // Pause audio stream From 92a13878dce2962fa0c701ff69ea2de3cbeeaeab Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Aug 2021 19:23:06 +0200 Subject: [PATCH 048/570] Add some comments --- src/rlgl.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rlgl.h b/src/rlgl.h index 3c995c79e..45d44b16f 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3431,6 +3431,10 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); + + // Get the size of compiled shaders (not available on OpenGL ES 2.0) + //GLint binarySize = 0; + //glGetProgramiv(programId, GL_PROGRAM_BINARY_LENGTH, &binarySize); if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShaderId; else @@ -3467,7 +3471,7 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) { int namelen = -1; int num = -1; - char name[256]; // Assume no variable names longer than 256 + char name[256] = { 0 }; // Assume no variable names longer than 256 GLenum type = GL_ZERO; // Get the name of the uniforms From ef8526ae36df83f876b1175d8eccb2b3187a66e3 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Aug 2021 19:26:10 +0200 Subject: [PATCH 049/570] Update rlgl.h --- src/rlgl.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 45d44b16f..df9b63b66 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3432,14 +3432,15 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); - // Get the size of compiled shaders (not available on OpenGL ES 2.0) - //GLint binarySize = 0; - //glGetProgramiv(programId, GL_PROGRAM_BINARY_LENGTH, &binarySize); - if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShaderId; else { id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); + + // Get the size of compiled shader program (not available on OpenGL ES 2.0) + // NOTE: If GL_LINK_STATUS is GL_FALSE, program binary length is zero. + //GLint binarySize = 0; + //glGetProgramiv(id, GL_PROGRAM_BINARY_LENGTH, &binarySize); if (vertexShaderId != RLGL.State.defaultVShaderId) { From f3385b6ad22af53245e20ab3dda10853e1ee95a4 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Aug 2021 19:52:57 +0200 Subject: [PATCH 050/570] Update rlgl.h --- src/rlgl.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index df9b63b66..9b705473f 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3436,11 +3436,6 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) else { id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); - - // Get the size of compiled shader program (not available on OpenGL ES 2.0) - // NOTE: If GL_LINK_STATUS is GL_FALSE, program binary length is zero. - //GLint binarySize = 0; - //glGetProgramiv(id, GL_PROGRAM_BINARY_LENGTH, &binarySize); if (vertexShaderId != RLGL.State.defaultVShaderId) { @@ -3587,7 +3582,15 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) program = 0; } - else TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); + else + { + // Get the size of compiled shader program (not available on OpenGL ES 2.0) + // NOTE: If GL_LINK_STATUS is GL_FALSE, program binary length is zero. + //GLint binarySize = 0; + //glGetProgramiv(id, GL_PROGRAM_BINARY_LENGTH, &binarySize); + + TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); + } #endif return program; } From a5beb940f8f08d91b33634ca7dc056f07f60f20c Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Aug 2021 23:23:16 +0200 Subject: [PATCH 051/570] Remove trailing spaces --- src/external/jar_xm.h | 52 +++++++++++++++++++++---------------------- src/models.c | 28 +++++++++++------------ src/raudio.c | 2 +- src/raymath.h | 2 +- src/rlgl.h | 52 +++++++++++++++++++++---------------------- src/text.c | 18 +++++++-------- src/textures.c | 40 ++++++++++++++++----------------- 7 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/external/jar_xm.h b/src/external/jar_xm.h index ea7a32831..82170f54d 100644 --- a/src/external/jar_xm.h +++ b/src/external/jar_xm.h @@ -75,7 +75,7 @@ struct jar_xm_context_s; typedef struct jar_xm_context_s jar_xm_context_t; #ifdef __cplusplus -extern "C" { +extern "C" { #endif //** Create a XM context. @@ -363,7 +363,7 @@ struct jar_xm_sample_s { uint16_t num_patterns; uint16_t num_instruments; uint16_t linear_interpolation; - uint16_t ramping; + uint16_t ramping; jar_xm_frequency_type_t frequency_type; uint8_t pattern_table[PATTERN_ORDER_TABLE_LENGTH]; @@ -457,7 +457,7 @@ struct jar_xm_sample_s { uint16_t default_tempo; // Number of ticks per row uint16_t default_bpm; float default_global_volume; - + uint16_t tempo; // Number of ticks per row uint16_t bpm; float global_volume; @@ -708,7 +708,7 @@ int jar_xm_check_sanity_postload(jar_xm_context_t* ctx) { if(ctx->module.pattern_table[i] >= ctx->module.num_patterns) { if(i+1 == ctx->module.length && ctx->module.length > 1) { DEBUG("trimming invalid POT at pos %X", i); - --ctx->module.length; + --ctx->module.length; } else { DEBUG("module has invalid POT, pos %X references nonexistent pattern %X", i, ctx->module.pattern_table[i]); return 1; @@ -823,7 +823,7 @@ char* jar_xm_load_module(jar_xm_context_t* ctx, const char* moddata, size_t modd pat->slots = (jar_xm_pattern_slot_t*)mempool; mempool += mod->num_channels * pat->num_rows * sizeof(jar_xm_pattern_slot_t); offset += READ_U32(offset); /* Pattern header length */ - + if(packed_patterndata_size == 0) { /* No pattern data is present */ memset(pat->slots, 0, sizeof(jar_xm_pattern_slot_t) * pat->num_rows * mod->num_channels); } else { @@ -1236,7 +1236,7 @@ static void jar_xm_post_pattern_change(jar_xm_context_t* ctx) { /* Loop if necessary */ if(ctx->current_table_index >= ctx->module.length) { ctx->current_table_index = ctx->module.restart_position; - ctx->tempo =ctx->default_tempo; // reset to file default value + ctx->tempo =ctx->default_tempo; // reset to file default value ctx->bpm = ctx->default_bpm; // reset to file default value ctx->global_volume = ctx->default_global_volume; // reset to file default value } @@ -1586,7 +1586,7 @@ static void jar_xm_trigger_note(jar_xm_context_t* ctx, jar_xm_channel_context_t* ch->sample_position = 0.f; ch->ping = true; }; - + if (!(flags & jar_xm_TRIGGER_KEEP_VOLUME)) { if(ch->sample != NULL) { ch->volume = ch->sample->volume; @@ -1665,7 +1665,7 @@ static void jar_xm_row(jar_xm_context_t* ctx) { /* No E6y loop is in effect (or we are in the first pass) */ ctx->loop_count = (ctx->row_loop_count[MAX_NUM_ROWS * ctx->current_table_index + ctx->current_row]++); } - + /// Move to next row ctx->current_row++; /* uint8 warning: can increment from 255 to 0, in which case it is still necessary to go the next pattern. */ if (!ctx->position_jump && !ctx->pattern_break && (ctx->current_row >= cur->num_rows || ctx->current_row == 0)) { @@ -1721,7 +1721,7 @@ static void jar_xm_tick(jar_xm_context_t* ctx) { if(ctx->current_tick == 0) { jar_xm_row(ctx); // We have processed all ticks and we run the row } - + jar_xm_module_t* mod = &(ctx->module); for(uint8_t i = 0; i < ctx->module.num_channels; ++i) { jar_xm_channel_context_t* ch = ctx->channels + i; @@ -1885,7 +1885,7 @@ static void jar_xm_tick(jar_xm_context_t* ctx) { } break; case 16: /* Fxy: Set tempo/BPM */ - break; + break; case 17: /* Hxy: Global volume slide */ if(ctx->current_tick == 0) break; if((ch->global_volume_slide_param & 0xF0) && (ch->global_volume_slide_param & 0x0F)) { break; }; /* Invalid state */ @@ -1904,7 +1904,7 @@ static void jar_xm_tick(jar_xm_context_t* ctx) { if(ctx->current_tick == ch->current->effect_param) { jar_xm_key_off(ch); }; break; case 21: /* Lxx: Set envelope position */ - break; + break; case 25: /* Pxy: Panning slide */ if(ctx->current_tick == 0) break; jar_xm_panning_slide(ch, ch->panning_slide_param); @@ -2105,7 +2105,7 @@ static void jar_xm_next_of_sample(jar_xm_context_t* ctx, jar_xm_channel_context_ // gather all channel audio into stereo float static void jar_xm_mixdown(jar_xm_context_t* ctx, float* left, float* right) { jar_xm_module_t* mod = &(ctx->module); - + if(ctx->remaining_samples_in_tick <= 0) { jar_xm_tick(ctx); }; @@ -2142,7 +2142,7 @@ static void jar_xm_mixdown(jar_xm_context_t* ctx, float* left, float* right) { // apply brick wall limiter when audio goes beyond bounderies if(*left < -1.0) {*left = -1.0;} else if(*left > 1.0) {*left = 1.0;}; - if(*right < -1.0) {*right = -1.0;} else if(*right > 1.0) {*right = 1.0;}; + if(*right < -1.0) {*right = -1.0;} else if(*right > 1.0) {*right = 1.0;}; }; void jar_xm_generate_samples(jar_xm_context_t* ctx, float* output, size_t numsamples) { @@ -2244,7 +2244,7 @@ int jar_xm_create_context_from_file(jar_xm_context_t** ctx, uint32_t rate, const return 6; break; } - + return 0; } @@ -2256,7 +2256,7 @@ void jar_xm_reset(jar_xm_context_t* ctx) { ctx->current_row = 0; ctx->current_table_index = 0; ctx->current_tick = 0; - ctx->tempo =ctx->default_tempo; // reset to file default value + ctx->tempo =ctx->default_tempo; // reset to file default value ctx->bpm = ctx->default_bpm; // reset to file default value ctx->global_volume = ctx->default_global_volume; // reset to file default value } @@ -2282,7 +2282,7 @@ void jar_xm_table_jump(jar_xm_context_t* ctx, int table_ptr) { } else { ctx->current_table_index = 0; ctx->module.restart_position = 0; // The reason to jump is to start a new loop or track - ctx->tempo =ctx->default_tempo; // reset to file default value + ctx->tempo =ctx->default_tempo; // reset to file default value ctx->bpm = ctx->default_bpm; // reset to file default value ctx->global_volume = ctx->default_global_volume; // reset to file default value }; @@ -2383,31 +2383,31 @@ void jar_xm_debug(jar_xm_context_t *ctx) { y += size; DrawText(TextFormat("LCT = %i", ctx->loop_count), x, y, size, WHITE); y += size; DrawText(TextFormat("MAX LCT = %i", ctx->max_loop_count), x, y, size, WHITE); x = size * 12; y = 0; - + y += size; DrawText(TextFormat("CUR TCK = %i", ctx->current_tick), x, y, size, WHITE); y += size; DrawText(TextFormat("XTR TCK = %i", ctx->extra_ticks), x, y, size, WHITE); y += size; DrawText(TextFormat("TCK/ROW = %i", ctx->tempo), x, y, size, ORANGE); y += size; DrawText(TextFormat("SPL TCK = %f", ctx->remaining_samples_in_tick), x, y, size, WHITE); y += size; DrawText(TextFormat("GEN SPL = %i", ctx->generated_samples), x, y, size, WHITE); y += size * 7; - + x = 0; size=16; // TIMELINE OF MODULE for (int i=0; i < ctx->module.length; i++) { if (i == ctx->jump_dest) { if (ctx->position_jump) { - DrawRectangle(i * size * 2, y - size, size * 2, size, GOLD); + DrawRectangle(i * size * 2, y - size, size * 2, size, GOLD); } else { - DrawRectangle(i * size * 2, y - size, size * 2, size, BROWN); + DrawRectangle(i * size * 2, y - size, size * 2, size, BROWN); }; }; if (i == ctx->current_table_index) { // DrawText(TextFormat("%02X", ctx->current_tick), i * size * 2, y - size, size, WHITE); - DrawRectangle(i * size * 2, y, size * 2, size, RED); + DrawRectangle(i * size * 2, y, size * 2, size, RED); DrawText(TextFormat("%02X", ctx->current_row), i * size * 2, y - size, size, YELLOW); } else { - DrawRectangle(i * size * 2, y, size * 2, size, ORANGE); + DrawRectangle(i * size * 2, y, size * 2, size, ORANGE); }; DrawText(TextFormat("%02X", ctx->module.pattern_table[i]), i * size * 2, y, size, WHITE); }; @@ -2426,19 +2426,19 @@ void jar_xm_debug(jar_xm_context_t *ctx) { DrawText("FX", x + size * 6, y, size, YELLOW); x += 9 * size; }; - x += size; + x += size; for (int j=(ctx->current_row - 14); j<(ctx->current_row + 15); j++) { y += size; x = 0; if (j >=0 && j < (cur->num_rows)) { - DrawRectangle(x, y, size * 2, size, BROWN); + DrawRectangle(x, y, size * 2, size, BROWN); DrawText(TextFormat("%02X",j), x, y, size, WHITE); x += 2 * size; for(uint8_t i = 0; i < ctx->module.num_channels; i++) { if (j==(ctx->current_row)) { - DrawRectangle(x, y, 8 * size, size, DARKGREEN); + DrawRectangle(x, y, 8 * size, size, DARKGREEN); } else { - DrawRectangle(x, y, 8 * size, size, DARKGRAY); + DrawRectangle(x, y, 8 * size, size, DARKGRAY); }; jar_xm_pattern_slot_t *s = cur->slots + j * ctx->module.num_channels + i; // jar_xm_channel_context_t *ch = ctx->channels + i; diff --git a/src/models.c b/src/models.c index fd7daee6f..bd200d5f7 100644 --- a/src/models.c +++ b/src/models.c @@ -828,16 +828,16 @@ void UnloadModelKeepMeshes(Model model) BoundingBox GetModelBoundingBox(Model model) { BoundingBox bounds = { 0 }; - + if (model.meshCount > 0) - { + { Vector3 temp = { 0 }; bounds = GetMeshBoundingBox(model.meshes[0]); - + for (int i = 1; i < model.meshCount; i++) { BoundingBox tempBounds = GetMeshBoundingBox(model.meshes[i]); - + temp.x = (bounds.min.x < tempBounds.min.x)? bounds.min.x : tempBounds.min.x; temp.y = (bounds.min.y < tempBounds.min.y)? bounds.min.y : tempBounds.min.y; temp.z = (bounds.min.z < tempBounds.min.z)? bounds.min.z : tempBounds.min.z; @@ -849,7 +849,7 @@ BoundingBox GetModelBoundingBox(Model model) bounds.max = temp; } } - + return bounds; } @@ -1105,7 +1105,7 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // transforms[0]: model transformation provided (includes DrawModel() params combined with model.transform) // rlGetMatrixTransform(): rlgl internal transform matrix due to push/pop matrix stack matModel = MatrixMultiply(transforms[0], rlGetMatrixTransform()); - + // Get model-view matrix matModelView = MatrixMultiply(matModel, matView); } @@ -1376,7 +1376,7 @@ Material *LoadMaterials(const char *fileName, int *materialCount) // Set materials shader to default (DIFFUSE, SPECULAR, NORMAL) if (materials != NULL) { - for (unsigned int i = 0; i < count; i++) + for (unsigned int i = 0; i < count; i++) { materials[i].shader.id = rlGetShaderIdDefault(); materials[i].shader.locs = rlGetShaderLocsDefault(); @@ -1396,7 +1396,7 @@ Material LoadMaterialDefault(void) // Using rlgl default shader material.shader.id = rlGetShaderIdDefault(); material.shader.locs = rlGetShaderLocsDefault(); - + // Using rlgl default texture (1x1 pixel, UNCOMPRESSED_R8G8B8A8, 1 mipmap) material.maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; //material.maps[MATERIAL_MAP_NORMAL].texture; // NOTE: By default, not set @@ -2825,7 +2825,7 @@ void GenMeshTangents(Mesh *mesh) RL_FREE(tan2); if (mesh->vboId != NULL) - { + { if (mesh->vboId[SHADER_LOC_VERTEX_TANGENT] != 0) { // Upate existing vertex buffer @@ -2834,15 +2834,15 @@ void GenMeshTangents(Mesh *mesh) else { // Load a new tangent attributes buffer - mesh->vboId[SHADER_LOC_VERTEX_TANGENT] = rlLoadVertexBuffer(mesh->tangents, mesh->vertexCount*4*sizeof(float), false); + mesh->vboId[SHADER_LOC_VERTEX_TANGENT] = rlLoadVertexBuffer(mesh->tangents, mesh->vertexCount*4*sizeof(float), false); } - + rlEnableVertexArray(mesh->vaoId); rlSetVertexAttribute(4, 4, RL_FLOAT, 0, 0, 0); rlEnableVertexAttribute(4); rlDisableVertexArray(); } - + TRACELOG(LOG_INFO, "MESH: Tangents data computed and uploaded for provided mesh"); } @@ -3370,7 +3370,7 @@ static Model LoadOBJ(const char *fileName) if (ret != TINYOBJ_SUCCESS) TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load OBJ data", fileName); else TRACELOG(LOG_INFO, "MODEL: [%s] OBJ data loaded successfully: %i meshes/%i materials", fileName, meshCount, materialCount); - model.meshCount = materialCount; + model.meshCount = materialCount; // Init model materials array if (materialCount > 0) @@ -3468,7 +3468,7 @@ static Model LoadOBJ(const char *fileName) // Get default texture, in case no texture is defined // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8 - model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; + model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; if (materials[m].diffuse_texname != NULL) model.materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = LoadTexture(materials[m].diffuse_texname); //char *diffuse_texname; // map_Kd diff --git a/src/raudio.c b/src/raudio.c index 072dc5d33..f48888a98 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1733,7 +1733,7 @@ void UpdateMusicStream(Music music) } UpdateAudioStream(music.stream, pcm, frameCountToStream); - + framesLeft -= frameCountToStream; if (framesLeft <= 0) diff --git a/src/raymath.h b/src/raymath.h index 0909eb7e5..3addc25de 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -1432,7 +1432,7 @@ RMDEF Quaternion QuaternionFromAxisAngle(Vector3 axis, float angle) { Quaternion result = { 0.0f, 0.0f, 0.0f, 1.0f }; float axisLength = sqrtf(axis.x*axis.x + axis.y*axis.y + axis.z*axis.z); - + if (axisLength != 0.0f) { angle *= 0.5f; diff --git a/src/rlgl.h b/src/rlgl.h index 9b705473f..7d9b8d140 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -41,7 +41,7 @@ * #define SUPPORT_GL_DETAILS_INFO * Show OpenGL extensions and capabilities detailed logs on init * -* rlgl capabilities could be customized just defining some internal +* rlgl capabilities could be customized just defining some internal * values before library inclusion (default values listed): * * #define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 8192 // Default internal render batch elements limits @@ -54,7 +54,7 @@ * #define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance * #define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance * -* When loading a shader, the following vertex attribute and uniform +* When loading a shader, the following vertex attribute and uniform * location names are tried to be set automatically: * * #define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Binded by default to shader location: 0 @@ -246,11 +246,11 @@ //---------------------------------------------------------------------------------- // Types and Structures Definition //---------------------------------------------------------------------------------- -typedef enum { - OPENGL_11 = 1, - OPENGL_21, - OPENGL_33, - OPENGL_ES_20 +typedef enum { + OPENGL_11 = 1, + OPENGL_21, + OPENGL_33, + OPENGL_ES_20 } rlGlVersion; typedef enum { @@ -1025,7 +1025,7 @@ void rlLoadIdentity(void) // Multiply the current matrix by a translation matrix void rlTranslatef(float x, float y, float z) { - Matrix matTranslation = { + Matrix matTranslation = { 1.0f, 0.0f, 0.0f, x, 0.0f, 1.0f, 0.0f, y, 0.0f, 0.0f, 1.0f, z, @@ -1041,7 +1041,7 @@ void rlTranslatef(float x, float y, float z) void rlRotatef(float angle, float x, float y, float z) { Matrix matRotation = rlMatrixIdentity(); - + // Axis vector (x, y, z) normalization float lengthSquared = x*x + y*y + z*z; if ((lengthSquared != 1.0f) && (lengthSquared != 0.0f)) @@ -1051,7 +1051,7 @@ void rlRotatef(float angle, float x, float y, float z) y *= inverseLength; z *= inverseLength; } - + // Rotation matrix generation float sinres = sinf(DEG2RAD*angle); float cosres = cosf(DEG2RAD*angle); @@ -1084,11 +1084,11 @@ void rlRotatef(float angle, float x, float y, float z) // Multiply the current matrix by a scaling matrix void rlScalef(float x, float y, float z) { - Matrix matScale = { + Matrix matScale = { x, 0.0f, 0.0f, 0.0f, 0.0f, y, 0.0f, 0.0f, 0.0f, 0.0f, z, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f + 0.0f, 0.0f, 0.0f, 1.0f }; // NOTE: We transpose matrix with multiplication order @@ -1145,7 +1145,7 @@ void rlOrtho(double left, double right, double bottom, double top, double znear, // NOTE: If left-right and top-botton values are equal it could create a division by zero, // response to it is platform/compiler dependant Matrix matOrtho = { 0 }; - + float rl = (float)(right - left); float tb = (float)(top - bottom); float fn = (float)(zfar - znear); @@ -1558,11 +1558,11 @@ void rlActiveDrawBuffers(int count) // it can be queried with glGet*() but it must be at least 8 //GLint maxDrawBuffers = 0; //glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers); - + if (count > 0) { if (count > 8) TRACELOG(LOG_WARNING, "GL: Max color buffers limited to 8"); - else + else { unsigned int buffers[8] = { GL_COLOR_ATTACHMENT0, @@ -2399,10 +2399,10 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // Create modelview-projection matrix and upload to shader Matrix matMVP = rlMatrixMultiply(RLGL.State.modelview, RLGL.State.projection); - float matMVPfloat[16] = { - matMVP.m0, matMVP.m1, matMVP.m2, matMVP.m3, - matMVP.m4, matMVP.m5, matMVP.m6, matMVP.m7, - matMVP.m8, matMVP.m9, matMVP.m10, matMVP.m11, + float matMVPfloat[16] = { + matMVP.m0, matMVP.m1, matMVP.m2, matMVP.m3, + matMVP.m4, matMVP.m5, matMVP.m6, matMVP.m7, + matMVP.m8, matMVP.m9, matMVP.m10, matMVP.m11, matMVP.m12, matMVP.m13, matMVP.m14, matMVP.m15 }; glUniformMatrix4fv(RLGL.State.currentShaderLocs[RL_SHADER_LOC_MATRIX_MVP], 1, false, matMVPfloat); @@ -3431,7 +3431,7 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); - + if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShaderId; else { @@ -3582,13 +3582,13 @@ unsigned int rlLoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId) program = 0; } - else + else { // Get the size of compiled shader program (not available on OpenGL ES 2.0) // NOTE: If GL_LINK_STATUS is GL_FALSE, program binary length is zero. //GLint binarySize = 0; //glGetProgramiv(id, GL_PROGRAM_BINARY_LENGTH, &binarySize); - + TRACELOG(RL_LOG_INFO, "SHADER: [ID %i] Program shader loaded successfully", program); } #endif @@ -3670,10 +3670,10 @@ void rlSetVertexAttributeDefault(int locIndex, const void *value, int attribType void rlSetUniformMatrix(int locIndex, Matrix mat) { #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - float matfloat[16] = { - mat.m0, mat.m1, mat.m2, mat.m3, - mat.m4, mat.m5, mat.m6, mat.m7, - mat.m8, mat.m9, mat.m10, mat.m11, + float matfloat[16] = { + mat.m0, mat.m1, mat.m2, mat.m3, + mat.m4, mat.m5, mat.m6, mat.m7, + mat.m8, mat.m9, mat.m10, mat.m11, mat.m12, mat.m13, mat.m14, mat.m15 }; glUniformMatrix4fv(locIndex, 1, false, matfloat); diff --git a/src/text.c b/src/text.c index 9d336f218..66a08eb19 100644 --- a/src/text.c +++ b/src/text.c @@ -899,9 +899,9 @@ void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, rlTranslatef(position.x, position.y, 0.0f); rlRotatef(rotation, 0.0f, 0.0f, 1.0f); rlTranslatef(-origin.x, -origin.y, 0.0f); - + DrawTextEx(font, text, (Vector2){ 0.0f, 0.0f }, fontSize, spacing, tint); - + rlPopMatrix(); } @@ -1002,7 +1002,7 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing } // Get index position for a unicode character on font -// NOTE: If codepoint is not found in the font it fallbacks to '?' +// NOTE: If codepoint is not found in the font it fallbacks to '?' int GetGlyphIndex(Font font, int codepoint) { #ifndef GLYPH_NOTFOUND_CHAR_FALLBACK @@ -1030,24 +1030,24 @@ int GetGlyphIndex(Font font, int codepoint) } // Get glyph font info data for a codepoint (unicode character) -// NOTE: If codepoint is not found in the font it fallbacks to '?' +// NOTE: If codepoint is not found in the font it fallbacks to '?' GlyphInfo GetGlyphInfo(Font font, int codepoint) { GlyphInfo info = { 0 }; - + info = font.chars[GetGlyphIndex(font, codepoint)]; - + return info; } // Get glyph rectangle in font atlas for a codepoint (unicode character) -// NOTE: If codepoint is not found in the font it fallbacks to '?' +// NOTE: If codepoint is not found in the font it fallbacks to '?' Rectangle GetGlyphAtlasRec(Font font, int codepoint) { Rectangle rec = { 0 }; - + rec = font.recs[GetGlyphIndex(font, codepoint)]; - + return rec; } diff --git a/src/textures.c b/src/textures.c index 2480bcfcc..6d5c2c5f4 100644 --- a/src/textures.c +++ b/src/textures.c @@ -382,7 +382,7 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i if (image.data != NULL) TRACELOG(LOG_INFO, "IMAGE: Data loaded successfully (%ix%i | %s | %i mipmaps)", image.width, image.height, rlGetPixelFormatName(image.format), image.mipmaps); else TRACELOG(LOG_WARNING, "IMAGE: Failed to load image data"); - + return image; } @@ -2419,28 +2419,28 @@ void ImageDrawPixelV(Image *dst, Vector2 position, Color color) // Draw line within an image void ImageDrawLine(Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color) { - // Using Bresenham's algorithm as described in + // Using Bresenham's algorithm as described in // Drawing Lines with Pixels - Joshua Scott - March 2012 // https://classic.csunplugged.org/wp-content/uploads/2014/12/Lines.pdf - + int changeInX = (endPosX - startPosX); int absChangeInX = (changeInX < 0)? -changeInX : changeInX; int changeInY = (endPosY - startPosY); int absChangeInY = (changeInY < 0)? -changeInY : changeInY; - + int startU, startV, endU, stepV; // Substitutions, either U = X, V = Y or vice versa. See loop at end of function //int endV; // Not needed but left for better understanding, check code below int A, B, P; // See linked paper above, explained down in the main loop int reversedXY = (absChangeInY < absChangeInX); - - if (reversedXY) + + if (reversedXY) { A = 2*absChangeInY; B = A - 2*absChangeInX; P = A - absChangeInX; if (changeInX > 0) - { + { startU = startPosX; startV = startPosY; endU = endPosX; @@ -2452,23 +2452,23 @@ void ImageDrawLine(Image *dst, int startPosX, int startPosY, int endPosX, int en startV = endPosY; endU = startPosX; //endV = startPosY; - + // Since start and end are reversed changeInX = -changeInX; changeInY = -changeInY; } - + stepV = (changeInY < 0)? -1 : 1; - + ImageDrawPixel(dst, startU, startV, color); // At this point they are correctly ordered... } else { - A = 2*absChangeInX; + A = 2*absChangeInX; B = A - 2*absChangeInY; P = A - absChangeInY; - - if (changeInY > 0) + + if (changeInY > 0) { startU = startPosY; startV = startPosX; @@ -2481,21 +2481,21 @@ void ImageDrawLine(Image *dst, int startPosX, int startPosY, int endPosX, int en startV = endPosX; endU = startPosY; //endV = startPosX; - + // Since start and end are reversed changeInX = -changeInX; changeInY = -changeInY; } - + stepV = (changeInX < 0)? -1 : 1; - + ImageDrawPixel(dst, startV, startU, color); // ... but need to be reversed here. Repeated in the main loop below - } - + } + // We already drew the start point. If we started at startU + 0, the line would be crooked and too short - for (int u = startU + 1, v = startV; u <= endU; u++) + for (int u = startU + 1, v = startV; u <= endU; u++) { - if (P >= 0) + if (P >= 0) { v += stepV; // Adjusts whenever we stray too far from the direct line. Details in the linked paper above P += B; // Remembers that we corrected our path From 6d20430ccc81cf2cb5caa39a097dee5875d810b6 Mon Sep 17 00:00:00 2001 From: atticus Date: Fri, 20 Aug 2021 12:47:51 +0300 Subject: [PATCH 052/570] add NULL check (#1925) --- src/extras/rmem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/extras/rmem.h b/src/extras/rmem.h index dbf417fe6..7f50adf8c 100644 --- a/src/extras/rmem.h +++ b/src/extras/rmem.h @@ -276,6 +276,7 @@ static void __InsertMemNode(MemPool *const mempool, AllocList *const list, MemNo mempool->arena.offs += iter->size; __RemoveMemNode(list, iter); iter = list->head; + if (iter == NULL) return; } const uintptr_t inode = ( uintptr_t )node; const uintptr_t iiter = ( uintptr_t )iter; From ff523d55ac8e7a715379e8493382a37f43531b85 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 20 Aug 2021 11:56:25 +0200 Subject: [PATCH 053/570] Updated raygui #1939 --- src/extras/raygui.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/extras/raygui.h b/src/extras/raygui.h index fdc8feeb1..95c74942f 100644 --- a/src/extras/raygui.h +++ b/src/extras/raygui.h @@ -137,6 +137,10 @@ #include "raylib.h" #endif +#ifndef RAYGUIDEF + #define RAYGUIDEF // We are building or using rlgl as a static library (or Linux shared library) +#endif + // Define functions scope to be used internally (static) or externally (extern) to the module including this file #if defined(_WIN32) // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll @@ -144,11 +148,7 @@ #define RAYGUIDEF __declspec(dllexport) // We are building raygui as a Win32 shared library (.dll) #elif defined(USE_LIBTYPE_SHARED) #define RAYGUIDEF __declspec(dllimport) // We are using raygui as a Win32 shared library (.dll) - #else - #define RAYGUIDEF // We are building or using raygui as a static library #endif -#else - #define RAYGUIDEF // We are building or using raygui as a static library (or Linux shared library) #endif #if !defined(RAYGUI_MALLOC) && !defined(RAYGUI_CALLOC) && !defined(RAYGUI_FREE) @@ -175,10 +175,6 @@ #define TEXTEDIT_CURSOR_BLINK_FRAMES 20 // Text edit controls cursor blink timming -#if defined(__cplusplus) -extern "C" { // Prevents name mangling of functions -#endif - //---------------------------------------------------------------------------------- // Types and Structures Definition // NOTE: Some types are required for RAYGUI_STANDALONE usage @@ -231,7 +227,7 @@ extern "C" { // Prevents name mangling of functions } Texture2D; // Font character info - typedef struct CharInfo CharInfo; + typedef struct GlyphInfo GlyphInfo; // TODO: Font type is very coupled to raylib, mostly required by GuiLoadStyle() // It should be redesigned to be provided by user @@ -240,7 +236,7 @@ extern "C" { // Prevents name mangling of functions int charsCount; // Number of characters Texture2D texture; // Characters texture atlas Rectangle *recs; // Characters rectangles in texture - CharInfo *chars; // Characters info data + GlyphInfo *chars; // Characters info data } Font; #endif @@ -412,6 +408,10 @@ typedef enum { // Module Functions Declaration //---------------------------------------------------------------------------------- +#if defined(__cplusplus) +extern "C" { // Prevents name mangling of functions +#endif + // State modification functions RAYGUIDEF void GuiEnable(void); // Enable gui controls (global state) RAYGUIDEF void GuiDisable(void); // Disable gui controls (global state) @@ -495,7 +495,6 @@ RAYGUIDEF void GuiClearIconPixel(int iconId, int x, int y); // Clear icon pi RAYGUIDEF bool GuiCheckIconPixel(int iconId, int x, int y); // Check icon pixel value #endif - #if defined(__cplusplus) } // Prevents name mangling of functions #endif @@ -1407,11 +1406,11 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) if ((GetTextWidth(text) < (maxWidth - GuiGetStyle(DEFAULT, TEXT_SIZE))) && (key >= 32)) { int byteLength = 0; - const char *textUtf8 = CodepointToUtf8(key, &byteLength); + const char *textUTF8 = CodepointToUTF8(key, &byteLength); for (int i = 0; i < byteLength; i++) { - text[keyCount] = textUtf8[i]; + text[keyCount] = textUTF8[i]; keyCount++; } @@ -2890,7 +2889,7 @@ void GuiLoadStyle(const char *fileName) for (int i = 0; i < font.charsCount; i++) fread(&font.recs[i], 1, sizeof(Rectangle), rgsFile); // Load font chars info data - font.chars = (CharInfo *)RAYGUI_CALLOC(font.charsCount, sizeof(CharInfo)); + font.chars = (GlyphInfo *)RAYGUI_CALLOC(font.charsCount, sizeof(GlyphInfo)); for (int i = 0; i < font.charsCount; i++) { fread(&font.chars[i].value, 1, sizeof(int), rgsFile); @@ -3640,8 +3639,8 @@ static int TextToInteger(const char *text) return value*sign; } -// Encode codepoint into utf8 text (char array length returned as parameter) -static const char *CodepointToUtf8(int codepoint, int *byteLength) +// Encode codepoint into UTF-8 text (char array length returned as parameter) +static const char *CodepointToUTF8(int codepoint, int *byteLength) { static char utf8[6] = { 0 }; int length = 0; From aefdb9f9cf10e768cc1818cf6ef7887110833810 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 21 Aug 2021 23:57:41 +0200 Subject: [PATCH 054/570] REMOVED: Old function names defines As far as next raylib version will be 4.0, no backward compatibility hacks will be maintained. --- src/raylib.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index c7b4b282b..11ff587df 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -134,6 +134,8 @@ // Other modules (raymath, rlgl) also require some of those types, so, // to be able to use those other modules as standalone (not depending on raylib) // this defines are very useful for internal check and avoid type (re)definitions +#define RL_COLOR_TYPE +#define RL_RECTANGLE_TYPE #define RL_VECTOR2_TYPE #define RL_VECTOR3_TYPE #define RL_VECTOR4_TYPE @@ -170,14 +172,6 @@ #define MAGENTA CLITERAL(Color){ 255, 0, 255, 255 } // Magenta #define RAYWHITE CLITERAL(Color){ 245, 245, 245, 255 } // My own White (raylib logo) -// WARNING: Temporal hacks to avoid breaking old codebases using -// deprecated raylib implementations or definitions -#define GetImageData LoadImageColors -#define FILTER_POINT TEXTURE_FILTER_POINT -#define FILTER_BILINEAR TEXTURE_FILTER_BILINEAR -#define MAP_DIFFUSE MATERIAL_MAP_DIFFUSE -#define UNCOMPRESSED_R8G8B8A8 PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 - //---------------------------------------------------------------------------------- // Structures Definition //---------------------------------------------------------------------------------- From d98779abef04088206cef7ccc291370ecc1a445e Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 22 Aug 2021 01:07:37 +0200 Subject: [PATCH 055/570] Minor tweak to avoid false error logs --- src/core.c | 7 +++++-- src/raylib.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core.c b/src/core.c index b03216cc2..27b6c31be 100644 --- a/src/core.c +++ b/src/core.c @@ -2281,8 +2281,11 @@ Shader LoadShader(const char *vsFileName, const char *fsFileName) { Shader shader = { 0 }; - char *vShaderStr = LoadFileText(vsFileName); - char *fShaderStr = LoadFileText(fsFileName); + char *vShaderStr = NULL; + char *fShaderStr = NULL; + + if (vsFileName != NULL) vShaderStr = LoadFileText(vsFileName); + if (fsFileName != NULL) fShaderStr = LoadFileText(fsFileName); shader = LoadShaderFromMemory(vShaderStr, fShaderStr); diff --git a/src/raylib.h b/src/raylib.h index 11ff587df..7613dd94c 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -318,7 +318,7 @@ typedef struct Mesh { int vertexCount; // Number of vertices stored in arrays int triangleCount; // Number of triangles stored (indexed or not) - // Default vertex data + // Vertex attributes data float *vertices; // Vertex position (XYZ - 3 components per vertex) (shader-location = 0) float *texcoords; // Vertex texture coordinates (UV - 2 components per vertex) (shader-location = 1) float *texcoords2; // Vertex second texture coordinates (useful for lightmaps) (shader-location = 5) From b154bc33f55bf7b7ad3fab5841a8d49043e2e979 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 22 Aug 2021 01:08:11 +0200 Subject: [PATCH 056/570] Added note on GLFW custom allocators for the future --- src/core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/core.c b/src/core.c index 27b6c31be..52245b80a 100644 --- a/src/core.c +++ b/src/core.c @@ -3583,6 +3583,17 @@ static bool InitGraphicsDevice(int width, int height) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) glfwSetErrorCallback(ErrorCallback); + /* + // Setup custom allocators to match raylib ones + const GLFWallocator allocator = { + .allocate = MemAlloc, + .deallocate = MemFree, + .reallocate = MemRealloc, + .user = NULL + }; + + glfwInitAllocator(&allocator); + */ #if defined(__APPLE__) glfwInitHint(GLFW_COCOA_CHDIR_RESOURCES, GLFW_FALSE); From 51fbde178fdc7d7f173cea8e918e630c49ae7bfe Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 22 Aug 2021 01:08:27 +0200 Subject: [PATCH 057/570] Update shaders_shapes_outline.c --- examples/shaders/shaders_shapes_outline.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/shaders/shaders_shapes_outline.c b/examples/shaders/shaders_shapes_outline.c index d70f7645d..3f02230e3 100644 --- a/examples/shaders/shaders_shapes_outline.c +++ b/examples/shaders/shaders_shapes_outline.c @@ -1,7 +1,7 @@ /******************************************************************************************* * * raylib [shaders] example - Apply an shdrOutline to a texture -* +* * NOTE: This example requires raylib OpenGL 3.3 or ES2 versions for shaders support, * OpenGL 1.1 does not support shaders, recompile raylib to OpenGL 3.3 version. * @@ -9,7 +9,7 @@ * * This example has been created using raylib 3.8 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) -* +* * Example contributed by Samuel Skiff (@GoldenThumbs) * * Copyright (c) 2021 Samuel SKiff (@GoldenThumbs) and Ramon Santamaria (@raysan5) @@ -31,11 +31,11 @@ int main(void) const int screenWidth = 800; const int screenHeight = 450; - InitWindow(screenWidth, screenHeight, "raylib [shaders] example - Apply an shdrOutline to a texture"); + InitWindow(screenWidth, screenHeight, "raylib [shaders] example - Apply an outline to a texture"); Texture2D egg = LoadTexture("resources/egg.png"); Texture2D torus = LoadTexture("resources/torus.png"); - Shader shdrOutline = LoadShader(0, TextFormat("resources/shaders/glsl%i/shdrOutline.fs", GLSL_VERSION)); + Shader shdrOutline = LoadShader(0, TextFormat("resources/shaders/glsl%i/outline.fs", GLSL_VERSION)); float outlineScale = 16.0f; float textureScale[2] = { 16.0f*4, 16.0f*4 }; From 45fd75952dd969e0d8f5aa778d6f0bf82aff0f63 Mon Sep 17 00:00:00 2001 From: Luiz Pestana Date: Mon, 23 Aug 2021 15:05:34 -0300 Subject: [PATCH 058/570] Revert "Ignore generated example binaries (#1884)" (#1946) This reverts commit 4a01139c8d87584b7d62a2c7d60b151d6be5ee9c. --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index dcfa5bce2..45d2d5a84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,6 @@ # Ignore generated files # ... -# Ignore all without extensions -* -!*.* -!*/ - # Ignore VIM's backup generated files *.swp *.swo From 7c1889c28205b83afaa39da73f1831a72bd9c502 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 24 Aug 2021 15:26:59 +0200 Subject: [PATCH 059/570] REVIEWED: Support mouse wheel on x-axis #1948 --- src/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core.c b/src/core.c index 52245b80a..aff8cdd35 100644 --- a/src/core.c +++ b/src/core.c @@ -5059,7 +5059,8 @@ static void MouseCursorPosCallback(GLFWwindow *window, double x, double y) // GLFW3 Srolling Callback, runs on mouse wheel static void MouseScrollCallback(GLFWwindow *window, double xoffset, double yoffset) { - CORE.Input.Mouse.currentWheelMove = (float)yoffset; + if (xoffset != 0.0) CORE.Input.Mouse.currentWheelMove = (float)xoffset; + else CORE.Input.Mouse.currentWheelMove = (float)yoffset; } // GLFW3 CursorEnter Callback, when cursor enters the window From 6575d31379045f34fa7d23b79d9adea2f18899e5 Mon Sep 17 00:00:00 2001 From: Laurentino Luna <81370009+fuserr7@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:34:52 -0300 Subject: [PATCH 060/570] Fix tcc not finding emmintrin.h (#1947) * Fix tcc not finding emmintrin.h This allows to compile raylib with tcc with no errors. * Remove __TINYC__ check from stb_image.h This will be placed under textures.c * Move tcc check to textures.c Avoiding to change stb_image.h --- src/textures.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/textures.c b/src/textures.c index 6d5c2c5f4..f8b693d60 100644 --- a/src/textures.c +++ b/src/textures.c @@ -102,6 +102,10 @@ #define STBI_NO_PIC #define STBI_NO_PNM // Image format .ppm and .pgm +#if defined(__TINYC__) + #define STBI_NO_SIMD +#endif + #if (defined(SUPPORT_FILEFORMAT_BMP) || \ defined(SUPPORT_FILEFORMAT_PNG) || \ defined(SUPPORT_FILEFORMAT_TGA) || \ From 913f185f82028c906fd65242c4375d97b8d0c919 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Aug 2021 00:22:16 +0200 Subject: [PATCH 061/570] Renamed some static functions for more consistent naming --- examples/text/text_rectangle_bounds.c | 18 ++++++++---------- examples/text/text_unicode.c | 12 ++++++------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index c763fb2ec..0da1a8ab3 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -13,8 +13,8 @@ #include "raylib.h" -static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits -static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection +static void DrawTextBoxed(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits +static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection // Main entry point int main(void) @@ -92,14 +92,12 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris ClearBackground(RAYWHITE); - DrawRectangleLinesEx(container, 3, borderColor); // Draw container border + DrawRectangleLinesEx(container, 3, borderColor); // Draw container border // Draw text in container (add some padding) - DrawTextRec(font, text, - (Rectangle){ container.x + 4, container.y + 4, container.width - 4, container.height - 4 }, - 20.0f, 2.0f, wordWrap, GRAY); + DrawTextBoxed(font, text, (Rectangle){ container.x + 4, container.y + 4, container.width - 4, container.height - 4 }, 20.0f, 2.0f, wordWrap, GRAY); - DrawRectangleRec(resizer, borderColor); // Draw the resize box + DrawRectangleRec(resizer, borderColor); // Draw the resize box // Draw bottom info DrawRectangle(0, screenHeight - 54, screenWidth, 54, GRAY); @@ -130,13 +128,13 @@ tempor incididunt ut labore et dolore magna aliqua. Nec ullamcorper sit amet ris //-------------------------------------------------------------------------------------- // Draw text using font inside rectangle limits -static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) +static void DrawTextBoxed(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) { - DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); + DrawTextBoxedSelectable(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); } // Draw text using font inside rectangle limits with support for text selection -static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) +static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) { int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop diff --git a/examples/text/text_unicode.c b/examples/text/text_unicode.c index 2954a28e1..883d2a5cd 100644 --- a/examples/text/text_unicode.c +++ b/examples/text/text_unicode.c @@ -133,8 +133,8 @@ struct { //-------------------------------------------------------------------------------------- static void RandomizeEmoji(void); // Fills the emoji array with random emojis -static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits -static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection +static void DrawTextBoxed(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits +static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection //-------------------------------------------------------------------------------------- // Global variables @@ -273,7 +273,7 @@ int main(int argc, char **argv) // Draw the main text message Rectangle textRect = { msgRect.x + horizontalPadding/2, msgRect.y + verticalPadding/2, msgRect.width - horizontalPadding, msgRect.height }; - DrawTextRec(*font, messages[message].text, textRect, (float)font->baseSize, 1.0f, true, WHITE); + DrawTextBoxed(*font, messages[message].text, textRect, (float)font->baseSize, 1.0f, true, WHITE); // Draw the info text below the main message int size = (int)strlen(messages[message].text); @@ -329,13 +329,13 @@ static void RandomizeEmoji(void) //-------------------------------------------------------------------------------------- // Draw text using font inside rectangle limits -static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) +static void DrawTextBoxed(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint) { - DrawTextRecEx(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); + DrawTextBoxedSelectable(font, text, rec, fontSize, spacing, wordWrap, tint, 0, 0, WHITE, WHITE); } // Draw text using font inside rectangle limits with support for text selection -static void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) +static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint) { int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop From a04dbe7ffd01701b810f317d1e5eda73c78f9789 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Aug 2021 00:41:48 +0200 Subject: [PATCH 062/570] Update shaders_shapes_outline.c --- examples/shaders/shaders_shapes_outline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/shaders/shaders_shapes_outline.c b/examples/shaders/shaders_shapes_outline.c index 3f02230e3..30194c4b7 100644 --- a/examples/shaders/shaders_shapes_outline.c +++ b/examples/shaders/shaders_shapes_outline.c @@ -63,7 +63,7 @@ int main(void) DrawTextureEx(torus, (Vector2){ 544, 230 }, 0.0, outlineScale, WHITE); EndShaderMode(); - DrawText("Shader-based shdrOutlines for textures", 190, 200, 20, LIGHTGRAY); + DrawText("Shader-based outlines for textures", 190, 200, 20, LIGHTGRAY); DrawFPS(710, 10); From 7749a2805c0f28762c206da0b7c954cbe9e318e2 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Aug 2021 00:51:37 +0200 Subject: [PATCH 063/570] UPDATED: raygui to latest version -WIP- Note this new raygui version embeds ricons and `GuiTextBoxMulti()` is not working properly --- examples/others/embedded_files_loading.c | 2 +- examples/others/resources/audio_data.h | 2 +- src/extras/raygui.h | 643 +++++++++++++++++++++-- src/extras/ricons.h | 556 -------------------- 4 files changed, 597 insertions(+), 606 deletions(-) delete mode 100644 src/extras/ricons.h diff --git a/examples/others/embedded_files_loading.c b/examples/others/embedded_files_loading.c index 60a2a6f0f..5923a9acd 100644 --- a/examples/others/embedded_files_loading.c +++ b/examples/others/embedded_files_loading.c @@ -31,7 +31,7 @@ int main(void) // Same as: Wave wave = LoadWave("sound.wav"); Wave wave = { .data = AUDIO_DATA, - .sampleCount = AUDIO_SAMPLE_COUNT, + .frameCount = AUDIO_FRAME_COUNT, .sampleRate = AUDIO_SAMPLE_RATE, .sampleSize = AUDIO_SAMPLE_SIZE, .channels = AUDIO_CHANNELS diff --git a/examples/others/resources/audio_data.h b/examples/others/resources/audio_data.h index abf344f3b..22cdacc72 100644 --- a/examples/others/resources/audio_data.h +++ b/examples/others/resources/audio_data.h @@ -11,7 +11,7 @@ ////////////////////////////////////////////////////////////////////////////////// // Wave data information -#define AUDIO_SAMPLE_COUNT 24367 +#define AUDIO_FRAME_COUNT 24367 #define AUDIO_SAMPLE_RATE 44100 #define AUDIO_SAMPLE_SIZE 32 #define AUDIO_CHANNELS 1 diff --git a/src/extras/raygui.h b/src/extras/raygui.h index 95c74942f..bb1919004 100644 --- a/src/extras/raygui.h +++ b/src/extras/raygui.h @@ -1,6 +1,6 @@ /******************************************************************************************* * -* raygui v2.9-dev - A simple and easy-to-use immediate-mode gui library +* raygui v3.0-dev - A simple and easy-to-use immediate-mode gui library * * DESCRIPTION: * @@ -54,21 +54,22 @@ * If not defined, the library is in header only mode and can be included in other headers * or source files without problems. But only ONE file should hold the implementation. * -* #define RAYGUI_STATIC (defined by default) -* The generated implementation will stay private inside implementation file and all -* internal symbols and functions will only be visible inside that file. -* * #define RAYGUI_STANDALONE * Avoid raylib.h header inclusion in this file. Data types defined on raylib are defined * internally in the library and input management and drawing functions must be provided by * the user (check library implementation for further details). * -* #define RAYGUI_SUPPORT_ICONS -* Includes riconsdata.h header defining a set of 128 icons (binary format) to be used on -* multiple controls and following raygui styles +* #define RAYGUI_SUPPORT_RICONS +* Includes embedded ricons data (binary format) and definitions (by default 256 16x16 pixels, 2KB) +* +* #define RAYGUI_SUPPORT_CUSTOM_RICONS +* Includes custom ricons.h header defining a set of custom icons, +* this file can be generated using rGuiIcons tool * * * VERSIONS HISTORY: +* +* 3.0-dev (22-Aug-2021) Integrated ricons data to avoid external file * 2.9 (17-Mar-2021) Removed tooltip API * 2.8 (03-May-2020) Centralized rectangles drawing to GuiDrawRectangle() * 2.7 (20-Feb-2020) Added possible tooltips API @@ -96,7 +97,8 @@ * 0.8 (27-Aug-2015) Initial release. Implemented by Kevin Gato, Daniel Nicolás and Ramon Santamaria. * * CONTRIBUTORS: -* Ramon Santamaria: Supervision, review, redesign, update and maintenance... +* +* Ramon Santamaria: Supervision, review, redesign, update and maintenance * Vlad Adrian: Complete rewrite of GuiTextBox() to support extended features (2019) * Sergio Martinez: Review, testing (2015) and redesign of multiple controls (2018) * Adria Arranz: Testing and Implementation of additional controls (2018) @@ -131,7 +133,7 @@ #ifndef RAYGUI_H #define RAYGUI_H -#define RAYGUI_VERSION "2.9-dev" +#define RAYGUI_VERSION "3.0-dev" #if !defined(RAYGUI_STANDALONE) #include "raylib.h" @@ -166,14 +168,6 @@ #define RAYGUI_FREE(p) free(p) #endif -//---------------------------------------------------------------------------------- -// Defines and Macros -//---------------------------------------------------------------------------------- -#define NUM_CONTROLS 16 // Number of standard controls -#define NUM_PROPS_DEFAULT 16 // Number of standard properties -#define NUM_PROPS_EXTENDED 8 // Number of extended properties - -#define TEXTEDIT_CURSOR_BLINK_FRAMES 20 // Text edit controls cursor blink timming //---------------------------------------------------------------------------------- // Types and Structures Definition @@ -236,7 +230,7 @@ int charsCount; // Number of characters Texture2D texture; // Characters texture atlas Rectangle *recs; // Characters rectangles in texture - GlyphInfo *chars; // Characters info data + GlyphInfo *chars; // Characters info data } Font; #endif @@ -471,7 +465,7 @@ RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha); RAYGUIDEF float GuiColorBarHue(Rectangle bounds, float value); // Color Bar Hue control // Styles loading functions -RAYGUIDEF void GuiLoadStyle(const char *fileName); // Load style file (.rgs) +RAYGUIDEF void GuiLoadStyle(const char *fileName); // Load style file over global style variable (.rgs) RAYGUIDEF void GuiLoadStyleDefault(void); // Load style default over global style /* @@ -482,7 +476,7 @@ RAYGUIDEF void UnloadGuiStyle(GuiStyle style); // Unload style RAYGUIDEF const char *GuiIconText(int iconId, const char *text); // Get text with icon id prepended (if supported) -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) // Gui icons functionality RAYGUIDEF void GuiDrawIcon(int iconId, Vector2 position, int pixelSize, Color color); @@ -509,11 +503,6 @@ RAYGUIDEF bool GuiCheckIconPixel(int iconId, int x, int y); // Check icon pi #if defined(RAYGUI_IMPLEMENTATION) -#if defined(RAYGUI_SUPPORT_ICONS) - #define RICONS_IMPLEMENTATION - #include "ricons.h" // Required for: raygui icons data -#endif - #include // Required for: FILE, fopen(), fclose(), fprintf(), feof(), fscanf(), vsprintf() #include // Required for: strlen() [GuiTextBox()] #include // Required for: roundf() [GuiColorPicker()] @@ -528,10 +517,566 @@ RAYGUIDEF bool GuiCheckIconPixel(int iconId, int x, int y); // Check icon pi #define RAYGUI_CLITERAL(name) (name) #endif +#if defined(RAYGUI_SUPPORT_RICONS) + +#if defined(RAYGUI_SUPPORT_CUSTOM_RICONS) + +#define RICONS_IMPLEMENTATION +#include "ricons.h" // External icons data provided, it can be generated with rGuiIcons tool + +#else // Embedded raygui icons, no external file provided + +#define RICON_SIZE 16 // Size of icons (squared) +#define RICON_MAX_ICONS 256 // Maximum number of icons +#define RICON_MAX_NAME_LENGTH 32 // Maximum length of icon name id + +// Icons data is defined by bit array (every bit represents one pixel) +// Those arrays are stored as unsigned int data arrays, so every array +// element defines 32 pixels (bits) of information +// Number of elemens depend on RICON_SIZE (by default 16x16 pixels) +#define RICON_DATA_ELEMENTS (RICON_SIZE*RICON_SIZE/32) + //---------------------------------------------------------------------------------- -// Defines and Macros +// Icons enumeration //---------------------------------------------------------------------------------- -//... +typedef enum { + RICON_NONE = 0, + RICON_FOLDER_FILE_OPEN = 1, + RICON_FILE_SAVE_CLASSIC = 2, + RICON_FOLDER_OPEN = 3, + RICON_FOLDER_SAVE = 4, + RICON_FILE_OPEN = 5, + RICON_FILE_SAVE = 6, + RICON_FILE_EXPORT = 7, + RICON_FILE_NEW = 8, + RICON_FILE_DELETE = 9, + RICON_FILETYPE_TEXT = 10, + RICON_FILETYPE_AUDIO = 11, + RICON_FILETYPE_IMAGE = 12, + RICON_FILETYPE_PLAY = 13, + RICON_FILETYPE_VIDEO = 14, + RICON_FILETYPE_INFO = 15, + RICON_FILE_COPY = 16, + RICON_FILE_CUT = 17, + RICON_FILE_PASTE = 18, + RICON_CURSOR_HAND = 19, + RICON_CURSOR_POINTER = 20, + RICON_CURSOR_CLASSIC = 21, + RICON_PENCIL = 22, + RICON_PENCIL_BIG = 23, + RICON_BRUSH_CLASSIC = 24, + RICON_BRUSH_PAINTER = 25, + RICON_WATER_DROP = 26, + RICON_COLOR_PICKER = 27, + RICON_RUBBER = 28, + RICON_COLOR_BUCKET = 29, + RICON_TEXT_T = 30, + RICON_TEXT_A = 31, + RICON_SCALE = 32, + RICON_RESIZE = 33, + RICON_FILTER_POINT = 34, + RICON_FILTER_BILINEAR = 35, + RICON_CROP = 36, + RICON_CROP_ALPHA = 37, + RICON_SQUARE_TOGGLE = 38, + RICON_SYMMETRY = 39, + RICON_SYMMETRY_HORIZONTAL = 40, + RICON_SYMMETRY_VERTICAL = 41, + RICON_LENS = 42, + RICON_LENS_BIG = 43, + RICON_EYE_ON = 44, + RICON_EYE_OFF = 45, + RICON_FILTER_TOP = 46, + RICON_FILTER = 47, + RICON_TARGET_POINT = 48, + RICON_TARGET_SMALL = 49, + RICON_TARGET_BIG = 50, + RICON_TARGET_MOVE = 51, + RICON_CURSOR_MOVE = 52, + RICON_CURSOR_SCALE = 53, + RICON_CURSOR_SCALE_RIGHT = 54, + RICON_CURSOR_SCALE_LEFT = 55, + RICON_UNDO = 56, + RICON_REDO = 57, + RICON_REREDO = 58, + RICON_MUTATE = 59, + RICON_ROTATE = 60, + RICON_REPEAT = 61, + RICON_SHUFFLE = 62, + RICON_EMPTYBOX = 63, + RICON_TARGET = 64, + RICON_TARGET_SMALL_FILL = 65, + RICON_TARGET_BIG_FILL = 66, + RICON_TARGET_MOVE_FILL = 67, + RICON_CURSOR_MOVE_FILL = 68, + RICON_CURSOR_SCALE_FILL = 69, + RICON_CURSOR_SCALE_RIGHT_FILL = 70, + RICON_CURSOR_SCALE_LEFT_FILL = 71, + RICON_UNDO_FILL = 72, + RICON_REDO_FILL = 73, + RICON_REREDO_FILL = 74, + RICON_MUTATE_FILL = 75, + RICON_ROTATE_FILL = 76, + RICON_REPEAT_FILL = 77, + RICON_SHUFFLE_FILL = 78, + RICON_EMPTYBOX_SMALL = 79, + RICON_BOX = 80, + RICON_BOX_TOP = 81, + RICON_BOX_TOP_RIGHT = 82, + RICON_BOX_RIGHT = 83, + RICON_BOX_BOTTOM_RIGHT = 84, + RICON_BOX_BOTTOM = 85, + RICON_BOX_BOTTOM_LEFT = 86, + RICON_BOX_LEFT = 87, + RICON_BOX_TOP_LEFT = 88, + RICON_BOX_CENTER = 89, + RICON_BOX_CIRCLE_MASK = 90, + RICON_POT = 91, + RICON_ALPHA_MULTIPLY = 92, + RICON_ALPHA_CLEAR = 93, + RICON_DITHERING = 94, + RICON_MIPMAPS = 95, + RICON_BOX_GRID = 96, + RICON_GRID = 97, + RICON_BOX_CORNERS_SMALL = 98, + RICON_BOX_CORNERS_BIG = 99, + RICON_FOUR_BOXES = 100, + RICON_GRID_FILL = 101, + RICON_BOX_MULTISIZE = 102, + RICON_ZOOM_SMALL = 103, + RICON_ZOOM_MEDIUM = 104, + RICON_ZOOM_BIG = 105, + RICON_ZOOM_ALL = 106, + RICON_ZOOM_CENTER = 107, + RICON_BOX_DOTS_SMALL = 108, + RICON_BOX_DOTS_BIG = 109, + RICON_BOX_CONCENTRIC = 110, + RICON_BOX_GRID_BIG = 111, + RICON_OK_TICK = 112, + RICON_CROSS = 113, + RICON_ARROW_LEFT = 114, + RICON_ARROW_RIGHT = 115, + RICON_ARROW_BOTTOM = 116, + RICON_ARROW_TOP = 117, + RICON_ARROW_LEFT_FILL = 118, + RICON_ARROW_RIGHT_FILL = 119, + RICON_ARROW_BOTTOM_FILL = 120, + RICON_ARROW_TOP_FILL = 121, + RICON_AUDIO = 122, + RICON_FX = 123, + RICON_WAVE = 124, + RICON_WAVE_SINUS = 125, + RICON_WAVE_SQUARE = 126, + RICON_WAVE_TRIANGULAR = 127, + RICON_CROSS_SMALL = 128, + RICON_PLAYER_PREVIOUS = 129, + RICON_PLAYER_PLAY_BACK = 130, + RICON_PLAYER_PLAY = 131, + RICON_PLAYER_PAUSE = 132, + RICON_PLAYER_STOP = 133, + RICON_PLAYER_NEXT = 134, + RICON_PLAYER_RECORD = 135, + RICON_MAGNET = 136, + RICON_LOCK_CLOSE = 137, + RICON_LOCK_OPEN = 138, + RICON_CLOCK = 139, + RICON_TOOLS = 140, + RICON_GEAR = 141, + RICON_GEAR_BIG = 142, + RICON_BIN = 143, + RICON_HAND_POINTER = 144, + RICON_LASER = 145, + RICON_COIN = 146, + RICON_EXPLOSION = 147, + RICON_1UP = 148, + RICON_PLAYER = 149, + RICON_PLAYER_JUMP = 150, + RICON_KEY = 151, + RICON_DEMON = 152, + RICON_TEXT_POPUP = 153, + RICON_GEAR_EX = 154, + RICON_CRACK = 155, + RICON_CRACK_POINTS = 156, + RICON_STAR = 157, + RICON_DOOR = 158, + RICON_EXIT = 159, + RICON_MODE_2D = 160, + RICON_MODE_3D = 161, + RICON_CUBE = 162, + RICON_CUBE_FACE_TOP = 163, + RICON_CUBE_FACE_LEFT = 164, + RICON_CUBE_FACE_FRONT = 165, + RICON_CUBE_FACE_BOTTOM = 166, + RICON_CUBE_FACE_RIGHT = 167, + RICON_CUBE_FACE_BACK = 168, + RICON_CAMERA = 169, + RICON_SPECIAL = 170, + RICON_LINK_NET = 171, + RICON_LINK_BOXES = 172, + RICON_LINK_MULTI = 173, + RICON_LINK = 174, + RICON_LINK_BROKE = 175, + RICON_TEXT_NOTES = 176, + RICON_NOTEBOOK = 177, + RICON_SUITCASE = 178, + RICON_SUITCASE_ZIP = 179, + RICON_MAILBOX = 180, + RICON_MONITOR = 181, + RICON_PRINTER = 182, + RICON_PHOTO_CAMERA = 183, + RICON_PHOTO_CAMERA_FLASH = 184, + RICON_HOUSE = 185, + RICON_HEART = 186, + RICON_CORNER = 187, + RICON_VERTICAL_BARS = 188, + RICON_VERTICAL_BARS_FILL = 189, + RICON_LIFE_BARS = 190, + RICON_INFO = 191, + RICON_CROSSLINE = 192, + RICON_HELP = 193, + RICON_FILETYPE_ALPHA = 194, + RICON_FILETYPE_HOME = 195, + RICON_LAYERS_VISIBLE = 196, + RICON_LAYERS = 197, + RICON_WINDOW = 198, + RICON_HIDPI = 199, + RICON_200 = 200, + RICON_201 = 201, + RICON_202 = 202, + RICON_203 = 203, + RICON_204 = 204, + RICON_205 = 205, + RICON_206 = 206, + RICON_207 = 207, + RICON_208 = 208, + RICON_209 = 209, + RICON_210 = 210, + RICON_211 = 211, + RICON_212 = 212, + RICON_213 = 213, + RICON_214 = 214, + RICON_215 = 215, + RICON_216 = 216, + RICON_217 = 217, + RICON_218 = 218, + RICON_219 = 219, + RICON_220 = 220, + RICON_221 = 221, + RICON_222 = 222, + RICON_223 = 223, + RICON_224 = 224, + RICON_225 = 225, + RICON_226 = 226, + RICON_227 = 227, + RICON_228 = 228, + RICON_229 = 229, + RICON_230 = 230, + RICON_231 = 231, + RICON_232 = 232, + RICON_233 = 233, + RICON_234 = 234, + RICON_235 = 235, + RICON_236 = 236, + RICON_237 = 237, + RICON_238 = 238, + RICON_239 = 239, + RICON_240 = 240, + RICON_241 = 241, + RICON_242 = 242, + RICON_243 = 243, + RICON_244 = 244, + RICON_245 = 245, + RICON_246 = 246, + RICON_247 = 247, + RICON_248 = 248, + RICON_249 = 249, + RICON_250 = 250, + RICON_251 = 251, + RICON_252 = 252, + RICON_253 = 253, + RICON_254 = 254, + RICON_255 = 255, +} guiIconName; + +//---------------------------------------------------------------------------------- +// Icons data (allocated on memory data section by default) +// NOTE: A new icon set could be loaded over this array using GuiLoadIcons(), +// just note that loaded icons set must be same RICON_SIZE +//---------------------------------------------------------------------------------- +static unsigned int guiIcons[RICON_MAX_ICONS*RICON_DATA_ELEMENTS] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_NONE + 0x3ff80000, 0x2f082008, 0x2042207e, 0x40027fc2, 0x40024002, 0x40024002, 0x40024002, 0x00007ffe, // RICON_FOLDER_FILE_OPEN + 0x3ffe0000, 0x44226422, 0x400247e2, 0x5ffa4002, 0x57ea500a, 0x500a500a, 0x40025ffa, 0x00007ffe, // RICON_FILE_SAVE_CLASSIC + 0x00000000, 0x0042007e, 0x40027fc2, 0x40024002, 0x41024002, 0x44424282, 0x793e4102, 0x00000100, // RICON_FOLDER_OPEN + 0x00000000, 0x0042007e, 0x40027fc2, 0x40024002, 0x41024102, 0x44424102, 0x793e4282, 0x00000000, // RICON_FOLDER_SAVE + 0x3ff00000, 0x201c2010, 0x20042004, 0x21042004, 0x24442284, 0x21042104, 0x20042104, 0x00003ffc, // RICON_FILE_OPEN + 0x3ff00000, 0x201c2010, 0x20042004, 0x21042004, 0x21042104, 0x22842444, 0x20042104, 0x00003ffc, // RICON_FILE_SAVE + 0x3ff00000, 0x201c2010, 0x00042004, 0x20041004, 0x20844784, 0x00841384, 0x20042784, 0x00003ffc, // RICON_FILE_EXPORT + 0x3ff00000, 0x201c2010, 0x20042004, 0x20042004, 0x22042204, 0x22042f84, 0x20042204, 0x00003ffc, // RICON_FILE_NEW + 0x3ff00000, 0x201c2010, 0x20042004, 0x20042004, 0x25042884, 0x25042204, 0x20042884, 0x00003ffc, // RICON_FILE_DELETE + 0x3ff00000, 0x201c2010, 0x20042004, 0x20042ff4, 0x20042ff4, 0x20042ff4, 0x20042004, 0x00003ffc, // RICON_FILETYPE_TEXT + 0x3ff00000, 0x201c2010, 0x27042004, 0x244424c4, 0x26442444, 0x20642664, 0x20042004, 0x00003ffc, // RICON_FILETYPE_AUDIO + 0x3ff00000, 0x201c2010, 0x26042604, 0x20042004, 0x35442884, 0x2414222c, 0x20042004, 0x00003ffc, // RICON_FILETYPE_IMAGE + 0x3ff00000, 0x201c2010, 0x20c42004, 0x22442144, 0x22442444, 0x20c42144, 0x20042004, 0x00003ffc, // RICON_FILETYPE_PLAY + 0x3ff00000, 0x3ffc2ff0, 0x3f3c2ff4, 0x3dbc2eb4, 0x3dbc2bb4, 0x3f3c2eb4, 0x3ffc2ff4, 0x00002ff4, // RICON_FILETYPE_VIDEO + 0x3ff00000, 0x201c2010, 0x21842184, 0x21842004, 0x21842184, 0x21842184, 0x20042184, 0x00003ffc, // RICON_FILETYPE_INFO + 0x0ff00000, 0x381c0810, 0x28042804, 0x28042804, 0x28042804, 0x28042804, 0x20102ffc, 0x00003ff0, // RICON_FILE_COPY + 0x00000000, 0x701c0000, 0x079c1e14, 0x55a000f0, 0x079c00f0, 0x701c1e14, 0x00000000, 0x00000000, // RICON_FILE_CUT + 0x01c00000, 0x13e41bec, 0x3f841004, 0x204420c4, 0x20442044, 0x20442044, 0x207c2044, 0x00003fc0, // RICON_FILE_PASTE + 0x00000000, 0x3aa00fe0, 0x2abc2aa0, 0x2aa42aa4, 0x20042aa4, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_CURSOR_HAND + 0x00000000, 0x003c000c, 0x030800c8, 0x30100c10, 0x10202020, 0x04400840, 0x01800280, 0x00000000, // RICON_CURSOR_POINTER + 0x00000000, 0x00180000, 0x01f00078, 0x03e007f0, 0x07c003e0, 0x04000e40, 0x00000000, 0x00000000, // RICON_CURSOR_CLASSIC + 0x00000000, 0x04000000, 0x11000a00, 0x04400a80, 0x01100220, 0x00580088, 0x00000038, 0x00000000, // RICON_PENCIL + 0x04000000, 0x15000a00, 0x50402880, 0x14102820, 0x05040a08, 0x015c028c, 0x007c00bc, 0x00000000, // RICON_PENCIL_BIG + 0x01c00000, 0x01400140, 0x01400140, 0x0ff80140, 0x0ff80808, 0x0aa80808, 0x0aa80aa8, 0x00000ff8, // RICON_BRUSH_CLASSIC + 0x1ffc0000, 0x5ffc7ffe, 0x40004000, 0x00807f80, 0x01c001c0, 0x01c001c0, 0x01c001c0, 0x00000080, // RICON_BRUSH_PAINTER + 0x00000000, 0x00800000, 0x01c00080, 0x03e001c0, 0x07f003e0, 0x036006f0, 0x000001c0, 0x00000000, // RICON_WATER_DROP + 0x00000000, 0x3e003800, 0x1f803f80, 0x0c201e40, 0x02080c10, 0x00840104, 0x00380044, 0x00000000, // RICON_COLOR_PICKER + 0x00000000, 0x07800300, 0x1fe00fc0, 0x3f883fd0, 0x0e021f04, 0x02040402, 0x00f00108, 0x00000000, // RICON_RUBBER + 0x00c00000, 0x02800140, 0x08200440, 0x20081010, 0x2ffe3004, 0x03f807fc, 0x00e001f0, 0x00000040, // RICON_COLOR_BUCKET + 0x00000000, 0x21843ffc, 0x01800180, 0x01800180, 0x01800180, 0x01800180, 0x03c00180, 0x00000000, // RICON_TEXT_T + 0x00800000, 0x01400180, 0x06200340, 0x0c100620, 0x1ff80c10, 0x380c1808, 0x70067004, 0x0000f80f, // RICON_TEXT_A + 0x78000000, 0x50004000, 0x00004800, 0x03c003c0, 0x03c003c0, 0x00100000, 0x0002000a, 0x0000000e, // RICON_SCALE + 0x75560000, 0x5e004002, 0x54001002, 0x41001202, 0x408200fe, 0x40820082, 0x40820082, 0x00006afe, // RICON_RESIZE + 0x00000000, 0x3f003f00, 0x3f003f00, 0x3f003f00, 0x00400080, 0x001c0020, 0x001c001c, 0x00000000, // RICON_FILTER_POINT + 0x6d800000, 0x00004080, 0x40804080, 0x40800000, 0x00406d80, 0x001c0020, 0x001c001c, 0x00000000, // RICON_FILTER_BILINEAR + 0x40080000, 0x1ffe2008, 0x14081008, 0x11081208, 0x10481088, 0x10081028, 0x10047ff8, 0x00001002, // RICON_CROP + 0x00100000, 0x3ffc0010, 0x2ab03550, 0x22b02550, 0x20b02150, 0x20302050, 0x2000fff0, 0x00002000, // RICON_CROP_ALPHA + 0x40000000, 0x1ff82000, 0x04082808, 0x01082208, 0x00482088, 0x00182028, 0x35542008, 0x00000002, // RICON_SQUARE_TOGGLE + 0x00000000, 0x02800280, 0x06c006c0, 0x0ea00ee0, 0x1e901eb0, 0x3e883e98, 0x7efc7e8c, 0x00000000, // RICON_SIMMETRY + 0x01000000, 0x05600100, 0x1d480d50, 0x7d423d44, 0x3d447d42, 0x0d501d48, 0x01000560, 0x00000100, // RICON_SIMMETRY_HORIZONTAL + 0x01800000, 0x04200240, 0x10080810, 0x00001ff8, 0x00007ffe, 0x0ff01ff8, 0x03c007e0, 0x00000180, // RICON_SIMMETRY_VERTICAL + 0x00000000, 0x010800f0, 0x02040204, 0x02040204, 0x07f00308, 0x1c000e00, 0x30003800, 0x00000000, // RICON_LENS + 0x00000000, 0x061803f0, 0x08240c0c, 0x08040814, 0x0c0c0804, 0x23f01618, 0x18002400, 0x00000000, // RICON_LENS_BIG + 0x00000000, 0x00000000, 0x1c7007c0, 0x638e3398, 0x1c703398, 0x000007c0, 0x00000000, 0x00000000, // RICON_EYE_ON + 0x00000000, 0x10002000, 0x04700fc0, 0x610e3218, 0x1c703098, 0x001007a0, 0x00000008, 0x00000000, // RICON_EYE_OFF + 0x00000000, 0x00007ffc, 0x40047ffc, 0x10102008, 0x04400820, 0x02800280, 0x02800280, 0x00000100, // RICON_FILTER_TOP + 0x00000000, 0x40027ffe, 0x10082004, 0x04200810, 0x02400240, 0x02400240, 0x01400240, 0x000000c0, // RICON_FILTER + 0x00800000, 0x00800080, 0x00000080, 0x3c9e0000, 0x00000000, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_POINT + 0x00800000, 0x00800080, 0x00800080, 0x3f7e01c0, 0x008001c0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_SMALL + 0x00800000, 0x00800080, 0x03e00080, 0x3e3e0220, 0x03e00220, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_BIG + 0x01000000, 0x04400280, 0x01000100, 0x43842008, 0x43849ab2, 0x01002008, 0x04400100, 0x01000280, // RICON_TARGET_MOVE + 0x01000000, 0x04400280, 0x01000100, 0x41042108, 0x41049ff2, 0x01002108, 0x04400100, 0x01000280, // RICON_CURSOR_MOVE + 0x781e0000, 0x500a4002, 0x04204812, 0x00000240, 0x02400000, 0x48120420, 0x4002500a, 0x0000781e, // RICON_CURSOR_SCALE + 0x00000000, 0x20003c00, 0x24002800, 0x01000200, 0x00400080, 0x00140024, 0x003c0004, 0x00000000, // RICON_CURSOR_SCALE_RIGHT + 0x00000000, 0x0004003c, 0x00240014, 0x00800040, 0x02000100, 0x28002400, 0x3c002000, 0x00000000, // RICON_CURSOR_SCALE_LEFT + 0x00000000, 0x00100020, 0x10101fc8, 0x10001020, 0x10001000, 0x10001000, 0x00001fc0, 0x00000000, // RICON_UNDO + 0x00000000, 0x08000400, 0x080813f8, 0x00080408, 0x00080008, 0x00080008, 0x000003f8, 0x00000000, // RICON_REDO + 0x00000000, 0x3ffc0000, 0x20042004, 0x20002000, 0x20402000, 0x3f902020, 0x00400020, 0x00000000, // RICON_REREDO + 0x00000000, 0x3ffc0000, 0x20042004, 0x27fc2004, 0x20202000, 0x3fc82010, 0x00200010, 0x00000000, // RICON_MUTATE + 0x00000000, 0x0ff00000, 0x10081818, 0x11801008, 0x10001180, 0x18101020, 0x00100fc8, 0x00000020, // RICON_ROTATE + 0x00000000, 0x04000200, 0x240429fc, 0x20042204, 0x20442004, 0x3f942024, 0x00400020, 0x00000000, // RICON_REPEAT + 0x00000000, 0x20001000, 0x22104c0e, 0x00801120, 0x11200040, 0x4c0e2210, 0x10002000, 0x00000000, // RICON_SHUFFLE + 0x7ffe0000, 0x50024002, 0x44024802, 0x41024202, 0x40424082, 0x40124022, 0x4002400a, 0x00007ffe, // RICON_EMPTYBOX + 0x00800000, 0x03e00080, 0x08080490, 0x3c9e0808, 0x08080808, 0x03e00490, 0x00800080, 0x00000000, // RICON_TARGET + 0x00800000, 0x00800080, 0x00800080, 0x3ffe01c0, 0x008001c0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_SMALL_FILL + 0x00800000, 0x00800080, 0x03e00080, 0x3ffe03e0, 0x03e003e0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_BIG_FILL + 0x01000000, 0x07c00380, 0x01000100, 0x638c2008, 0x638cfbbe, 0x01002008, 0x07c00100, 0x01000380, // RICON_TARGET_MOVE_FILL + 0x01000000, 0x07c00380, 0x01000100, 0x610c2108, 0x610cfffe, 0x01002108, 0x07c00100, 0x01000380, // RICON_CURSOR_MOVE_FILL + 0x781e0000, 0x6006700e, 0x04204812, 0x00000240, 0x02400000, 0x48120420, 0x700e6006, 0x0000781e, // RICON_CURSOR_SCALE_FILL + 0x00000000, 0x38003c00, 0x24003000, 0x01000200, 0x00400080, 0x000c0024, 0x003c001c, 0x00000000, // RICON_CURSOR_SCALE_RIGHT + 0x00000000, 0x001c003c, 0x0024000c, 0x00800040, 0x02000100, 0x30002400, 0x3c003800, 0x00000000, // RICON_CURSOR_SCALE_LEFT + 0x00000000, 0x00300020, 0x10301ff8, 0x10001020, 0x10001000, 0x10001000, 0x00001fc0, 0x00000000, // RICON_UNDO_FILL + 0x00000000, 0x0c000400, 0x0c081ff8, 0x00080408, 0x00080008, 0x00080008, 0x000003f8, 0x00000000, // RICON_REDO_FILL + 0x00000000, 0x3ffc0000, 0x20042004, 0x20002000, 0x20402000, 0x3ff02060, 0x00400060, 0x00000000, // RICON_REREDO_FILL + 0x00000000, 0x3ffc0000, 0x20042004, 0x27fc2004, 0x20202000, 0x3ff82030, 0x00200030, 0x00000000, // RICON_MUTATE_FILL + 0x00000000, 0x0ff00000, 0x10081818, 0x11801008, 0x10001180, 0x18301020, 0x00300ff8, 0x00000020, // RICON_ROTATE_FILL + 0x00000000, 0x06000200, 0x26042ffc, 0x20042204, 0x20442004, 0x3ff42064, 0x00400060, 0x00000000, // RICON_REPEAT_FILL + 0x00000000, 0x30001000, 0x32107c0e, 0x00801120, 0x11200040, 0x7c0e3210, 0x10003000, 0x00000000, // RICON_SHUFFLE_FILL + 0x00000000, 0x30043ffc, 0x24042804, 0x21042204, 0x20442084, 0x20142024, 0x3ffc200c, 0x00000000, // RICON_EMPTYBOX_SMALL + 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX + 0x00000000, 0x23c43ffc, 0x23c423c4, 0x200423c4, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP + 0x00000000, 0x3e043ffc, 0x3e043e04, 0x20043e04, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP_RIGHT + 0x00000000, 0x20043ffc, 0x20042004, 0x3e043e04, 0x3e043e04, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_RIGHT + 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x3e042004, 0x3e043e04, 0x3ffc3e04, 0x00000000, // RICON_BOX_BOTTOM_RIGHT + 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x23c42004, 0x23c423c4, 0x3ffc23c4, 0x00000000, // RICON_BOX_BOTTOM + 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x207c2004, 0x207c207c, 0x3ffc207c, 0x00000000, // RICON_BOX_BOTTOM_LEFT + 0x00000000, 0x20043ffc, 0x20042004, 0x207c207c, 0x207c207c, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_LEFT + 0x00000000, 0x207c3ffc, 0x207c207c, 0x2004207c, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP_LEFT + 0x00000000, 0x20043ffc, 0x20042004, 0x23c423c4, 0x23c423c4, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_CIRCLE_MASK + 0x7ffe0000, 0x40024002, 0x47e24182, 0x4ff247e2, 0x47e24ff2, 0x418247e2, 0x40024002, 0x00007ffe, // RICON_BOX_CENTER + 0x7fff0000, 0x40014001, 0x40014001, 0x49555ddd, 0x4945495d, 0x400149c5, 0x40014001, 0x00007fff, // RICON_POT + 0x7ffe0000, 0x53327332, 0x44ce4cce, 0x41324332, 0x404e40ce, 0x48125432, 0x4006540e, 0x00007ffe, // RICON_ALPHA_MULTIPLY + 0x7ffe0000, 0x53327332, 0x44ce4cce, 0x41324332, 0x5c4e40ce, 0x44124432, 0x40065c0e, 0x00007ffe, // RICON_ALPHA_CLEAR + 0x7ffe0000, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x00007ffe, // RICON_DITHERING + 0x07fe0000, 0x1ffa0002, 0x7fea000a, 0x402a402a, 0x5b2a512a, 0x5128552a, 0x40205128, 0x00007fe0, // RICON_MIPMAPS + 0x00000000, 0x1ff80000, 0x12481248, 0x12481ff8, 0x1ff81248, 0x12481248, 0x00001ff8, 0x00000000, // RICON_BOX_GRID + 0x12480000, 0x7ffe1248, 0x12481248, 0x12487ffe, 0x7ffe1248, 0x12481248, 0x12487ffe, 0x00001248, // RICON_GRID + 0x00000000, 0x1c380000, 0x1c3817e8, 0x08100810, 0x08100810, 0x17e81c38, 0x00001c38, 0x00000000, // RICON_BOX_CORNERS_SMALL + 0x700e0000, 0x700e5ffa, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x5ffa700e, 0x0000700e, // RICON_BOX_CORNERS_BIG + 0x3f7e0000, 0x21422142, 0x21422142, 0x00003f7e, 0x21423f7e, 0x21422142, 0x3f7e2142, 0x00000000, // RICON_FOUR_BOXES + 0x00000000, 0x3bb80000, 0x3bb83bb8, 0x3bb80000, 0x3bb83bb8, 0x3bb80000, 0x3bb83bb8, 0x00000000, // RICON_GRID_FILL + 0x7ffe0000, 0x7ffe7ffe, 0x77fe7000, 0x77fe77fe, 0x777e7700, 0x777e777e, 0x777e777e, 0x0000777e, // RICON_BOX_MULTISIZE + 0x781e0000, 0x40024002, 0x00004002, 0x01800000, 0x00000180, 0x40020000, 0x40024002, 0x0000781e, // RICON_ZOOM_SMALL + 0x781e0000, 0x40024002, 0x00004002, 0x03c003c0, 0x03c003c0, 0x40020000, 0x40024002, 0x0000781e, // RICON_ZOOM_MEDIUM + 0x781e0000, 0x40024002, 0x07e04002, 0x07e007e0, 0x07e007e0, 0x400207e0, 0x40024002, 0x0000781e, // RICON_ZOOM_BIG + 0x781e0000, 0x5ffa4002, 0x1ff85ffa, 0x1ff81ff8, 0x1ff81ff8, 0x5ffa1ff8, 0x40025ffa, 0x0000781e, // RICON_ZOOM_ALL + 0x00000000, 0x2004381c, 0x00002004, 0x00000000, 0x00000000, 0x20040000, 0x381c2004, 0x00000000, // RICON_ZOOM_CENTER + 0x00000000, 0x1db80000, 0x10081008, 0x10080000, 0x00001008, 0x10081008, 0x00001db8, 0x00000000, // RICON_BOX_DOTS_SMALL + 0x35560000, 0x00002002, 0x00002002, 0x00002002, 0x00002002, 0x00002002, 0x35562002, 0x00000000, // RICON_BOX_DOTS_BIG + 0x7ffe0000, 0x40024002, 0x48124ff2, 0x49924812, 0x48124992, 0x4ff24812, 0x40024002, 0x00007ffe, // RICON_BOX_CONCENTRIC + 0x00000000, 0x10841ffc, 0x10841084, 0x1ffc1084, 0x10841084, 0x10841084, 0x00001ffc, 0x00000000, // RICON_BOX_GRID_BIG + 0x00000000, 0x00000000, 0x10000000, 0x04000800, 0x01040200, 0x00500088, 0x00000020, 0x00000000, // RICON_OK_TICK + 0x00000000, 0x10080000, 0x04200810, 0x01800240, 0x02400180, 0x08100420, 0x00001008, 0x00000000, // RICON_CROSS + 0x00000000, 0x02000000, 0x00800100, 0x00200040, 0x00200010, 0x00800040, 0x02000100, 0x00000000, // RICON_ARROW_LEFT + 0x00000000, 0x00400000, 0x01000080, 0x04000200, 0x04000800, 0x01000200, 0x00400080, 0x00000000, // RICON_ARROW_RIGHT + 0x00000000, 0x00000000, 0x00000000, 0x08081004, 0x02200410, 0x00800140, 0x00000000, 0x00000000, // RICON_ARROW_BOTTOM + 0x00000000, 0x00000000, 0x01400080, 0x04100220, 0x10040808, 0x00000000, 0x00000000, 0x00000000, // RICON_ARROW_TOP + 0x00000000, 0x02000000, 0x03800300, 0x03e003c0, 0x03e003f0, 0x038003c0, 0x02000300, 0x00000000, // RICON_ARROW_LEFT_FILL + 0x00000000, 0x00400000, 0x01c000c0, 0x07c003c0, 0x07c00fc0, 0x01c003c0, 0x004000c0, 0x00000000, // RICON_ARROW_RIGHT_FILL + 0x00000000, 0x00000000, 0x00000000, 0x0ff81ffc, 0x03e007f0, 0x008001c0, 0x00000000, 0x00000000, // RICON_ARROW_BOTTOM_FILL + 0x00000000, 0x00000000, 0x01c00080, 0x07f003e0, 0x1ffc0ff8, 0x00000000, 0x00000000, 0x00000000, // RICON_ARROW_TOP_FILL + 0x00000000, 0x18a008c0, 0x32881290, 0x24822686, 0x26862482, 0x12903288, 0x08c018a0, 0x00000000, // RICON_AUDIO + 0x00000000, 0x04800780, 0x004000c0, 0x662000f0, 0x08103c30, 0x130a0e18, 0x0000318e, 0x00000000, // RICON_FX + 0x00000000, 0x00800000, 0x08880888, 0x2aaa0a8a, 0x0a8a2aaa, 0x08880888, 0x00000080, 0x00000000, // RICON_WAVE + 0x00000000, 0x00600000, 0x01080090, 0x02040108, 0x42044204, 0x24022402, 0x00001800, 0x00000000, // RICON_WAVE_SINUS + 0x00000000, 0x07f80000, 0x04080408, 0x04080408, 0x04080408, 0x7c0e0408, 0x00000000, 0x00000000, // RICON_WAVE_SQUARE + 0x00000000, 0x00000000, 0x00a00040, 0x22084110, 0x08021404, 0x00000000, 0x00000000, 0x00000000, // RICON_WAVE_TRIANGULAR + 0x00000000, 0x00000000, 0x04200000, 0x01800240, 0x02400180, 0x00000420, 0x00000000, 0x00000000, // RICON_CROSS_SMALL + 0x00000000, 0x18380000, 0x12281428, 0x10a81128, 0x112810a8, 0x14281228, 0x00001838, 0x00000000, // RICON_PLAYER_PREVIOUS + 0x00000000, 0x18000000, 0x11801600, 0x10181060, 0x10601018, 0x16001180, 0x00001800, 0x00000000, // RICON_PLAYER_PLAY_BACK + 0x00000000, 0x00180000, 0x01880068, 0x18080608, 0x06081808, 0x00680188, 0x00000018, 0x00000000, // RICON_PLAYER_PLAY + 0x00000000, 0x1e780000, 0x12481248, 0x12481248, 0x12481248, 0x12481248, 0x00001e78, 0x00000000, // RICON_PLAYER_PAUSE + 0x00000000, 0x1ff80000, 0x10081008, 0x10081008, 0x10081008, 0x10081008, 0x00001ff8, 0x00000000, // RICON_PLAYER_STOP + 0x00000000, 0x1c180000, 0x14481428, 0x15081488, 0x14881508, 0x14281448, 0x00001c18, 0x00000000, // RICON_PLAYER_NEXT + 0x00000000, 0x03c00000, 0x08100420, 0x10081008, 0x10081008, 0x04200810, 0x000003c0, 0x00000000, // RICON_PLAYER_RECORD + 0x00000000, 0x0c3007e0, 0x13c81818, 0x14281668, 0x14281428, 0x1c381c38, 0x08102244, 0x00000000, // RICON_MAGNET + 0x07c00000, 0x08200820, 0x3ff80820, 0x23882008, 0x21082388, 0x20082108, 0x1ff02008, 0x00000000, // RICON_LOCK_CLOSE + 0x07c00000, 0x08000800, 0x3ff80800, 0x23882008, 0x21082388, 0x20082108, 0x1ff02008, 0x00000000, // RICON_LOCK_OPEN + 0x01c00000, 0x0c180770, 0x3086188c, 0x60832082, 0x60034781, 0x30062002, 0x0c18180c, 0x01c00770, // RICON_CLOCK + 0x0a200000, 0x1b201b20, 0x04200e20, 0x04200420, 0x04700420, 0x0e700e70, 0x0e700e70, 0x04200e70, // RICON_TOOLS + 0x01800000, 0x3bdc318c, 0x0ff01ff8, 0x7c3e1e78, 0x1e787c3e, 0x1ff80ff0, 0x318c3bdc, 0x00000180, // RICON_GEAR + 0x01800000, 0x3ffc318c, 0x1c381ff8, 0x781e1818, 0x1818781e, 0x1ff81c38, 0x318c3ffc, 0x00000180, // RICON_GEAR_BIG + 0x00000000, 0x08080ff8, 0x08081ffc, 0x0aa80aa8, 0x0aa80aa8, 0x0aa80aa8, 0x08080aa8, 0x00000ff8, // RICON_BIN + 0x00000000, 0x00000000, 0x20043ffc, 0x08043f84, 0x04040f84, 0x04040784, 0x000007fc, 0x00000000, // RICON_HAND_POINTER + 0x00000000, 0x24400400, 0x00001480, 0x6efe0e00, 0x00000e00, 0x24401480, 0x00000400, 0x00000000, // RICON_LASER + 0x00000000, 0x03c00000, 0x08300460, 0x11181118, 0x11181118, 0x04600830, 0x000003c0, 0x00000000, // RICON_COIN + 0x00000000, 0x10880080, 0x06c00810, 0x366c07e0, 0x07e00240, 0x00001768, 0x04200240, 0x00000000, // RICON_EXPLOSION + 0x00000000, 0x3d280000, 0x2528252c, 0x3d282528, 0x05280528, 0x05e80528, 0x00000000, 0x00000000, // RICON_1UP + 0x01800000, 0x03c003c0, 0x018003c0, 0x0ff007e0, 0x0bd00bd0, 0x0a500bd0, 0x02400240, 0x02400240, // RICON_PLAYER + 0x01800000, 0x03c003c0, 0x118013c0, 0x03c81ff8, 0x07c003c8, 0x04400440, 0x0c080478, 0x00000000, // RICON_PLAYER_JUMP + 0x3ff80000, 0x30183ff8, 0x30183018, 0x3ff83ff8, 0x03000300, 0x03c003c0, 0x03e00300, 0x000003e0, // RICON_KEY + 0x3ff80000, 0x3ff83ff8, 0x33983ff8, 0x3ff83398, 0x3ff83ff8, 0x00000540, 0x0fe00aa0, 0x00000fe0, // RICON_DEMON + 0x00000000, 0x0ff00000, 0x20041008, 0x25442004, 0x10082004, 0x06000bf0, 0x00000300, 0x00000000, // RICON_TEXT_POPUP + 0x00000000, 0x11440000, 0x07f00be8, 0x1c1c0e38, 0x1c1c0c18, 0x07f00e38, 0x11440be8, 0x00000000, // RICON_GEAR_EX + 0x00000000, 0x20080000, 0x0c601010, 0x07c00fe0, 0x07c007c0, 0x0c600fe0, 0x20081010, 0x00000000, // RICON_CRACK + 0x00000000, 0x20080000, 0x0c601010, 0x04400fe0, 0x04405554, 0x0c600fe0, 0x20081010, 0x00000000, // RICON_CRACK_POINTS + 0x00000000, 0x00800080, 0x01c001c0, 0x1ffc3ffe, 0x03e007f0, 0x07f003e0, 0x0c180770, 0x00000808, // RICON_STAR + 0x0ff00000, 0x08180810, 0x08100818, 0x0a100810, 0x08180810, 0x08100818, 0x08100810, 0x00001ff8, // RICON_DOOR + 0x0ff00000, 0x08100810, 0x08100810, 0x10100010, 0x4f902010, 0x10102010, 0x08100010, 0x00000ff0, // RICON_EXIT + 0x00040000, 0x001f000e, 0x0ef40004, 0x12f41284, 0x0ef41214, 0x10040004, 0x7ffc3004, 0x10003000, // RICON_MODE_2D + 0x78040000, 0x501f600e, 0x0ef44004, 0x12f41284, 0x0ef41284, 0x10140004, 0x7ffc300c, 0x10003000, // RICON_MODE_3D + 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // RICON_CUBE + 0x7fe00000, 0x5ff87ff0, 0x47fe4ffc, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // RICON_CUBE_FACE_TOP + 0x7fe00000, 0x50386030, 0x47fe483c, 0x443e443e, 0x443e443e, 0x241e75fe, 0x0c06140e, 0x000007fe, // RICON_CUBE_FACE_LEFT + 0x7fe00000, 0x50286030, 0x47fe4804, 0x47fe47fe, 0x47fe47fe, 0x27fe77fe, 0x0ffe17fe, 0x000007fe, // RICON_CUBE_FACE_FRONT + 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x3ff27fe2, 0x0ffe1ffa, 0x000007fe, // RICON_CUBE_FACE_BOTTOM + 0x7fe00000, 0x70286030, 0x7ffe7804, 0x7c227c02, 0x7c227c22, 0x3c127de2, 0x0c061c0a, 0x000007fe, // RICON_CUBE_FACE_RIGHT + 0x7fe00000, 0x7fe87ff0, 0x7ffe7fe4, 0x7fe27fe2, 0x7fe27fe2, 0x24127fe2, 0x0c06140a, 0x000007fe, // RICON_CUBE_FACE_BACK + 0x00000000, 0x2a0233fe, 0x22022602, 0x22022202, 0x2a022602, 0x00a033fe, 0x02080110, 0x00000000, // RICON_CAMERA + 0x00000000, 0x200c3ffc, 0x000c000c, 0x3ffc000c, 0x30003000, 0x30003000, 0x3ffc3004, 0x00000000, // RICON_SPECIAL + 0x00000000, 0x0022003e, 0x012201e2, 0x0100013e, 0x01000100, 0x79000100, 0x4f004900, 0x00007800, // RICON_LINK_NET + 0x00000000, 0x44007c00, 0x45004600, 0x00627cbe, 0x00620022, 0x45007cbe, 0x44004600, 0x00007c00, // RICON_LINK_BOXES + 0x00000000, 0x0044007c, 0x0010007c, 0x3f100010, 0x3f1021f0, 0x3f100010, 0x3f0021f0, 0x00000000, // RICON_LINK_MULTI + 0x00000000, 0x0044007c, 0x00440044, 0x0010007c, 0x00100010, 0x44107c10, 0x440047f0, 0x00007c00, // RICON_LINK + 0x00000000, 0x0044007c, 0x00440044, 0x0000007c, 0x00000010, 0x44007c10, 0x44004550, 0x00007c00, // RICON_LINK_BROKE + 0x02a00000, 0x22a43ffc, 0x20042004, 0x20042ff4, 0x20042ff4, 0x20042ff4, 0x20042004, 0x00003ffc, // RICON_TEXT_NOTES + 0x3ffc0000, 0x20042004, 0x245e27c4, 0x27c42444, 0x2004201e, 0x201e2004, 0x20042004, 0x00003ffc, // RICON_NOTEBOOK + 0x00000000, 0x07e00000, 0x04200420, 0x24243ffc, 0x24242424, 0x24242424, 0x3ffc2424, 0x00000000, // RICON_SUITCASE + 0x00000000, 0x0fe00000, 0x08200820, 0x40047ffc, 0x7ffc5554, 0x40045554, 0x7ffc4004, 0x00000000, // RICON_SUITCASE_ZIP + 0x00000000, 0x20043ffc, 0x3ffc2004, 0x13c81008, 0x100813c8, 0x10081008, 0x1ff81008, 0x00000000, // RICON_MAILBOX + 0x00000000, 0x40027ffe, 0x5ffa5ffa, 0x5ffa5ffa, 0x40025ffa, 0x03c07ffe, 0x1ff81ff8, 0x00000000, // RICON_MONITOR + 0x0ff00000, 0x6bfe7ffe, 0x7ffe7ffe, 0x68167ffe, 0x08106816, 0x08100810, 0x0ff00810, 0x00000000, // RICON_PRINTER + 0x3ff80000, 0xfffe2008, 0x870a8002, 0x904a888a, 0x904a904a, 0x870a888a, 0xfffe8002, 0x00000000, // RICON_PHOTO_CAMERA + 0x0fc00000, 0xfcfe0cd8, 0x8002fffe, 0x84428382, 0x84428442, 0x80028382, 0xfffe8002, 0x00000000, // RICON_PHOTO_CAMERA_FLASH + 0x00000000, 0x02400180, 0x08100420, 0x20041008, 0x23c42004, 0x22442244, 0x3ffc2244, 0x00000000, // RICON_HOUSE + 0x00000000, 0x1c700000, 0x3ff83ef8, 0x3ff83ff8, 0x0fe01ff0, 0x038007c0, 0x00000100, 0x00000000, // RICON_HEART + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0xe000c000, // RICON_CORNER + 0x00000000, 0x14001c00, 0x15c01400, 0x15401540, 0x155c1540, 0x15541554, 0x1ddc1554, 0x00000000, // RICON_VERTICAL_BARS + 0x00000000, 0x03000300, 0x1b001b00, 0x1b601b60, 0x1b6c1b60, 0x1b6c1b6c, 0x1b6c1b6c, 0x00000000, // RICON_VERTICAL_BARS_FILL + 0x00000000, 0x00000000, 0x403e7ffe, 0x7ffe403e, 0x7ffe0000, 0x43fe43fe, 0x00007ffe, 0x00000000, // RICON_LIFE_BARS + 0x7ffc0000, 0x43844004, 0x43844284, 0x43844004, 0x42844284, 0x42844284, 0x40044384, 0x00007ffc, // RICON_INFO + 0x40008000, 0x10002000, 0x04000800, 0x01000200, 0x00400080, 0x00100020, 0x00040008, 0x00010002, // RICON_CROSSLINE + 0x00000000, 0x1ff01ff0, 0x18301830, 0x1f001830, 0x03001f00, 0x00000300, 0x03000300, 0x00000000, // RICON_HELP + 0x3ff00000, 0x2abc3550, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x00003ffc, // RICON_FILETYPE_ALPHA + 0x3ff00000, 0x201c2010, 0x22442184, 0x28142424, 0x29942814, 0x2ff42994, 0x20042004, 0x00003ffc, // RICON_FILETYPE_HOME + 0x07fe0000, 0x04020402, 0x7fe20402, 0x44224422, 0x44224422, 0x402047fe, 0x40204020, 0x00007fe0, // RICON_LAYERS_VISIBLE + 0x07fe0000, 0x04020402, 0x7c020402, 0x44024402, 0x44024402, 0x402047fe, 0x40204020, 0x00007fe0, // RICON_LAYERS + 0x00000000, 0x40027ffe, 0x7ffe4002, 0x40024002, 0x40024002, 0x40024002, 0x7ffe4002, 0x00000000, // RICON_WINDOW + 0x09100000, 0x09f00910, 0x09100910, 0x00000910, 0x24a2779e, 0x27a224a2, 0x709e20a2, 0x00000000, // RICON_HIDPI + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_200 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_201 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_202 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_203 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_204 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_205 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_206 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_207 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_208 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_209 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_210 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_211 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_212 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_213 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_214 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_215 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_216 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_217 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_218 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_219 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_220 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_221 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_222 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_223 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_224 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_225 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_226 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_227 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_228 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_229 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_230 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_231 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_232 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_233 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_234 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_235 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_236 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_237 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_238 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_239 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_240 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_241 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_242 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_243 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_244 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_245 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_246 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_247 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_248 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_249 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_250 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_251 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_252 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_253 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_254 + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_255 +}; + +#endif // RAYGUI_SUPPORT_CUSTOM_RICONS + +#endif // RAYGUI_SUPPORT_RICONS + +#ifndef RICON_SIZE + #define RICON_SIZE 0 +#endif + +#define RAYGUI_MAX_CONTROLS 16 // Maximum number of standard controls +#define RAYGUI_MAX_PROPS_DEFAULT 16 // Maximum number of standard properties +#define RAYGUI_MAX_PROPS_EXTENDED 8 // Maximum number of extended properties + +// TODO: Avoid animations and time-based states +// Functions using it: GuiTextBox(), GuiValueBox(), GuiTextBoxMulti() +#define TEXTEDIT_CURSOR_BLINK_FRAMES 20 // Text edit controls cursor blink timming //---------------------------------------------------------------------------------- // Types and Structures Definition @@ -552,7 +1097,7 @@ static float guiAlpha = 1.0f; // Gui element transpacency on drawing // NOTE: In raygui we manage a single int array with all the possible style properties. // When a new style is loaded, it loads over the global style... but default gui style // could always be recovered with GuiLoadStyleDefault() -static unsigned int guiStyle[NUM_CONTROLS*(NUM_PROPS_DEFAULT + NUM_PROPS_EXTENDED)] = { 0 }; +static unsigned int guiStyle[RAYGUI_MAX_CONTROLS*(RAYGUI_MAX_PROPS_DEFAULT + RAYGUI_MAX_PROPS_EXTENDED)] = { 0 }; static bool guiStyleLoaded = false; // Style loaded flag for lazy style initialization //---------------------------------------------------------------------------------- @@ -593,7 +1138,7 @@ static void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color static void DrawTriangle(Vector2 v1, Vector2 v2, Vector2 v3, Color color); // -- GuiDropdownBox(), GuiScrollBar() static void DrawTextureRec(Texture2D texture, Rectangle sourceRec, Vector2 position, Color tint); // -- GuiImageButtonEx() -static void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // -- GuiTextBoxMulti() +//static void DrawTextBoxed(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // -- GuiTextBoxMulti() //------------------------------------------------------------------------------- // Text required functions @@ -692,12 +1237,12 @@ Font GuiGetFont(void) void GuiSetStyle(int control, int property, int value) { if (!guiStyleLoaded) GuiLoadStyleDefault(); - guiStyle[control*(NUM_PROPS_DEFAULT + NUM_PROPS_EXTENDED) + property] = value; + guiStyle[control*(RAYGUI_MAX_PROPS_DEFAULT + RAYGUI_MAX_PROPS_EXTENDED) + property] = value; // Default properties are propagated to all controls - if ((control == 0) && (property < NUM_PROPS_DEFAULT)) + if ((control == 0) && (property < RAYGUI_MAX_PROPS_DEFAULT)) { - for (int i = 1; i < NUM_CONTROLS; i++) guiStyle[i*(NUM_PROPS_DEFAULT + NUM_PROPS_EXTENDED) + property] = value; + for (int i = 1; i < RAYGUI_MAX_CONTROLS; i++) guiStyle[i*(RAYGUI_MAX_PROPS_DEFAULT + RAYGUI_MAX_PROPS_EXTENDED) + property] = value; } } @@ -705,7 +1250,7 @@ void GuiSetStyle(int control, int property, int value) int GuiGetStyle(int control, int property) { if (!guiStyleLoaded) GuiLoadStyleDefault(); - return guiStyle[control*(NUM_PROPS_DEFAULT + NUM_PROPS_EXTENDED) + property]; + return guiStyle[control*(RAYGUI_MAX_PROPS_DEFAULT + RAYGUI_MAX_PROPS_EXTENDED) + property]; } //---------------------------------------------------------------------------------- @@ -746,7 +1291,7 @@ bool GuiWindowBox(Rectangle bounds, const char *title) int tempTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT); GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_CENTER); -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) clicked = GuiButton(closeButtonRec, GuiIconText(RICON_CROSS_SMALL, NULL)); #else clicked = GuiButton(closeButtonRec, "x"); @@ -1533,7 +2078,7 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in GuiSetStyle(BUTTON, BORDER_WIDTH, GuiGetStyle(SPINNER, BORDER_WIDTH)); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_CENTER); -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) if (GuiButton(leftButtonBound, GuiIconText(RICON_ARROW_LEFT_FILL, NULL))) tempValue--; if (GuiButton(rightButtonBound, GuiIconText(RICON_ARROW_RIGHT_FILL, NULL))) tempValue++; #else @@ -1806,7 +2351,9 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) } else GuiDrawRectangle(bounds, 1, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), BLANK); - DrawTextRec(guiFont, text, textAreaBounds, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), true, Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + // TODO: Review to support boxed text with word-wrap + //DrawTextBoxed(guiFont, text, textAreaBounds, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), true, Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + DrawTextEx(guiFont, text, (Vector2){ textAreaBounds.x, textAreaBounds.y }, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); //-------------------------------------------------------------------- return pressed; @@ -2839,7 +3386,7 @@ void GuiLoadStyle(const char *fileName) // NOTE: All DEFAULT properties should be defined first in the file GuiSetStyle(0, (int)propertyId, propertyValue); - if (propertyId < NUM_PROPS_DEFAULT) for (int i = 1; i < NUM_CONTROLS; i++) GuiSetStyle(i, (int)propertyId, propertyValue); + if (propertyId < RAYGUI_MAX_PROPS_DEFAULT) for (int i = 1; i < RAYGUI_MAX_CONTROLS; i++) GuiSetStyle(i, (int)propertyId, propertyValue); } else GuiSetStyle((int)controlId, (int)propertyId, propertyValue); } @@ -2997,7 +3544,7 @@ void GuiLoadStyleDefault(void) // a number that can change between ricon versions const char *GuiIconText(int iconId, const char *text) { -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) static char buffer[1024] = { 0 }; memset(buffer, 0, 1024); @@ -3018,7 +3565,7 @@ const char *GuiIconText(int iconId, const char *text) #endif } -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) // Get full icons data pointer unsigned int *GuiGetIcons(void) { return guiIcons; } @@ -3164,7 +3711,7 @@ bool GuiCheckIconPixel(int iconId, int x, int y) return (BIT_CHECK(guiIcons[iconId*8 + y/2], x + (y%2*16))); } -#endif // RAYGUI_SUPPORT_ICONS +#endif // RAYGUI_SUPPORT_RICONS //---------------------------------------------------------------------------------- // Module specific Functions Definition @@ -3213,7 +3760,7 @@ static Rectangle GetTextBounds(int control, Rectangle bounds) // NOTE: We support up to 999 values for iconId static const char *GetTextIcon(const char *text, int *iconId) { -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) *iconId = -1; if (text[0] == '#') // Maybe we have an icon! { @@ -3252,7 +3799,7 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color // Get text position depending on alignment and iconId //--------------------------------------------------------------------------------- - #define ICON_TEXT_PADDING 4 + #define RICON_TEXT_PADDING 4 Vector2 position = { bounds.x, bounds.y }; @@ -3260,15 +3807,15 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color int textWidth = GetTextWidth(text); int textHeight = GuiGetStyle(DEFAULT, TEXT_SIZE); -#if defined(RAYGUI_SUPPORT_ICONS) + // If text requires an icon, add size to measure if (iconId >= 0) { textWidth += RICON_SIZE; // WARNING: If only icon provided, text could be pointing to eof character! - if ((text != NULL) && (text[0] != '\0')) textWidth += ICON_TEXT_PADDING; + if ((text != NULL) && (text[0] != '\0')) textWidth += RICON_TEXT_PADDING; } -#endif + // Check guiTextAlign global variables switch (alignment) { @@ -3298,12 +3845,12 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color // Draw text (with icon if available) //--------------------------------------------------------------------------------- -#if defined(RAYGUI_SUPPORT_ICONS) +#if defined(RAYGUI_SUPPORT_RICONS) if (iconId >= 0) { // NOTE: We consider icon height, probably different than text size GuiDrawIcon(iconId, RAYGUI_CLITERAL(Vector2){ position.x, bounds.y + bounds.height/2 - RICON_SIZE/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height) }, 1, tint); - position.x += (RICON_SIZE + ICON_TEXT_PADDING); + position.x += (RICON_SIZE + RICON_TEXT_PADDING); } #endif DrawTextEx(guiFont, text, position, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), tint); diff --git a/src/extras/ricons.h b/src/extras/ricons.h deleted file mode 100644 index 121cf5432..000000000 --- a/src/extras/ricons.h +++ /dev/null @@ -1,556 +0,0 @@ -/********************************************************************************************** -* -* rIcons - Icons pack intended for tools development with raygui -* -* LICENSE: zlib/libpng -* -* Copyright (c) 2019-2020 Ramon Santamaria (@raysan5) -* -**********************************************************************************************/ - -#ifndef RICONS_H -#define RICONS_H - -//---------------------------------------------------------------------------------- -// Defines and Macros -//---------------------------------------------------------------------------------- -#define RICON_MAX_ICONS 256 // Maximum number of icons -#define RICON_SIZE 16 // Size of icons (squared) - -#define RICON_MAX_NAME_LENGTH 32 // Maximum length of icon name id - -// Icons data is defined by bit array (every bit represents one pixel) -// Those arrays are stored as unsigned int data arrays, so every array -// element defines 32 pixels (bits) of information -// Number of elemens depend on RICON_SIZE (by default 16x16 pixels) -#define RICON_DATA_ELEMENTS (RICON_SIZE*RICON_SIZE/32) - -//---------------------------------------------------------------------------------- -// Icons enumeration -//---------------------------------------------------------------------------------- -typedef enum { - RICON_NONE = 0, - RICON_FOLDER_FILE_OPEN = 1, - RICON_FILE_SAVE_CLASSIC = 2, - RICON_FOLDER_OPEN = 3, - RICON_FOLDER_SAVE = 4, - RICON_FILE_OPEN = 5, - RICON_FILE_SAVE = 6, - RICON_FILE_EXPORT = 7, - RICON_FILE_NEW = 8, - RICON_FILE_DELETE = 9, - RICON_FILETYPE_TEXT = 10, - RICON_FILETYPE_AUDIO = 11, - RICON_FILETYPE_IMAGE = 12, - RICON_FILETYPE_PLAY = 13, - RICON_FILETYPE_VIDEO = 14, - RICON_FILETYPE_INFO = 15, - RICON_FILE_COPY = 16, - RICON_FILE_CUT = 17, - RICON_FILE_PASTE = 18, - RICON_CURSOR_HAND = 19, - RICON_CURSOR_POINTER = 20, - RICON_CURSOR_CLASSIC = 21, - RICON_PENCIL = 22, - RICON_PENCIL_BIG = 23, - RICON_BRUSH_CLASSIC = 24, - RICON_BRUSH_PAINTER = 25, - RICON_WATER_DROP = 26, - RICON_COLOR_PICKER = 27, - RICON_RUBBER = 28, - RICON_COLOR_BUCKET = 29, - RICON_TEXT_T = 30, - RICON_TEXT_A = 31, - RICON_SCALE = 32, - RICON_RESIZE = 33, - RICON_FILTER_POINT = 34, - RICON_FILTER_BILINEAR = 35, - RICON_CROP = 36, - RICON_CROP_ALPHA = 37, - RICON_SQUARE_TOGGLE = 38, - RICON_SYMMETRY = 39, - RICON_SYMMETRY_HORIZONTAL = 40, - RICON_SYMMETRY_VERTICAL = 41, - RICON_LENS = 42, - RICON_LENS_BIG = 43, - RICON_EYE_ON = 44, - RICON_EYE_OFF = 45, - RICON_FILTER_TOP = 46, - RICON_FILTER = 47, - RICON_TARGET_POINT = 48, - RICON_TARGET_SMALL = 49, - RICON_TARGET_BIG = 50, - RICON_TARGET_MOVE = 51, - RICON_CURSOR_MOVE = 52, - RICON_CURSOR_SCALE = 53, - RICON_CURSOR_SCALE_RIGHT = 54, - RICON_CURSOR_SCALE_LEFT = 55, - RICON_UNDO = 56, - RICON_REDO = 57, - RICON_REREDO = 58, - RICON_MUTATE = 59, - RICON_ROTATE = 60, - RICON_REPEAT = 61, - RICON_SHUFFLE = 62, - RICON_EMPTYBOX = 63, - RICON_TARGET = 64, - RICON_TARGET_SMALL_FILL = 65, - RICON_TARGET_BIG_FILL = 66, - RICON_TARGET_MOVE_FILL = 67, - RICON_CURSOR_MOVE_FILL = 68, - RICON_CURSOR_SCALE_FILL = 69, - RICON_CURSOR_SCALE_RIGHT_FILL = 70, - RICON_CURSOR_SCALE_LEFT_FILL = 71, - RICON_UNDO_FILL = 72, - RICON_REDO_FILL = 73, - RICON_REREDO_FILL = 74, - RICON_MUTATE_FILL = 75, - RICON_ROTATE_FILL = 76, - RICON_REPEAT_FILL = 77, - RICON_SHUFFLE_FILL = 78, - RICON_EMPTYBOX_SMALL = 79, - RICON_BOX = 80, - RICON_BOX_TOP = 81, - RICON_BOX_TOP_RIGHT = 82, - RICON_BOX_RIGHT = 83, - RICON_BOX_BOTTOM_RIGHT = 84, - RICON_BOX_BOTTOM = 85, - RICON_BOX_BOTTOM_LEFT = 86, - RICON_BOX_LEFT = 87, - RICON_BOX_TOP_LEFT = 88, - RICON_BOX_CENTER = 89, - RICON_BOX_CIRCLE_MASK = 90, - RICON_POT = 91, - RICON_ALPHA_MULTIPLY = 92, - RICON_ALPHA_CLEAR = 93, - RICON_DITHERING = 94, - RICON_MIPMAPS = 95, - RICON_BOX_GRID = 96, - RICON_GRID = 97, - RICON_BOX_CORNERS_SMALL = 98, - RICON_BOX_CORNERS_BIG = 99, - RICON_FOUR_BOXES = 100, - RICON_GRID_FILL = 101, - RICON_BOX_MULTISIZE = 102, - RICON_ZOOM_SMALL = 103, - RICON_ZOOM_MEDIUM = 104, - RICON_ZOOM_BIG = 105, - RICON_ZOOM_ALL = 106, - RICON_ZOOM_CENTER = 107, - RICON_BOX_DOTS_SMALL = 108, - RICON_BOX_DOTS_BIG = 109, - RICON_BOX_CONCENTRIC = 110, - RICON_BOX_GRID_BIG = 111, - RICON_OK_TICK = 112, - RICON_CROSS = 113, - RICON_ARROW_LEFT = 114, - RICON_ARROW_RIGHT = 115, - RICON_ARROW_BOTTOM = 116, - RICON_ARROW_TOP = 117, - RICON_ARROW_LEFT_FILL = 118, - RICON_ARROW_RIGHT_FILL = 119, - RICON_ARROW_BOTTOM_FILL = 120, - RICON_ARROW_TOP_FILL = 121, - RICON_AUDIO = 122, - RICON_FX = 123, - RICON_WAVE = 124, - RICON_WAVE_SINUS = 125, - RICON_WAVE_SQUARE = 126, - RICON_WAVE_TRIANGULAR = 127, - RICON_CROSS_SMALL = 128, - RICON_PLAYER_PREVIOUS = 129, - RICON_PLAYER_PLAY_BACK = 130, - RICON_PLAYER_PLAY = 131, - RICON_PLAYER_PAUSE = 132, - RICON_PLAYER_STOP = 133, - RICON_PLAYER_NEXT = 134, - RICON_PLAYER_RECORD = 135, - RICON_MAGNET = 136, - RICON_LOCK_CLOSE = 137, - RICON_LOCK_OPEN = 138, - RICON_CLOCK = 139, - RICON_TOOLS = 140, - RICON_GEAR = 141, - RICON_GEAR_BIG = 142, - RICON_BIN = 143, - RICON_HAND_POINTER = 144, - RICON_LASER = 145, - RICON_COIN = 146, - RICON_EXPLOSION = 147, - RICON_1UP = 148, - RICON_PLAYER = 149, - RICON_PLAYER_JUMP = 150, - RICON_KEY = 151, - RICON_DEMON = 152, - RICON_TEXT_POPUP = 153, - RICON_GEAR_EX = 154, - RICON_CRACK = 155, - RICON_CRACK_POINTS = 156, - RICON_STAR = 157, - RICON_DOOR = 158, - RICON_EXIT = 159, - RICON_MODE_2D = 160, - RICON_MODE_3D = 161, - RICON_CUBE = 162, - RICON_CUBE_FACE_TOP = 163, - RICON_CUBE_FACE_LEFT = 164, - RICON_CUBE_FACE_FRONT = 165, - RICON_CUBE_FACE_BOTTOM = 166, - RICON_CUBE_FACE_RIGHT = 167, - RICON_CUBE_FACE_BACK = 168, - RICON_CAMERA = 169, - RICON_SPECIAL = 170, - RICON_LINK_NET = 171, - RICON_LINK_BOXES = 172, - RICON_LINK_MULTI = 173, - RICON_LINK = 174, - RICON_LINK_BROKE = 175, - RICON_TEXT_NOTES = 176, - RICON_NOTEBOOK = 177, - RICON_SUITCASE = 178, - RICON_SUITCASE_ZIP = 179, - RICON_MAILBOX = 180, - RICON_MONITOR = 181, - RICON_PRINTER = 182, - RICON_PHOTO_CAMERA = 183, - RICON_PHOTO_CAMERA_FLASH = 184, - RICON_HOUSE = 185, - RICON_HEART = 186, - RICON_CORNER = 187, - RICON_VERTICAL_BARS = 188, - RICON_VERTICAL_BARS_FILL = 189, - RICON_LIFE_BARS = 190, - RICON_INFO = 191, - RICON_CROSSLINE = 192, - RICON_HELP = 193, - RICON_FILETYPE_ALPHA = 194, - RICON_FILETYPE_HOME = 195, - RICON_LAYERS_VISIBLE = 196, - RICON_LAYERS = 197, - RICON_WINDOW = 198, - RICON_HIDPI = 199, - RICON_200 = 200, - RICON_201 = 201, - RICON_202 = 202, - RICON_203 = 203, - RICON_204 = 204, - RICON_205 = 205, - RICON_206 = 206, - RICON_207 = 207, - RICON_208 = 208, - RICON_209 = 209, - RICON_210 = 210, - RICON_211 = 211, - RICON_212 = 212, - RICON_213 = 213, - RICON_214 = 214, - RICON_215 = 215, - RICON_216 = 216, - RICON_217 = 217, - RICON_218 = 218, - RICON_219 = 219, - RICON_220 = 220, - RICON_221 = 221, - RICON_222 = 222, - RICON_223 = 223, - RICON_224 = 224, - RICON_225 = 225, - RICON_226 = 226, - RICON_227 = 227, - RICON_228 = 228, - RICON_229 = 229, - RICON_230 = 230, - RICON_231 = 231, - RICON_232 = 232, - RICON_233 = 233, - RICON_234 = 234, - RICON_235 = 235, - RICON_236 = 236, - RICON_237 = 237, - RICON_238 = 238, - RICON_239 = 239, - RICON_240 = 240, - RICON_241 = 241, - RICON_242 = 242, - RICON_243 = 243, - RICON_244 = 244, - RICON_245 = 245, - RICON_246 = 246, - RICON_247 = 247, - RICON_248 = 248, - RICON_249 = 249, - RICON_250 = 250, - RICON_251 = 251, - RICON_252 = 252, - RICON_253 = 253, - RICON_254 = 254, - RICON_255 = 255, -} guiIconName; - -#endif // RICONS_H - -#if defined(RICONS_IMPLEMENTATION) -//---------------------------------------------------------------------------------- -// Icons data (allocated on memory data section by default) -// NOTE: A new icon set could be loaded over this array using GuiLoadIcons(), -// just note that loaded icons set must be same RICON_SIZE -//---------------------------------------------------------------------------------- -static unsigned int guiIcons[RICON_MAX_ICONS*RICON_DATA_ELEMENTS] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_NONE - 0x3ff80000, 0x2f082008, 0x2042207e, 0x40027fc2, 0x40024002, 0x40024002, 0x40024002, 0x00007ffe, // RICON_FOLDER_FILE_OPEN - 0x3ffe0000, 0x44226422, 0x400247e2, 0x5ffa4002, 0x57ea500a, 0x500a500a, 0x40025ffa, 0x00007ffe, // RICON_FILE_SAVE_CLASSIC - 0x00000000, 0x0042007e, 0x40027fc2, 0x40024002, 0x41024002, 0x44424282, 0x793e4102, 0x00000100, // RICON_FOLDER_OPEN - 0x00000000, 0x0042007e, 0x40027fc2, 0x40024002, 0x41024102, 0x44424102, 0x793e4282, 0x00000000, // RICON_FOLDER_SAVE - 0x3ff00000, 0x201c2010, 0x20042004, 0x21042004, 0x24442284, 0x21042104, 0x20042104, 0x00003ffc, // RICON_FILE_OPEN - 0x3ff00000, 0x201c2010, 0x20042004, 0x21042004, 0x21042104, 0x22842444, 0x20042104, 0x00003ffc, // RICON_FILE_SAVE - 0x3ff00000, 0x201c2010, 0x00042004, 0x20041004, 0x20844784, 0x00841384, 0x20042784, 0x00003ffc, // RICON_FILE_EXPORT - 0x3ff00000, 0x201c2010, 0x20042004, 0x20042004, 0x22042204, 0x22042f84, 0x20042204, 0x00003ffc, // RICON_FILE_NEW - 0x3ff00000, 0x201c2010, 0x20042004, 0x20042004, 0x25042884, 0x25042204, 0x20042884, 0x00003ffc, // RICON_FILE_DELETE - 0x3ff00000, 0x201c2010, 0x20042004, 0x20042ff4, 0x20042ff4, 0x20042ff4, 0x20042004, 0x00003ffc, // RICON_FILETYPE_TEXT - 0x3ff00000, 0x201c2010, 0x27042004, 0x244424c4, 0x26442444, 0x20642664, 0x20042004, 0x00003ffc, // RICON_FILETYPE_AUDIO - 0x3ff00000, 0x201c2010, 0x26042604, 0x20042004, 0x35442884, 0x2414222c, 0x20042004, 0x00003ffc, // RICON_FILETYPE_IMAGE - 0x3ff00000, 0x201c2010, 0x20c42004, 0x22442144, 0x22442444, 0x20c42144, 0x20042004, 0x00003ffc, // RICON_FILETYPE_PLAY - 0x3ff00000, 0x3ffc2ff0, 0x3f3c2ff4, 0x3dbc2eb4, 0x3dbc2bb4, 0x3f3c2eb4, 0x3ffc2ff4, 0x00002ff4, // RICON_FILETYPE_VIDEO - 0x3ff00000, 0x201c2010, 0x21842184, 0x21842004, 0x21842184, 0x21842184, 0x20042184, 0x00003ffc, // RICON_FILETYPE_INFO - 0x0ff00000, 0x381c0810, 0x28042804, 0x28042804, 0x28042804, 0x28042804, 0x20102ffc, 0x00003ff0, // RICON_FILE_COPY - 0x00000000, 0x701c0000, 0x079c1e14, 0x55a000f0, 0x079c00f0, 0x701c1e14, 0x00000000, 0x00000000, // RICON_FILE_CUT - 0x01c00000, 0x13e41bec, 0x3f841004, 0x204420c4, 0x20442044, 0x20442044, 0x207c2044, 0x00003fc0, // RICON_FILE_PASTE - 0x00000000, 0x3aa00fe0, 0x2abc2aa0, 0x2aa42aa4, 0x20042aa4, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_CURSOR_HAND - 0x00000000, 0x003c000c, 0x030800c8, 0x30100c10, 0x10202020, 0x04400840, 0x01800280, 0x00000000, // RICON_CURSOR_POINTER - 0x00000000, 0x00180000, 0x01f00078, 0x03e007f0, 0x07c003e0, 0x04000e40, 0x00000000, 0x00000000, // RICON_CURSOR_CLASSIC - 0x00000000, 0x04000000, 0x11000a00, 0x04400a80, 0x01100220, 0x00580088, 0x00000038, 0x00000000, // RICON_PENCIL - 0x04000000, 0x15000a00, 0x50402880, 0x14102820, 0x05040a08, 0x015c028c, 0x007c00bc, 0x00000000, // RICON_PENCIL_BIG - 0x01c00000, 0x01400140, 0x01400140, 0x0ff80140, 0x0ff80808, 0x0aa80808, 0x0aa80aa8, 0x00000ff8, // RICON_BRUSH_CLASSIC - 0x1ffc0000, 0x5ffc7ffe, 0x40004000, 0x00807f80, 0x01c001c0, 0x01c001c0, 0x01c001c0, 0x00000080, // RICON_BRUSH_PAINTER - 0x00000000, 0x00800000, 0x01c00080, 0x03e001c0, 0x07f003e0, 0x036006f0, 0x000001c0, 0x00000000, // RICON_WATER_DROP - 0x00000000, 0x3e003800, 0x1f803f80, 0x0c201e40, 0x02080c10, 0x00840104, 0x00380044, 0x00000000, // RICON_COLOR_PICKER - 0x00000000, 0x07800300, 0x1fe00fc0, 0x3f883fd0, 0x0e021f04, 0x02040402, 0x00f00108, 0x00000000, // RICON_RUBBER - 0x00c00000, 0x02800140, 0x08200440, 0x20081010, 0x2ffe3004, 0x03f807fc, 0x00e001f0, 0x00000040, // RICON_COLOR_BUCKET - 0x00000000, 0x21843ffc, 0x01800180, 0x01800180, 0x01800180, 0x01800180, 0x03c00180, 0x00000000, // RICON_TEXT_T - 0x00800000, 0x01400180, 0x06200340, 0x0c100620, 0x1ff80c10, 0x380c1808, 0x70067004, 0x0000f80f, // RICON_TEXT_A - 0x78000000, 0x50004000, 0x00004800, 0x03c003c0, 0x03c003c0, 0x00100000, 0x0002000a, 0x0000000e, // RICON_SCALE - 0x75560000, 0x5e004002, 0x54001002, 0x41001202, 0x408200fe, 0x40820082, 0x40820082, 0x00006afe, // RICON_RESIZE - 0x00000000, 0x3f003f00, 0x3f003f00, 0x3f003f00, 0x00400080, 0x001c0020, 0x001c001c, 0x00000000, // RICON_FILTER_POINT - 0x6d800000, 0x00004080, 0x40804080, 0x40800000, 0x00406d80, 0x001c0020, 0x001c001c, 0x00000000, // RICON_FILTER_BILINEAR - 0x40080000, 0x1ffe2008, 0x14081008, 0x11081208, 0x10481088, 0x10081028, 0x10047ff8, 0x00001002, // RICON_CROP - 0x00100000, 0x3ffc0010, 0x2ab03550, 0x22b02550, 0x20b02150, 0x20302050, 0x2000fff0, 0x00002000, // RICON_CROP_ALPHA - 0x40000000, 0x1ff82000, 0x04082808, 0x01082208, 0x00482088, 0x00182028, 0x35542008, 0x00000002, // RICON_SQUARE_TOGGLE - 0x00000000, 0x02800280, 0x06c006c0, 0x0ea00ee0, 0x1e901eb0, 0x3e883e98, 0x7efc7e8c, 0x00000000, // RICON_SIMMETRY - 0x01000000, 0x05600100, 0x1d480d50, 0x7d423d44, 0x3d447d42, 0x0d501d48, 0x01000560, 0x00000100, // RICON_SIMMETRY_HORIZONTAL - 0x01800000, 0x04200240, 0x10080810, 0x00001ff8, 0x00007ffe, 0x0ff01ff8, 0x03c007e0, 0x00000180, // RICON_SIMMETRY_VERTICAL - 0x00000000, 0x010800f0, 0x02040204, 0x02040204, 0x07f00308, 0x1c000e00, 0x30003800, 0x00000000, // RICON_LENS - 0x00000000, 0x061803f0, 0x08240c0c, 0x08040814, 0x0c0c0804, 0x23f01618, 0x18002400, 0x00000000, // RICON_LENS_BIG - 0x00000000, 0x00000000, 0x1c7007c0, 0x638e3398, 0x1c703398, 0x000007c0, 0x00000000, 0x00000000, // RICON_EYE_ON - 0x00000000, 0x10002000, 0x04700fc0, 0x610e3218, 0x1c703098, 0x001007a0, 0x00000008, 0x00000000, // RICON_EYE_OFF - 0x00000000, 0x00007ffc, 0x40047ffc, 0x10102008, 0x04400820, 0x02800280, 0x02800280, 0x00000100, // RICON_FILTER_TOP - 0x00000000, 0x40027ffe, 0x10082004, 0x04200810, 0x02400240, 0x02400240, 0x01400240, 0x000000c0, // RICON_FILTER - 0x00800000, 0x00800080, 0x00000080, 0x3c9e0000, 0x00000000, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_POINT - 0x00800000, 0x00800080, 0x00800080, 0x3f7e01c0, 0x008001c0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_SMALL - 0x00800000, 0x00800080, 0x03e00080, 0x3e3e0220, 0x03e00220, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_BIG - 0x01000000, 0x04400280, 0x01000100, 0x43842008, 0x43849ab2, 0x01002008, 0x04400100, 0x01000280, // RICON_TARGET_MOVE - 0x01000000, 0x04400280, 0x01000100, 0x41042108, 0x41049ff2, 0x01002108, 0x04400100, 0x01000280, // RICON_CURSOR_MOVE - 0x781e0000, 0x500a4002, 0x04204812, 0x00000240, 0x02400000, 0x48120420, 0x4002500a, 0x0000781e, // RICON_CURSOR_SCALE - 0x00000000, 0x20003c00, 0x24002800, 0x01000200, 0x00400080, 0x00140024, 0x003c0004, 0x00000000, // RICON_CURSOR_SCALE_RIGHT - 0x00000000, 0x0004003c, 0x00240014, 0x00800040, 0x02000100, 0x28002400, 0x3c002000, 0x00000000, // RICON_CURSOR_SCALE_LEFT - 0x00000000, 0x00100020, 0x10101fc8, 0x10001020, 0x10001000, 0x10001000, 0x00001fc0, 0x00000000, // RICON_UNDO - 0x00000000, 0x08000400, 0x080813f8, 0x00080408, 0x00080008, 0x00080008, 0x000003f8, 0x00000000, // RICON_REDO - 0x00000000, 0x3ffc0000, 0x20042004, 0x20002000, 0x20402000, 0x3f902020, 0x00400020, 0x00000000, // RICON_REREDO - 0x00000000, 0x3ffc0000, 0x20042004, 0x27fc2004, 0x20202000, 0x3fc82010, 0x00200010, 0x00000000, // RICON_MUTATE - 0x00000000, 0x0ff00000, 0x10081818, 0x11801008, 0x10001180, 0x18101020, 0x00100fc8, 0x00000020, // RICON_ROTATE - 0x00000000, 0x04000200, 0x240429fc, 0x20042204, 0x20442004, 0x3f942024, 0x00400020, 0x00000000, // RICON_REPEAT - 0x00000000, 0x20001000, 0x22104c0e, 0x00801120, 0x11200040, 0x4c0e2210, 0x10002000, 0x00000000, // RICON_SHUFFLE - 0x7ffe0000, 0x50024002, 0x44024802, 0x41024202, 0x40424082, 0x40124022, 0x4002400a, 0x00007ffe, // RICON_EMPTYBOX - 0x00800000, 0x03e00080, 0x08080490, 0x3c9e0808, 0x08080808, 0x03e00490, 0x00800080, 0x00000000, // RICON_TARGET - 0x00800000, 0x00800080, 0x00800080, 0x3ffe01c0, 0x008001c0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_SMALL_FILL - 0x00800000, 0x00800080, 0x03e00080, 0x3ffe03e0, 0x03e003e0, 0x00800080, 0x00800080, 0x00000000, // RICON_TARGET_BIG_FILL - 0x01000000, 0x07c00380, 0x01000100, 0x638c2008, 0x638cfbbe, 0x01002008, 0x07c00100, 0x01000380, // RICON_TARGET_MOVE_FILL - 0x01000000, 0x07c00380, 0x01000100, 0x610c2108, 0x610cfffe, 0x01002108, 0x07c00100, 0x01000380, // RICON_CURSOR_MOVE_FILL - 0x781e0000, 0x6006700e, 0x04204812, 0x00000240, 0x02400000, 0x48120420, 0x700e6006, 0x0000781e, // RICON_CURSOR_SCALE_FILL - 0x00000000, 0x38003c00, 0x24003000, 0x01000200, 0x00400080, 0x000c0024, 0x003c001c, 0x00000000, // RICON_CURSOR_SCALE_RIGHT - 0x00000000, 0x001c003c, 0x0024000c, 0x00800040, 0x02000100, 0x30002400, 0x3c003800, 0x00000000, // RICON_CURSOR_SCALE_LEFT - 0x00000000, 0x00300020, 0x10301ff8, 0x10001020, 0x10001000, 0x10001000, 0x00001fc0, 0x00000000, // RICON_UNDO_FILL - 0x00000000, 0x0c000400, 0x0c081ff8, 0x00080408, 0x00080008, 0x00080008, 0x000003f8, 0x00000000, // RICON_REDO_FILL - 0x00000000, 0x3ffc0000, 0x20042004, 0x20002000, 0x20402000, 0x3ff02060, 0x00400060, 0x00000000, // RICON_REREDO_FILL - 0x00000000, 0x3ffc0000, 0x20042004, 0x27fc2004, 0x20202000, 0x3ff82030, 0x00200030, 0x00000000, // RICON_MUTATE_FILL - 0x00000000, 0x0ff00000, 0x10081818, 0x11801008, 0x10001180, 0x18301020, 0x00300ff8, 0x00000020, // RICON_ROTATE_FILL - 0x00000000, 0x06000200, 0x26042ffc, 0x20042204, 0x20442004, 0x3ff42064, 0x00400060, 0x00000000, // RICON_REPEAT_FILL - 0x00000000, 0x30001000, 0x32107c0e, 0x00801120, 0x11200040, 0x7c0e3210, 0x10003000, 0x00000000, // RICON_SHUFFLE_FILL - 0x00000000, 0x30043ffc, 0x24042804, 0x21042204, 0x20442084, 0x20142024, 0x3ffc200c, 0x00000000, // RICON_EMPTYBOX_SMALL - 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX - 0x00000000, 0x23c43ffc, 0x23c423c4, 0x200423c4, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP - 0x00000000, 0x3e043ffc, 0x3e043e04, 0x20043e04, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP_RIGHT - 0x00000000, 0x20043ffc, 0x20042004, 0x3e043e04, 0x3e043e04, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_RIGHT - 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x3e042004, 0x3e043e04, 0x3ffc3e04, 0x00000000, // RICON_BOX_BOTTOM_RIGHT - 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x23c42004, 0x23c423c4, 0x3ffc23c4, 0x00000000, // RICON_BOX_BOTTOM - 0x00000000, 0x20043ffc, 0x20042004, 0x20042004, 0x207c2004, 0x207c207c, 0x3ffc207c, 0x00000000, // RICON_BOX_BOTTOM_LEFT - 0x00000000, 0x20043ffc, 0x20042004, 0x207c207c, 0x207c207c, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_LEFT - 0x00000000, 0x207c3ffc, 0x207c207c, 0x2004207c, 0x20042004, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_TOP_LEFT - 0x00000000, 0x20043ffc, 0x20042004, 0x23c423c4, 0x23c423c4, 0x20042004, 0x3ffc2004, 0x00000000, // RICON_BOX_CIRCLE_MASK - 0x7ffe0000, 0x40024002, 0x47e24182, 0x4ff247e2, 0x47e24ff2, 0x418247e2, 0x40024002, 0x00007ffe, // RICON_BOX_CENTER - 0x7fff0000, 0x40014001, 0x40014001, 0x49555ddd, 0x4945495d, 0x400149c5, 0x40014001, 0x00007fff, // RICON_POT - 0x7ffe0000, 0x53327332, 0x44ce4cce, 0x41324332, 0x404e40ce, 0x48125432, 0x4006540e, 0x00007ffe, // RICON_ALPHA_MULTIPLY - 0x7ffe0000, 0x53327332, 0x44ce4cce, 0x41324332, 0x5c4e40ce, 0x44124432, 0x40065c0e, 0x00007ffe, // RICON_ALPHA_CLEAR - 0x7ffe0000, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x42fe417e, 0x00007ffe, // RICON_DITHERING - 0x07fe0000, 0x1ffa0002, 0x7fea000a, 0x402a402a, 0x5b2a512a, 0x5128552a, 0x40205128, 0x00007fe0, // RICON_MIPMAPS - 0x00000000, 0x1ff80000, 0x12481248, 0x12481ff8, 0x1ff81248, 0x12481248, 0x00001ff8, 0x00000000, // RICON_BOX_GRID - 0x12480000, 0x7ffe1248, 0x12481248, 0x12487ffe, 0x7ffe1248, 0x12481248, 0x12487ffe, 0x00001248, // RICON_GRID - 0x00000000, 0x1c380000, 0x1c3817e8, 0x08100810, 0x08100810, 0x17e81c38, 0x00001c38, 0x00000000, // RICON_BOX_CORNERS_SMALL - 0x700e0000, 0x700e5ffa, 0x20042004, 0x20042004, 0x20042004, 0x20042004, 0x5ffa700e, 0x0000700e, // RICON_BOX_CORNERS_BIG - 0x3f7e0000, 0x21422142, 0x21422142, 0x00003f7e, 0x21423f7e, 0x21422142, 0x3f7e2142, 0x00000000, // RICON_FOUR_BOXES - 0x00000000, 0x3bb80000, 0x3bb83bb8, 0x3bb80000, 0x3bb83bb8, 0x3bb80000, 0x3bb83bb8, 0x00000000, // RICON_GRID_FILL - 0x7ffe0000, 0x7ffe7ffe, 0x77fe7000, 0x77fe77fe, 0x777e7700, 0x777e777e, 0x777e777e, 0x0000777e, // RICON_BOX_MULTISIZE - 0x781e0000, 0x40024002, 0x00004002, 0x01800000, 0x00000180, 0x40020000, 0x40024002, 0x0000781e, // RICON_ZOOM_SMALL - 0x781e0000, 0x40024002, 0x00004002, 0x03c003c0, 0x03c003c0, 0x40020000, 0x40024002, 0x0000781e, // RICON_ZOOM_MEDIUM - 0x781e0000, 0x40024002, 0x07e04002, 0x07e007e0, 0x07e007e0, 0x400207e0, 0x40024002, 0x0000781e, // RICON_ZOOM_BIG - 0x781e0000, 0x5ffa4002, 0x1ff85ffa, 0x1ff81ff8, 0x1ff81ff8, 0x5ffa1ff8, 0x40025ffa, 0x0000781e, // RICON_ZOOM_ALL - 0x00000000, 0x2004381c, 0x00002004, 0x00000000, 0x00000000, 0x20040000, 0x381c2004, 0x00000000, // RICON_ZOOM_CENTER - 0x00000000, 0x1db80000, 0x10081008, 0x10080000, 0x00001008, 0x10081008, 0x00001db8, 0x00000000, // RICON_BOX_DOTS_SMALL - 0x35560000, 0x00002002, 0x00002002, 0x00002002, 0x00002002, 0x00002002, 0x35562002, 0x00000000, // RICON_BOX_DOTS_BIG - 0x7ffe0000, 0x40024002, 0x48124ff2, 0x49924812, 0x48124992, 0x4ff24812, 0x40024002, 0x00007ffe, // RICON_BOX_CONCENTRIC - 0x00000000, 0x10841ffc, 0x10841084, 0x1ffc1084, 0x10841084, 0x10841084, 0x00001ffc, 0x00000000, // RICON_BOX_GRID_BIG - 0x00000000, 0x00000000, 0x10000000, 0x04000800, 0x01040200, 0x00500088, 0x00000020, 0x00000000, // RICON_OK_TICK - 0x00000000, 0x10080000, 0x04200810, 0x01800240, 0x02400180, 0x08100420, 0x00001008, 0x00000000, // RICON_CROSS - 0x00000000, 0x02000000, 0x00800100, 0x00200040, 0x00200010, 0x00800040, 0x02000100, 0x00000000, // RICON_ARROW_LEFT - 0x00000000, 0x00400000, 0x01000080, 0x04000200, 0x04000800, 0x01000200, 0x00400080, 0x00000000, // RICON_ARROW_RIGHT - 0x00000000, 0x00000000, 0x00000000, 0x08081004, 0x02200410, 0x00800140, 0x00000000, 0x00000000, // RICON_ARROW_BOTTOM - 0x00000000, 0x00000000, 0x01400080, 0x04100220, 0x10040808, 0x00000000, 0x00000000, 0x00000000, // RICON_ARROW_TOP - 0x00000000, 0x02000000, 0x03800300, 0x03e003c0, 0x03e003f0, 0x038003c0, 0x02000300, 0x00000000, // RICON_ARROW_LEFT_FILL - 0x00000000, 0x00400000, 0x01c000c0, 0x07c003c0, 0x07c00fc0, 0x01c003c0, 0x004000c0, 0x00000000, // RICON_ARROW_RIGHT_FILL - 0x00000000, 0x00000000, 0x00000000, 0x0ff81ffc, 0x03e007f0, 0x008001c0, 0x00000000, 0x00000000, // RICON_ARROW_BOTTOM_FILL - 0x00000000, 0x00000000, 0x01c00080, 0x07f003e0, 0x1ffc0ff8, 0x00000000, 0x00000000, 0x00000000, // RICON_ARROW_TOP_FILL - 0x00000000, 0x18a008c0, 0x32881290, 0x24822686, 0x26862482, 0x12903288, 0x08c018a0, 0x00000000, // RICON_AUDIO - 0x00000000, 0x04800780, 0x004000c0, 0x662000f0, 0x08103c30, 0x130a0e18, 0x0000318e, 0x00000000, // RICON_FX - 0x00000000, 0x00800000, 0x08880888, 0x2aaa0a8a, 0x0a8a2aaa, 0x08880888, 0x00000080, 0x00000000, // RICON_WAVE - 0x00000000, 0x00600000, 0x01080090, 0x02040108, 0x42044204, 0x24022402, 0x00001800, 0x00000000, // RICON_WAVE_SINUS - 0x00000000, 0x07f80000, 0x04080408, 0x04080408, 0x04080408, 0x7c0e0408, 0x00000000, 0x00000000, // RICON_WAVE_SQUARE - 0x00000000, 0x00000000, 0x00a00040, 0x22084110, 0x08021404, 0x00000000, 0x00000000, 0x00000000, // RICON_WAVE_TRIANGULAR - 0x00000000, 0x00000000, 0x04200000, 0x01800240, 0x02400180, 0x00000420, 0x00000000, 0x00000000, // RICON_CROSS_SMALL - 0x00000000, 0x18380000, 0x12281428, 0x10a81128, 0x112810a8, 0x14281228, 0x00001838, 0x00000000, // RICON_PLAYER_PREVIOUS - 0x00000000, 0x18000000, 0x11801600, 0x10181060, 0x10601018, 0x16001180, 0x00001800, 0x00000000, // RICON_PLAYER_PLAY_BACK - 0x00000000, 0x00180000, 0x01880068, 0x18080608, 0x06081808, 0x00680188, 0x00000018, 0x00000000, // RICON_PLAYER_PLAY - 0x00000000, 0x1e780000, 0x12481248, 0x12481248, 0x12481248, 0x12481248, 0x00001e78, 0x00000000, // RICON_PLAYER_PAUSE - 0x00000000, 0x1ff80000, 0x10081008, 0x10081008, 0x10081008, 0x10081008, 0x00001ff8, 0x00000000, // RICON_PLAYER_STOP - 0x00000000, 0x1c180000, 0x14481428, 0x15081488, 0x14881508, 0x14281448, 0x00001c18, 0x00000000, // RICON_PLAYER_NEXT - 0x00000000, 0x03c00000, 0x08100420, 0x10081008, 0x10081008, 0x04200810, 0x000003c0, 0x00000000, // RICON_PLAYER_RECORD - 0x00000000, 0x0c3007e0, 0x13c81818, 0x14281668, 0x14281428, 0x1c381c38, 0x08102244, 0x00000000, // RICON_MAGNET - 0x07c00000, 0x08200820, 0x3ff80820, 0x23882008, 0x21082388, 0x20082108, 0x1ff02008, 0x00000000, // RICON_LOCK_CLOSE - 0x07c00000, 0x08000800, 0x3ff80800, 0x23882008, 0x21082388, 0x20082108, 0x1ff02008, 0x00000000, // RICON_LOCK_OPEN - 0x01c00000, 0x0c180770, 0x3086188c, 0x60832082, 0x60034781, 0x30062002, 0x0c18180c, 0x01c00770, // RICON_CLOCK - 0x0a200000, 0x1b201b20, 0x04200e20, 0x04200420, 0x04700420, 0x0e700e70, 0x0e700e70, 0x04200e70, // RICON_TOOLS - 0x01800000, 0x3bdc318c, 0x0ff01ff8, 0x7c3e1e78, 0x1e787c3e, 0x1ff80ff0, 0x318c3bdc, 0x00000180, // RICON_GEAR - 0x01800000, 0x3ffc318c, 0x1c381ff8, 0x781e1818, 0x1818781e, 0x1ff81c38, 0x318c3ffc, 0x00000180, // RICON_GEAR_BIG - 0x00000000, 0x08080ff8, 0x08081ffc, 0x0aa80aa8, 0x0aa80aa8, 0x0aa80aa8, 0x08080aa8, 0x00000ff8, // RICON_BIN - 0x00000000, 0x00000000, 0x20043ffc, 0x08043f84, 0x04040f84, 0x04040784, 0x000007fc, 0x00000000, // RICON_HAND_POINTER - 0x00000000, 0x24400400, 0x00001480, 0x6efe0e00, 0x00000e00, 0x24401480, 0x00000400, 0x00000000, // RICON_LASER - 0x00000000, 0x03c00000, 0x08300460, 0x11181118, 0x11181118, 0x04600830, 0x000003c0, 0x00000000, // RICON_COIN - 0x00000000, 0x10880080, 0x06c00810, 0x366c07e0, 0x07e00240, 0x00001768, 0x04200240, 0x00000000, // RICON_EXPLOSION - 0x00000000, 0x3d280000, 0x2528252c, 0x3d282528, 0x05280528, 0x05e80528, 0x00000000, 0x00000000, // RICON_1UP - 0x01800000, 0x03c003c0, 0x018003c0, 0x0ff007e0, 0x0bd00bd0, 0x0a500bd0, 0x02400240, 0x02400240, // RICON_PLAYER - 0x01800000, 0x03c003c0, 0x118013c0, 0x03c81ff8, 0x07c003c8, 0x04400440, 0x0c080478, 0x00000000, // RICON_PLAYER_JUMP - 0x3ff80000, 0x30183ff8, 0x30183018, 0x3ff83ff8, 0x03000300, 0x03c003c0, 0x03e00300, 0x000003e0, // RICON_KEY - 0x3ff80000, 0x3ff83ff8, 0x33983ff8, 0x3ff83398, 0x3ff83ff8, 0x00000540, 0x0fe00aa0, 0x00000fe0, // RICON_DEMON - 0x00000000, 0x0ff00000, 0x20041008, 0x25442004, 0x10082004, 0x06000bf0, 0x00000300, 0x00000000, // RICON_TEXT_POPUP - 0x00000000, 0x11440000, 0x07f00be8, 0x1c1c0e38, 0x1c1c0c18, 0x07f00e38, 0x11440be8, 0x00000000, // RICON_GEAR_EX - 0x00000000, 0x20080000, 0x0c601010, 0x07c00fe0, 0x07c007c0, 0x0c600fe0, 0x20081010, 0x00000000, // RICON_CRACK - 0x00000000, 0x20080000, 0x0c601010, 0x04400fe0, 0x04405554, 0x0c600fe0, 0x20081010, 0x00000000, // RICON_CRACK_POINTS - 0x00000000, 0x00800080, 0x01c001c0, 0x1ffc3ffe, 0x03e007f0, 0x07f003e0, 0x0c180770, 0x00000808, // RICON_STAR - 0x0ff00000, 0x08180810, 0x08100818, 0x0a100810, 0x08180810, 0x08100818, 0x08100810, 0x00001ff8, // RICON_DOOR - 0x0ff00000, 0x08100810, 0x08100810, 0x10100010, 0x4f902010, 0x10102010, 0x08100010, 0x00000ff0, // RICON_EXIT - 0x00040000, 0x001f000e, 0x0ef40004, 0x12f41284, 0x0ef41214, 0x10040004, 0x7ffc3004, 0x10003000, // RICON_MODE_2D - 0x78040000, 0x501f600e, 0x0ef44004, 0x12f41284, 0x0ef41284, 0x10140004, 0x7ffc300c, 0x10003000, // RICON_MODE_3D - 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // RICON_CUBE - 0x7fe00000, 0x5ff87ff0, 0x47fe4ffc, 0x44224402, 0x44224422, 0x241275e2, 0x0c06140a, 0x000007fe, // RICON_CUBE_FACE_TOP - 0x7fe00000, 0x50386030, 0x47fe483c, 0x443e443e, 0x443e443e, 0x241e75fe, 0x0c06140e, 0x000007fe, // RICON_CUBE_FACE_LEFT - 0x7fe00000, 0x50286030, 0x47fe4804, 0x47fe47fe, 0x47fe47fe, 0x27fe77fe, 0x0ffe17fe, 0x000007fe, // RICON_CUBE_FACE_FRONT - 0x7fe00000, 0x50286030, 0x47fe4804, 0x44224402, 0x44224422, 0x3ff27fe2, 0x0ffe1ffa, 0x000007fe, // RICON_CUBE_FACE_BOTTOM - 0x7fe00000, 0x70286030, 0x7ffe7804, 0x7c227c02, 0x7c227c22, 0x3c127de2, 0x0c061c0a, 0x000007fe, // RICON_CUBE_FACE_RIGHT - 0x7fe00000, 0x7fe87ff0, 0x7ffe7fe4, 0x7fe27fe2, 0x7fe27fe2, 0x24127fe2, 0x0c06140a, 0x000007fe, // RICON_CUBE_FACE_BACK - 0x00000000, 0x2a0233fe, 0x22022602, 0x22022202, 0x2a022602, 0x00a033fe, 0x02080110, 0x00000000, // RICON_CAMERA - 0x00000000, 0x200c3ffc, 0x000c000c, 0x3ffc000c, 0x30003000, 0x30003000, 0x3ffc3004, 0x00000000, // RICON_SPECIAL - 0x00000000, 0x0022003e, 0x012201e2, 0x0100013e, 0x01000100, 0x79000100, 0x4f004900, 0x00007800, // RICON_LINK_NET - 0x00000000, 0x44007c00, 0x45004600, 0x00627cbe, 0x00620022, 0x45007cbe, 0x44004600, 0x00007c00, // RICON_LINK_BOXES - 0x00000000, 0x0044007c, 0x0010007c, 0x3f100010, 0x3f1021f0, 0x3f100010, 0x3f0021f0, 0x00000000, // RICON_LINK_MULTI - 0x00000000, 0x0044007c, 0x00440044, 0x0010007c, 0x00100010, 0x44107c10, 0x440047f0, 0x00007c00, // RICON_LINK - 0x00000000, 0x0044007c, 0x00440044, 0x0000007c, 0x00000010, 0x44007c10, 0x44004550, 0x00007c00, // RICON_LINK_BROKE - 0x02a00000, 0x22a43ffc, 0x20042004, 0x20042ff4, 0x20042ff4, 0x20042ff4, 0x20042004, 0x00003ffc, // RICON_TEXT_NOTES - 0x3ffc0000, 0x20042004, 0x245e27c4, 0x27c42444, 0x2004201e, 0x201e2004, 0x20042004, 0x00003ffc, // RICON_NOTEBOOK - 0x00000000, 0x07e00000, 0x04200420, 0x24243ffc, 0x24242424, 0x24242424, 0x3ffc2424, 0x00000000, // RICON_SUITCASE - 0x00000000, 0x0fe00000, 0x08200820, 0x40047ffc, 0x7ffc5554, 0x40045554, 0x7ffc4004, 0x00000000, // RICON_SUITCASE_ZIP - 0x00000000, 0x20043ffc, 0x3ffc2004, 0x13c81008, 0x100813c8, 0x10081008, 0x1ff81008, 0x00000000, // RICON_MAILBOX - 0x00000000, 0x40027ffe, 0x5ffa5ffa, 0x5ffa5ffa, 0x40025ffa, 0x03c07ffe, 0x1ff81ff8, 0x00000000, // RICON_MONITOR - 0x0ff00000, 0x6bfe7ffe, 0x7ffe7ffe, 0x68167ffe, 0x08106816, 0x08100810, 0x0ff00810, 0x00000000, // RICON_PRINTER - 0x3ff80000, 0xfffe2008, 0x870a8002, 0x904a888a, 0x904a904a, 0x870a888a, 0xfffe8002, 0x00000000, // RICON_PHOTO_CAMERA - 0x0fc00000, 0xfcfe0cd8, 0x8002fffe, 0x84428382, 0x84428442, 0x80028382, 0xfffe8002, 0x00000000, // RICON_PHOTO_CAMERA_FLASH - 0x00000000, 0x02400180, 0x08100420, 0x20041008, 0x23c42004, 0x22442244, 0x3ffc2244, 0x00000000, // RICON_HOUSE - 0x00000000, 0x1c700000, 0x3ff83ef8, 0x3ff83ff8, 0x0fe01ff0, 0x038007c0, 0x00000100, 0x00000000, // RICON_HEART - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0xe000c000, // RICON_CORNER - 0x00000000, 0x14001c00, 0x15c01400, 0x15401540, 0x155c1540, 0x15541554, 0x1ddc1554, 0x00000000, // RICON_VERTICAL_BARS - 0x00000000, 0x03000300, 0x1b001b00, 0x1b601b60, 0x1b6c1b60, 0x1b6c1b6c, 0x1b6c1b6c, 0x00000000, // RICON_VERTICAL_BARS_FILL - 0x00000000, 0x00000000, 0x403e7ffe, 0x7ffe403e, 0x7ffe0000, 0x43fe43fe, 0x00007ffe, 0x00000000, // RICON_LIFE_BARS - 0x7ffc0000, 0x43844004, 0x43844284, 0x43844004, 0x42844284, 0x42844284, 0x40044384, 0x00007ffc, // RICON_INFO - 0x40008000, 0x10002000, 0x04000800, 0x01000200, 0x00400080, 0x00100020, 0x00040008, 0x00010002, // RICON_CROSSLINE - 0x00000000, 0x1ff01ff0, 0x18301830, 0x1f001830, 0x03001f00, 0x00000300, 0x03000300, 0x00000000, // RICON_HELP - 0x3ff00000, 0x2abc3550, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x2aac3554, 0x00003ffc, // RICON_FILETYPE_ALPHA - 0x3ff00000, 0x201c2010, 0x22442184, 0x28142424, 0x29942814, 0x2ff42994, 0x20042004, 0x00003ffc, // RICON_FILETYPE_HOME - 0x07fe0000, 0x04020402, 0x7fe20402, 0x44224422, 0x44224422, 0x402047fe, 0x40204020, 0x00007fe0, // RICON_LAYERS_VISIBLE - 0x07fe0000, 0x04020402, 0x7c020402, 0x44024402, 0x44024402, 0x402047fe, 0x40204020, 0x00007fe0, // RICON_LAYERS - 0x00000000, 0x40027ffe, 0x7ffe4002, 0x40024002, 0x40024002, 0x40024002, 0x7ffe4002, 0x00000000, // RICON_WINDOW - 0x09100000, 0x09f00910, 0x09100910, 0x00000910, 0x24a2779e, 0x27a224a2, 0x709e20a2, 0x00000000, // RICON_HIDPI - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_200 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_201 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_202 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_203 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_204 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_205 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_206 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_207 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_208 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_209 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_210 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_211 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_212 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_213 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_214 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_215 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_216 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_217 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_218 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_219 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_220 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_221 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_222 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_223 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_224 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_225 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_226 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_227 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_228 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_229 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_230 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_231 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_232 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_233 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_234 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_235 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_236 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_237 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_238 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_239 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_240 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_241 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_242 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_243 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_244 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_245 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_246 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_247 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_248 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_249 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_250 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_251 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_252 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_253 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_254 - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, // RICON_255 -}; -#endif // RICONS_IMPLEMENTATION From 14e443afbac0c8742e11fb97edc6eea6f0865bc5 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Aug 2021 23:41:33 +0200 Subject: [PATCH 064/570] REVIEWED: OpenGL 1.1 compilation issue --- src/rlgl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 7d9b8d140..ce99c40e4 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2956,9 +2956,9 @@ void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps = mipmapCount + 1; RL_FREE(texData); // Once mipmaps have been generated and data has been uploaded to GPU VRAM, we can discard RAM data - TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Mipmaps generated manually on CPU side, total: %i", texture->id, texture->mipmaps); + TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Mipmaps generated manually on CPU side, total: %i", id, *mipmaps); } - else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps for provided texture format", texture->id); + else TRACELOG(RL_LOG_WARNING, "TEXTURE: [ID %i] Failed to generate mipmaps for provided texture format", id); } #endif #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) From 3d33c559e72340184d1cdb524faf8e6eb841022c Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 26 Aug 2021 00:14:34 +0200 Subject: [PATCH 065/570] REVIEWED: Examples compilation --- examples/core/core_window_letterbox.c | 2 +- examples/models/models_animation.c | 2 +- examples/models/models_material_pbr.c | 10 +++++----- examples/text/text_font_sdf.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/core/core_window_letterbox.c b/examples/core/core_window_letterbox.c index 2933ca422..1e0765163 100644 --- a/examples/core/core_window_letterbox.c +++ b/examples/core/core_window_letterbox.c @@ -43,7 +43,7 @@ int main(void) // Render texture initialization, used to hold the rendering result so we can easily resize it RenderTexture2D target = LoadRenderTexture(gameScreenWidth, gameScreenHeight); - SetTextureFilter(target.texture, FILTER_BILINEAR); // Texture scale filter to use + SetTextureFilter(target.texture, TEXTURE_FILTER_BILINEAR); // Texture scale filter to use Color colors[10] = { 0 }; for (int i = 0; i < 10; i++) colors[i] = (Color){ GetRandomValue(100, 250), GetRandomValue(50, 150), GetRandomValue(10, 100), 255 }; diff --git a/examples/models/models_animation.c b/examples/models/models_animation.c index 2c3348c0f..4fde9baf3 100644 --- a/examples/models/models_animation.c +++ b/examples/models/models_animation.c @@ -41,7 +41,7 @@ int main(void) Model model = LoadModel("resources/guy/guy.iqm"); // Load the animated model mesh and basic data Texture2D texture = LoadTexture("resources/guy/guytex.png"); // Load model texture and set material - SetMaterialTexture(&model.materials[0], MAP_DIFFUSE, texture); // Set model material map texture + SetMaterialTexture(&model.materials[0], MATERIAL_MAP_DIFFUSE, texture); // Set model material map texture Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position diff --git a/examples/models/models_material_pbr.c b/examples/models/models_material_pbr.c index dfef69da1..7f11fd70e 100644 --- a/examples/models/models_material_pbr.c +++ b/examples/models/models_material_pbr.c @@ -162,11 +162,11 @@ static Material LoadMaterialPBR(Color albedo, float metalness, float roughness) mat.maps[MATERIAL_MAP_OCCLUSION].texture = LoadTexture("resources/pbr/trooper_ao.png"); // Set textures filtering for better quality - SetTextureFilter(mat.maps[MATERIAL_MAP_ALBEDO].texture, FILTER_BILINEAR); - SetTextureFilter(mat.maps[MATERIAL_MAP_NORMAL].texture, FILTER_BILINEAR); - SetTextureFilter(mat.maps[MATERIAL_MAP_METALNESS].texture, FILTER_BILINEAR); - SetTextureFilter(mat.maps[MATERIAL_MAP_ROUGHNESS].texture, FILTER_BILINEAR); - SetTextureFilter(mat.maps[MATERIAL_MAP_OCCLUSION].texture, FILTER_BILINEAR); + SetTextureFilter(mat.maps[MATERIAL_MAP_ALBEDO].texture, TEXTURE_FILTER_BILINEAR); + SetTextureFilter(mat.maps[MATERIAL_MAP_NORMAL].texture, TEXTURE_FILTER_BILINEAR); + SetTextureFilter(mat.maps[MATERIAL_MAP_METALNESS].texture, TEXTURE_FILTER_BILINEAR); + SetTextureFilter(mat.maps[MATERIAL_MAP_ROUGHNESS].texture, TEXTURE_FILTER_BILINEAR); + SetTextureFilter(mat.maps[MATERIAL_MAP_OCCLUSION].texture, TEXTURE_FILTER_BILINEAR); // Enable sample usage in shader for assigned textures SetShaderValue(mat.shader, GetShaderLocation(mat.shader, "albedo.useSampler"), (int[1]){ 1 }, SHADER_UNIFORM_INT); diff --git a/examples/text/text_font_sdf.c b/examples/text/text_font_sdf.c index f9517bdc3..7de7986b3 100644 --- a/examples/text/text_font_sdf.c +++ b/examples/text/text_font_sdf.c @@ -64,7 +64,7 @@ int main(void) // Load SDF required shader (we use default vertex shader) Shader shader = LoadShader(0, TextFormat("resources/shaders/glsl%i/sdf.fs", GLSL_VERSION)); - SetTextureFilter(fontSDF.texture, FILTER_BILINEAR); // Required for SDF font + SetTextureFilter(fontSDF.texture, TEXTURE_FILTER_BILINEAR); // Required for SDF font Vector2 fontPosition = { 40, screenHeight/2.0f - 50 }; Vector2 textSize = { 0.0f, 0.0f }; From 1286bc076f2f121b5375554c2ff26d2c1c72e0eb Mon Sep 17 00:00:00 2001 From: irishgreencitrus <43090499+irishgreencitrus@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:27:31 +0100 Subject: [PATCH 066/570] Add raylib.v binding (#1955) Added raylib.v binding for Vlang --- BINDINGS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BINDINGS.md b/BINDINGS.md index b154dc7b2..2311406b4 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -82,6 +82,7 @@ Some people ported raylib to other languages in form of bindings or wrappers to | jaylib | 3.0 | [Janet](https://janet-lang.org/) | https://github.com/janet-lang/jaylib | | raykit | ? | [Kit](https://www.kitlang.org/) | https://github.com/Gamerfiend/raykit | | vraylib | 3.5 | [V](https://vlang.io/) | https://github.com/waotzi/vraylib | +| raylib.v | 3.7 | [V](https://vlang.io/) | https://github.com/irishgreencitrus/raylib.v | | ray.mod | 3.0 | [BlitzMax](https://blitzmax.org/) | https://github.com/bmx-ng/ray.mod | | raylib-ocaml | 3.7 | [OCaml](https://ocaml.org/) | https://github.com/tjammer/raylib-ocaml | | raylib-mosaic | 3.0 | [Mosaic](https://github.com/sal55/langs/tree/master/Mosaic) | https://github.com/pluckyporcupine/raylib-mosaic | From cac856119c23898579fc237703a8ff3bda207dc6 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 26 Aug 2021 16:31:01 +0100 Subject: [PATCH 067/570] Change GetColor to take unsigned int (#1954) --- parser/raylib_api.txt | 2 +- projects/Notepad++/raylib_npp_parser/raylib_to_parse.h | 2 +- src/extras/raygui.h | 4 ++-- src/raylib.h | 2 +- src/textures.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parser/raylib_api.txt b/parser/raylib_api.txt index 07e1614c8..c90fc40d9 100644 --- a/parser/raylib_api.txt +++ b/parser/raylib_api.txt @@ -2505,7 +2505,7 @@ Function 308: GetColor() (1 input parameters) Name: GetColor Return type: Color Description: Get Color structure from hexadecimal value - Param[1]: hexValue (type: int) + Param[1]: hexValue (type: unsigned int) Function 309: GetPixelColor() (2 input parameters) Name: GetPixelColor Return type: Color diff --git a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h index f7f252975..1281fa693 100644 --- a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h +++ b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h @@ -389,7 +389,7 @@ RLAPI Vector3 ColorToHSV(Color color); // R RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Returns a Color from HSV values RLAPI Color ColorAlpha(Color color, float alpha); // Returns color with alpha applied, alpha goes from 0.0f to 1.0f RLAPI Color ColorAlphaBlend(Color dst, Color src, Color tint); // Returns src alpha-blended into dst color with tint -RLAPI Color GetColor(int hexValue); // Get Color structure from hexadecimal value +RLAPI Color GetColor(unsigned int hexValue); // Get Color structure from hexadecimal value RLAPI Color GetPixelColor(void *srcPtr, int format); // Get Color from a source pixel pointer of certain format RLAPI void SetPixelColor(void *dstPtr, Color color, int format); // Set color formatted into destination pixel pointer RLAPI int GetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes for certain format diff --git a/src/extras/raygui.h b/src/extras/raygui.h index bb1919004..31b7ca774 100644 --- a/src/extras/raygui.h +++ b/src/extras/raygui.h @@ -1154,7 +1154,7 @@ static const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle() // raylib functions already implemented in raygui //------------------------------------------------------------------------------- -static Color GetColor(int hexValue); // Returns a Color struct from hexadecimal value +static Color GetColor(unsigned int hexValue); // Returns a Color struct from hexadecimal value static int ColorToInt(Color color); // Returns hexadecimal value for a Color static Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f static bool CheckCollisionPointRec(Vector2 point, Rectangle rec); // Check if point is inside rectangle @@ -4061,7 +4061,7 @@ static Vector3 ConvertHSVtoRGB(Vector3 hsv) #if defined(RAYGUI_STANDALONE) // Returns a Color struct from hexadecimal value -static Color GetColor(int hexValue) +static Color GetColor(unsigned int hexValue) { Color color; diff --git a/src/raylib.h b/src/raylib.h index 7613dd94c..fb0be1783 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1297,7 +1297,7 @@ RLAPI Vector3 ColorToHSV(Color color); // G RLAPI Color ColorFromHSV(float hue, float saturation, float value); // Get a Color from HSV values, hue [0..360], saturation/value [0..1] RLAPI Color ColorAlpha(Color color, float alpha); // Get color with alpha applied, alpha goes from 0.0f to 1.0f RLAPI Color ColorAlphaBlend(Color dst, Color src, Color tint); // Get src alpha-blended into dst color with tint -RLAPI Color GetColor(int hexValue); // Get Color structure from hexadecimal value +RLAPI Color GetColor(unsigned int hexValue); // Get Color structure from hexadecimal value RLAPI Color GetPixelColor(void *srcPtr, int format); // Get Color from a source pixel pointer of certain format RLAPI void SetPixelColor(void *dstPtr, Color color, int format); // Set color formatted into destination pixel pointer RLAPI int GetPixelDataSize(int width, int height, int format); // Get pixel data size in bytes for certain format diff --git a/src/textures.c b/src/textures.c index f8b693d60..ff55eedf7 100644 --- a/src/textures.c +++ b/src/textures.c @@ -3711,7 +3711,7 @@ Color ColorAlphaBlend(Color dst, Color src, Color tint) } // Get a Color struct from hexadecimal value -Color GetColor(int hexValue) +Color GetColor(unsigned int hexValue) { Color color; From b7ae0df3d99e750922183ff7f06227981822e6b4 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 27 Aug 2021 12:13:44 +0200 Subject: [PATCH 068/570] REVIEWED: Decouple `DrawMesh()` and `DrawMeshInstanced()` #1958 --- src/models.c | 301 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 226 insertions(+), 75 deletions(-) diff --git a/src/models.c b/src/models.c index bd200d5f7..411538d1d 100644 --- a/src/models.c +++ b/src/models.c @@ -972,12 +972,6 @@ void UpdateMeshBuffer(Mesh mesh, int index, void *data, int dataSize, int offset // Draw a 3d mesh with material and transform void DrawMesh(Mesh mesh, Material material, Matrix transform) -{ - DrawMeshInstanced(mesh, material, &transform, 1); -} - -// Draw multiple mesh instances with material and different transforms -void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int instances) { #if defined(GRAPHICS_API_OPENGL_11) #define GL_VERTEX_ARRAY 0x8074 @@ -993,7 +987,7 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins rlEnableStatePointer(GL_COLOR_ARRAY, mesh.colors); rlPushMatrix(); - rlMultMatrixf(MatrixToFloat(transforms[0])); + rlMultMatrixf(MatrixToFloat(transform)); rlColor4ub(material.maps[MATERIAL_MAP_DIFFUSE].color.r, material.maps[MATERIAL_MAP_DIFFUSE].color.g, material.maps[MATERIAL_MAP_DIFFUSE].color.b, @@ -1012,13 +1006,6 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins #endif #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) - // Check instancing - bool instancing = false; - if (instances < 1) return; - else if (instances > 1) instancing = true; - float16 *instanceTransforms = NULL; - unsigned int instancesVboId = 0; - // Bind shader program rlEnableShader(material.shader.id); @@ -1064,51 +1051,16 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], matView); if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], matProjection); - if (instancing) - { - // Create instances buffer - instanceTransforms = (float16 *)RL_MALLOC(instances*sizeof(float16)); + // Model transformation matrix is send to shader uniform location: SHADER_LOC_MATRIX_MODEL + if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], transform); - // Fill buffer with instances transformations as float16 arrays - for (int i = 0; i < instances; i++) instanceTransforms[i] = MatrixToFloatV(transforms[i]); + // Accumulate several model transformations: + // transform: model transformation provided (includes DrawModel() params combined with model.transform) + // rlGetMatrixTransform(): rlgl internal transform matrix due to push/pop matrix stack + matModel = MatrixMultiply(transform, rlGetMatrixTransform()); - // Enable mesh VAO to attach new buffer - rlEnableVertexArray(mesh.vaoId); - - // This could alternatively use a static VBO and either glMapBuffer() or glBufferSubData(). - // It isn't clear which would be reliably faster in all cases and on all platforms, - // anecdotally glMapBuffer() seems very slow (syncs) while glBufferSubData() seems - // no faster, since we're transferring all the transform matrices anyway - instancesVboId = rlLoadVertexBuffer(instanceTransforms, instances*sizeof(float16), false); - - // Instances transformation matrices are send to shader attribute location: SHADER_LOC_MATRIX_MODEL - for (unsigned int i = 0; i < 4; i++) - { - rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i); - rlSetVertexAttribute(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i, 4, RL_FLOAT, 0, sizeof(Matrix), (void *)(i*sizeof(Vector4))); - rlSetVertexAttributeDivisor(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i, 1); - } - - rlDisableVertexBuffer(); - rlDisableVertexArray(); - - // Accumulate internal matrix transform (push/pop) and view matrix - // NOTE: In this case, model instance transformation must be computed in the shader - matModelView = MatrixMultiply(rlGetMatrixTransform(), matView); - } - else - { - // Model transformation matrix is send to shader uniform location: SHADER_LOC_MATRIX_MODEL - if (material.shader.locs[SHADER_LOC_MATRIX_MODEL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MODEL], transforms[0]); - - // Accumulate several model transformations: - // transforms[0]: model transformation provided (includes DrawModel() params combined with model.transform) - // rlGetMatrixTransform(): rlgl internal transform matrix due to push/pop matrix stack - matModel = MatrixMultiply(transforms[0], rlGetMatrixTransform()); - - // Get model-view matrix - matModelView = MatrixMultiply(matModel, matView); - } + // Get model-view matrix + matModelView = MatrixMultiply(matModel, matView); // Upload model normal matrix (if locations available) if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], MatrixTranspose(MatrixInvert(matModel))); @@ -1210,16 +1162,9 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // Send combined model-view-projection matrix to shader rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], matModelViewProjection); - if (instancing) // Draw mesh instanced - { - if (mesh.indices != NULL) rlDrawVertexArrayElementsInstanced(0, mesh.triangleCount*3, 0, instances); - else rlDrawVertexArrayInstanced(0, mesh.vertexCount, instances); - } - else // Draw mesh - { - if (mesh.indices != NULL) rlDrawVertexArrayElements(0, mesh.triangleCount*3, 0); - else rlDrawVertexArray(0, mesh.vertexCount); - } + // Draw mesh + if (mesh.indices != NULL) rlDrawVertexArrayElements(0, mesh.triangleCount*3, 0); + else rlDrawVertexArray(0, mesh.vertexCount); } // Unbind all binded texture maps @@ -1243,18 +1188,224 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins // Disable shader program rlDisableShader(); - if (instancing) + // Restore rlgl internal modelview and projection matrices + rlSetMatrixModelview(matView); + rlSetMatrixProjection(matProjection); +#endif +} + +// Draw multiple mesh instances with material and different transforms +void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int instances) +{ +#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) + // Instancing required variables + float16 *instanceTransforms = NULL; + unsigned int instancesVboId = 0; + + // Bind shader program + rlEnableShader(material.shader.id); + + // Send required data to shader (matrices, values) + //----------------------------------------------------- + // Upload to shader material.colDiffuse + if (material.shader.locs[SHADER_LOC_COLOR_DIFFUSE] != -1) { - // Remove instance transforms buffer - rlUnloadVertexBuffer(instancesVboId); - RL_FREE(instanceTransforms); + float values[4] = { + (float)material.maps[MATERIAL_MAP_DIFFUSE].color.r/255.0f, + (float)material.maps[MATERIAL_MAP_DIFFUSE].color.g/255.0f, + (float)material.maps[MATERIAL_MAP_DIFFUSE].color.b/255.0f, + (float)material.maps[MATERIAL_MAP_DIFFUSE].color.a/255.0f + }; + + rlSetUniform(material.shader.locs[SHADER_LOC_COLOR_DIFFUSE], values, SHADER_UNIFORM_VEC4, 1); } - else + + // Upload to shader material.colSpecular (if location available) + if (material.shader.locs[SHADER_LOC_COLOR_SPECULAR] != -1) { - // Restore rlgl internal modelview and projection matrices - rlSetMatrixModelview(matView); - rlSetMatrixProjection(matProjection); + float values[4] = { + (float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.r/255.0f, + (float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.g/255.0f, + (float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.b/255.0f, + (float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.a/255.0f + }; + + rlSetUniform(material.shader.locs[SHADER_LOC_COLOR_SPECULAR], values, SHADER_UNIFORM_VEC4, 1); } + + // Get a copy of current matrices to work with, + // just in case stereo render is required and we need to modify them + // NOTE: At this point the modelview matrix just contains the view matrix (camera) + // That's because BeginMode3D() sets it and there is no model-drawing function + // that modifies it, all use rlPushMatrix() and rlPopMatrix() + Matrix matModel = MatrixIdentity(); + Matrix matView = rlGetMatrixModelview(); + Matrix matModelView = MatrixIdentity(); + Matrix matProjection = rlGetMatrixProjection(); + + // Upload view and projection matrices (if locations available) + if (material.shader.locs[SHADER_LOC_MATRIX_VIEW] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_VIEW], matView); + if (material.shader.locs[SHADER_LOC_MATRIX_PROJECTION] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_PROJECTION], matProjection); + + // Create instances buffer + instanceTransforms = (float16 *)RL_MALLOC(instances*sizeof(float16)); + + // Fill buffer with instances transformations as float16 arrays + for (int i = 0; i < instances; i++) instanceTransforms[i] = MatrixToFloatV(transforms[i]); + + // Enable mesh VAO to attach new buffer + rlEnableVertexArray(mesh.vaoId); + + // This could alternatively use a static VBO and either glMapBuffer() or glBufferSubData(). + // It isn't clear which would be reliably faster in all cases and on all platforms, + // anecdotally glMapBuffer() seems very slow (syncs) while glBufferSubData() seems + // no faster, since we're transferring all the transform matrices anyway + instancesVboId = rlLoadVertexBuffer(instanceTransforms, instances*sizeof(float16), false); + + // Instances transformation matrices are send to shader attribute location: SHADER_LOC_MATRIX_MODEL + for (unsigned int i = 0; i < 4; i++) + { + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i, 4, RL_FLOAT, 0, sizeof(Matrix), (void *)(i*sizeof(Vector4))); + rlSetVertexAttributeDivisor(material.shader.locs[SHADER_LOC_MATRIX_MODEL] + i, 1); + } + + rlDisableVertexBuffer(); + rlDisableVertexArray(); + + // Accumulate internal matrix transform (push/pop) and view matrix + // NOTE: In this case, model instance transformation must be computed in the shader + matModelView = MatrixMultiply(rlGetMatrixTransform(), matView); + + // Upload model normal matrix (if locations available) + if (material.shader.locs[SHADER_LOC_MATRIX_NORMAL] != -1) rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_NORMAL], MatrixTranspose(MatrixInvert(matModel))); + //----------------------------------------------------- + + // Bind active texture maps (if available) + for (int i = 0; i < MAX_MATERIAL_MAPS; i++) + { + if (material.maps[i].texture.id > 0) + { + // Select current shader texture slot + rlActiveTextureSlot(i); + + // Enable texture for active slot + if ((i == MATERIAL_MAP_IRRADIANCE) || + (i == MATERIAL_MAP_PREFILTER) || + (i == MATERIAL_MAP_CUBEMAP)) rlEnableTextureCubemap(material.maps[i].texture.id); + else rlEnableTexture(material.maps[i].texture.id); + + rlSetUniform(material.shader.locs[SHADER_LOC_MAP_DIFFUSE + i], &i, SHADER_UNIFORM_INT, 1); + } + } + + // Try binding vertex array objects (VAO) + // or use VBOs if not possible + if (!rlEnableVertexArray(mesh.vaoId)) + { + // Bind mesh VBO data: vertex position (shader-location = 0) + rlEnableVertexBuffer(mesh.vboId[0]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_POSITION], 3, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_POSITION]); + + // Bind mesh VBO data: vertex texcoords (shader-location = 1) + rlEnableVertexBuffer(mesh.vboId[1]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD01], 2, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD01]); + + if (material.shader.locs[SHADER_LOC_VERTEX_NORMAL] != -1) + { + // Bind mesh VBO data: vertex normals (shader-location = 2) + rlEnableVertexBuffer(mesh.vboId[2]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_NORMAL], 3, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_NORMAL]); + } + + // Bind mesh VBO data: vertex colors (shader-location = 3, if available) + if (material.shader.locs[SHADER_LOC_VERTEX_COLOR] != -1) + { + if (mesh.vboId[3] != 0) + { + rlEnableVertexBuffer(mesh.vboId[3]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_COLOR], 4, RL_UNSIGNED_BYTE, 1, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_COLOR]); + } + else + { + // Set default value for unused attribute + // NOTE: Required when using default shader and no VAO support + float value[4] = { 1.0f, 1.0f, 1.0f, 1.0f }; + rlSetVertexAttributeDefault(material.shader.locs[SHADER_LOC_VERTEX_COLOR], value, SHADER_ATTRIB_VEC2, 4); + rlDisableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_COLOR]); + } + } + + // Bind mesh VBO data: vertex tangents (shader-location = 4, if available) + if (material.shader.locs[SHADER_LOC_VERTEX_TANGENT] != -1) + { + rlEnableVertexBuffer(mesh.vboId[4]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TANGENT], 4, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TANGENT]); + } + + // Bind mesh VBO data: vertex texcoords2 (shader-location = 5, if available) + if (material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD02] != -1) + { + rlEnableVertexBuffer(mesh.vboId[5]); + rlSetVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD02], 2, RL_FLOAT, 0, 0, 0); + rlEnableVertexAttribute(material.shader.locs[SHADER_LOC_VERTEX_TEXCOORD02]); + } + + if (mesh.indices != NULL) rlEnableVertexBufferElement(mesh.vboId[6]); + } + + int eyesCount = 1; + if (rlIsStereoRenderEnabled()) eyesCount = 2; + + for (int eye = 0; eye < eyesCount; eye++) + { + // Calculate model-view-projection matrix (MVP) + Matrix matModelViewProjection = MatrixIdentity(); + if (eyesCount == 1) matModelViewProjection = MatrixMultiply(matModelView, matProjection); + else + { + // Setup current eye viewport (half screen width) + rlViewport(eye*rlGetFramebufferWidth()/2, 0, rlGetFramebufferWidth()/2, rlGetFramebufferHeight()); + matModelViewProjection = MatrixMultiply(MatrixMultiply(matModelView, rlGetMatrixViewOffsetStereo(eye)), rlGetMatrixProjectionStereo(eye)); + } + + // Send combined model-view-projection matrix to shader + rlSetUniformMatrix(material.shader.locs[SHADER_LOC_MATRIX_MVP], matModelViewProjection); + + // Draw mesh instanced + if (mesh.indices != NULL) rlDrawVertexArrayElementsInstanced(0, mesh.triangleCount*3, 0, instances); + else rlDrawVertexArrayInstanced(0, mesh.vertexCount, instances); + } + + // Unbind all binded texture maps + for (int i = 0; i < MAX_MATERIAL_MAPS; i++) + { + // Select current shader texture slot + rlActiveTextureSlot(i); + + // Disable texture for active slot + if ((i == MATERIAL_MAP_IRRADIANCE) || + (i == MATERIAL_MAP_PREFILTER) || + (i == MATERIAL_MAP_CUBEMAP)) rlDisableTextureCubemap(); + else rlDisableTexture(); + } + + // Disable all possible vertex array objects (or VBOs) + rlDisableVertexArray(); + rlDisableVertexBuffer(); + rlDisableVertexBufferElement(); + + // Disable shader program + rlDisableShader(); + + // Remove instance transforms buffer + rlUnloadVertexBuffer(instancesVboId); + RL_FREE(instanceTransforms); #endif } From 18af18479f1b2b08c0c7c0d2ed2662cb60bcb793 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 27 Aug 2021 18:49:03 +0200 Subject: [PATCH 069/570] REVIEWED: ExportWaveAsCode() --- src/raudio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/raudio.c b/src/raudio.c index f48888a98..706efedd0 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -967,12 +967,13 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) bytesCount += sprintf(txtData + bytesCount, "// Wave data information\n"); bytesCount += sprintf(txtData + bytesCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); - bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_COUNT %u\n", varFileName, wave.frameCount*wave.channels); + bytesCount += sprintf(txtData + bytesCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_RATE %u\n", varFileName, wave.sampleRate); bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_SIZE %u\n", varFileName, wave.sampleSize); bytesCount += sprintf(txtData + bytesCount, "#define %s_CHANNELS %u\n\n", varFileName, wave.channels); // Write byte data as hexadecimal text + // NOTE: Frame data exported is interlaced: Frame01[Sample-Channel01, Sample-Channel02, ...], Frame02[], Frame03[] bytesCount += sprintf(txtData + bytesCount, "static unsigned char %s_DATA[%i] = { ", varFileName, waveDataSize); for (int i = 0; i < waveDataSize - 1; i++) bytesCount += sprintf(txtData + bytesCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)wave.data)[i]); bytesCount += sprintf(txtData + bytesCount, "0x%x };\n", ((unsigned char *)wave.data)[waveDataSize - 1]); From 936199d8de3fecf3ff57bab4d5e35ed9c5ffa54b Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 27 Aug 2021 18:50:02 +0200 Subject: [PATCH 070/570] Review dates --- src/raudio.c | 2 +- src/textures.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index 706efedd0..771fa50db 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -952,7 +952,7 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) bytesCount += sprintf(txtData + bytesCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); bytesCount += sprintf(txtData + bytesCount, "// feedback and support: ray[at]raylib.com //\n"); bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2018 Ramon Santamaria (@raysan5) //\n"); + bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); bytesCount += sprintf(txtData + bytesCount, "// //\n"); bytesCount += sprintf(txtData + bytesCount, "//////////////////////////////////////////////////////////////////////////////////\n\n"); diff --git a/src/textures.c b/src/textures.c index ff55eedf7..8435d2677 100644 --- a/src/textures.c +++ b/src/textures.c @@ -528,7 +528,7 @@ bool ExportImageAsCode(Image image, const char *fileName) bytesCount += sprintf(txtData + bytesCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); bytesCount += sprintf(txtData + bytesCount, "// feedback and support: ray[at]raylib.com //\n"); bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2020 Ramon Santamaria (@raysan5) //\n"); + bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); bytesCount += sprintf(txtData + bytesCount, "// //\n"); bytesCount += sprintf(txtData + bytesCount, "////////////////////////////////////////////////////////////////////////////////////////\n\n"); From 66c6ec44650d56cbe0bfb5c60d84b7225fccc1e5 Mon Sep 17 00:00:00 2001 From: Hussein Sarea <54902350+Ho011@users.noreply.github.com> Date: Sat, 28 Aug 2021 10:57:13 +0300 Subject: [PATCH 071/570] Add pyraylib (#1961) --- BINDINGS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index 2311406b4..163692620 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -45,9 +45,10 @@ Some people ported raylib to other languages in form of bindings or wrappers to | raylib-ruby-ffi | 2.0 | [Ruby](https://www.ruby-lang.org/en/) | https://github.com/D3nX/raylib-ruby-ffi | | raylib-ruby | 2.6 | [Ruby](https://www.ruby-lang.org/en/) | https://github.com/a0/raylib-ruby | | raylib-mruby | 2.5-dev | [mruby](https://github.com/mruby/mruby) | https://github.com/lihaochen910/raylib-mruby | +| pyraylib | 3.7 | [Python](https://www.python.org/) | https://github.com/Ho011/pyraylib | | raylib-py | 2.0 | [Python](https://www.python.org/) | https://github.com/overdev/raylib-py | | raylib-python-cffi | 3.7 | [Python](https://www.python.org/) | https://github.com/electronstudio/raylib-python-cffi | -| raylib-py-ctbg | 2.6 | [Python](https://www.python.org/) | https://github.com/overdev/raylib-py-ctbg | +| raylib-py-ctbg | 2.6 | [Python](https://www.python.org/) | https://github.com/overdev/raylib-py-ctbg | | jaylib | 3.7 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language)) | https://github.com/electronstudio/jaylib/ | | raylib-java | 2.0 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language)) | https://github.com/XoanaIO/raylib-java | | raylib-j | 3.5 | [Java](https://en.wikipedia.org/wiki/Java_(programming_language)) | https://github.com/CreedVI/Raylib-J | From d98e61c6ebf2bca919e1d1a0e8da6164f888d04a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 28 Aug 2021 12:01:16 +0200 Subject: [PATCH 072/570] Minor format tweaks --- src/models.c | 36 ++++++++++++++++++------------------ src/raudio.c | 2 +- src/textures.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/models.c b/src/models.c index 411538d1d..a464c9fdf 100644 --- a/src/models.c +++ b/src/models.c @@ -123,13 +123,13 @@ static ModelAnimation *LoadIQMModelAnimations(const char *fileName, int *animCou static Model LoadGLTF(const char *fileName); // Load GLTF mesh data static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCount); // Load GLTF animation data static void LoadGLTFMaterial(Model *model, const char *fileName, const cgltf_data *data); -static void LoadGLTFMesh(cgltf_data *data, cgltf_mesh* mesh, Model* outModel, Matrix currentTransform, int* primitiveIndex, const char *fileName); -static void LoadGLTFNode(cgltf_data *data, cgltf_node* node, Model* outModel, Matrix currentTransform, int* primitiveIndex, const char *fileName); +static void LoadGLTFMesh(cgltf_data *data, cgltf_mesh *mesh, Model *outModel, Matrix currentTransform, int *primitiveIndex, const char *fileName); +static void LoadGLTFNode(cgltf_data *data, cgltf_node *node, Model *outModel, Matrix currentTransform, int *primitiveIndex, const char *fileName); static void InitGLTFBones(Model *model, const cgltf_data *data); static void BindGLTFPrimitiveToBones(Model *model, const cgltf_data *data, int primitiveIndex); -static void GetGLTFPrimitiveCount(cgltf_node* node, int* outCount); -static bool ReadGLTFValue(cgltf_accessor* acc, unsigned int index, void *variable); -static void *ReadGLTFValuesAs(cgltf_accessor* acc, cgltf_component_type type, bool adjustOnDownCasting); +static void GetGLTFPrimitiveCount(cgltf_node *node, int *outCount); +static bool ReadGLTFValue(cgltf_accessor *acc, unsigned int index, void *variable); +static void *ReadGLTFValuesAs(cgltf_accessor *acc, cgltf_component_type type, bool adjustOnDownCasting); #endif //---------------------------------------------------------------------------------- @@ -4891,7 +4891,7 @@ static Model LoadGLTF(const char *fileName) return model; } -static void InitGLTFBones(Model* model, const cgltf_data* data) +static void InitGLTFBones(Model *model, const cgltf_data *data) { for (unsigned int j = 0; j < data->nodes_count; j++) { @@ -4914,7 +4914,7 @@ static void InitGLTFBones(Model* model, const cgltf_data* data) } { - bool* completedBones = RL_CALLOC(model->boneCount, sizeof(bool)); + bool *completedBones = RL_CALLOC(model->boneCount, sizeof(bool)); int numberCompletedBones = 0; while (numberCompletedBones < model->boneCount) @@ -5022,7 +5022,7 @@ static void LoadGLTFMaterial(Model *model, const char *fileName, const cgltf_dat model->materials[model->materialCount - 1] = LoadMaterialDefault(); } -static void BindGLTFPrimitiveToBones(Model* model, const cgltf_data* data, int primitiveIndex) +static void BindGLTFPrimitiveToBones(Model *model, const cgltf_data *data, int primitiveIndex) { for (unsigned int nodeId = 0; nodeId < data->nodes_count; nodeId++) { @@ -5030,12 +5030,12 @@ static void BindGLTFPrimitiveToBones(Model* model, const cgltf_data* data, int p { if (model->meshes[primitiveIndex].boneIds == NULL) { - model->meshes[primitiveIndex].boneIds = RL_CALLOC(4*model->meshes[primitiveIndex].vertexCount, sizeof(int)); - model->meshes[primitiveIndex].boneWeights = RL_CALLOC(4*model->meshes[primitiveIndex].vertexCount, sizeof(float)); + model->meshes[primitiveIndex].boneIds = RL_CALLOC(model->meshes[primitiveIndex].vertexCount*4, sizeof(int)); + model->meshes[primitiveIndex].boneWeights = RL_CALLOC(model->meshes[primitiveIndex].vertexCount*4, sizeof(float)); - for (int b = 0; b < 4*model->meshes[primitiveIndex].vertexCount; b++) + for (int b = 0; b < model->meshes[primitiveIndex].vertexCount*4; b++) { - if (b % 4 == 0) + if (b%4 == 0) { model->meshes[primitiveIndex].boneIds[b] = nodeId; model->meshes[primitiveIndex].boneWeights[b] = 1.0f; @@ -5112,7 +5112,7 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo // Getting the max animation time to consider for animation duration for (unsigned int i = 0; i < animation->channels_count; i++) { - cgltf_animation_channel* channel = animation->channels + i; + cgltf_animation_channel *channel = animation->channels + i; int frameCounts = (int)channel->sampler->input->count; float lastFrameTime = 0.0f; @@ -5159,8 +5159,8 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo // for each single transformation type on single bone for (unsigned int channelId = 0; channelId < animation->channels_count; channelId++) { - cgltf_animation_channel* channel = animation->channels + channelId; - cgltf_animation_sampler* sampler = channel->sampler; + cgltf_animation_channel *channel = animation->channels + channelId; + cgltf_animation_sampler *sampler = channel->sampler; int boneId = (int)(channel->target_node - data->nodes); @@ -5318,7 +5318,7 @@ static ModelAnimation *LoadGLTFModelAnimations(const char *fileName, int *animCo return animations; } -void LoadGLTFMesh(cgltf_data* data, cgltf_mesh* mesh, Model* outModel, Matrix currentTransform, int* primitiveIndex, const char *fileName) +void LoadGLTFMesh(cgltf_data *data, cgltf_mesh *mesh, Model *outModel, Matrix currentTransform, int *primitiveIndex, const char *fileName) { for (unsigned int p = 0; p < mesh->primitives_count; p++) { @@ -5443,7 +5443,7 @@ void LoadGLTFMesh(cgltf_data* data, cgltf_mesh* mesh, Model* outModel, Matrix cu } } -void LoadGLTFNode(cgltf_data* data, cgltf_node* node, Model* outModel, Matrix currentTransform, int* primitiveIndex, const char *fileName) +void LoadGLTFNode(cgltf_data *data, cgltf_node *node, Model *outModel, Matrix currentTransform, int *primitiveIndex, const char *fileName) { Matrix nodeTransform = { node->matrix[0], node->matrix[4], node->matrix[8], node->matrix[12], @@ -5458,7 +5458,7 @@ void LoadGLTFNode(cgltf_data* data, cgltf_node* node, Model* outModel, Matrix cu for (unsigned int i = 0; i < node->children_count; i++) LoadGLTFNode(data, node->children[i], outModel, currentTransform, primitiveIndex, fileName); } -static void GetGLTFPrimitiveCount(cgltf_node* node, int* outCount) +static void GetGLTFPrimitiveCount(cgltf_node *node, int *outCount) { if (node->mesh != NULL) *outCount += node->mesh->primitives_count; diff --git a/src/raudio.c b/src/raudio.c index 771fa50db..78bbcd810 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -942,7 +942,7 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) // NOTE: Text data buffer size is estimated considering wave data size in bytes // and requiring 6 char bytes for every byte: "0x00, " - char *txtData = (char *)RL_CALLOC(6*waveDataSize + 2000, sizeof(char)); + char *txtData = (char *)RL_CALLOC(waveDataSize*6 + 2000, sizeof(char)); int bytesCount = 0; bytesCount += sprintf(txtData + bytesCount, "\n//////////////////////////////////////////////////////////////////////////////////\n"); diff --git a/src/textures.c b/src/textures.c index 8435d2677..92ed19fad 100644 --- a/src/textures.c +++ b/src/textures.c @@ -518,7 +518,7 @@ bool ExportImageAsCode(Image image, const char *fileName) // NOTE: Text data buffer size is estimated considering image data size in bytes // and requiring 6 char bytes for every byte: "0x00, " - char *txtData = (char *)RL_CALLOC(6*dataSize + 2000, sizeof(char)); + char *txtData = (char *)RL_CALLOC(dataSize*6 + 2000, sizeof(char)); int bytesCount = 0; bytesCount += sprintf(txtData + bytesCount, "////////////////////////////////////////////////////////////////////////////////////////\n"); From 68bcfa119243e716eaf00ffe521d0358c084b74f Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 28 Aug 2021 22:54:47 +0200 Subject: [PATCH 073/570] Minor tweak --- examples/textures/textures_image_loading.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/textures/textures_image_loading.c b/examples/textures/textures_image_loading.c index 527ed35ae..8babce693 100644 --- a/examples/textures/textures_image_loading.c +++ b/examples/textures/textures_image_loading.c @@ -26,8 +26,8 @@ int main(void) Image image = LoadImage("resources/raylib_logo.png"); // Loaded in CPU memory (RAM) Texture2D texture = LoadTextureFromImage(image); // Image converted to texture, GPU memory (VRAM) - UnloadImage(image); // Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM + SetTargetFPS(60); // Set our game to run at 60 frames-per-second //--------------------------------------------------------------------------------------- From e8fa7ceb79613188c495b80a332875a1afdab8cf Mon Sep 17 00:00:00 2001 From: Tristan Schulz Date: Wed, 1 Sep 2021 21:29:20 +0200 Subject: [PATCH 074/570] [models] Fixed counting loop for face amount per material (#1967) --- src/models.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/models.c b/src/models.c index a464c9fdf..b175dd94d 100644 --- a/src/models.c +++ b/src/models.c @@ -3491,6 +3491,11 @@ RayCollision GetRayCollisionQuad(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3, Ve //---------------------------------------------------------------------------------- #if defined(SUPPORT_FILEFORMAT_OBJ) // Load OBJ mesh data +// +// Keep the following information in mind when reading this +// - A mesh is created for every material present in the obj file +// - the model.meshCount is therefore the materialCount returned from tinyobj +// - the mesh is automatically triangulated by tinyobj static Model LoadOBJ(const char *fileName) { Model model = { 0 }; @@ -3542,15 +3547,12 @@ static Model LoadOBJ(const char *fileName) // Count the faces for each material int *matFaces = RL_CALLOC(materialCount, sizeof(int)); - for (unsigned int mi = 0; mi < meshCount; mi++) - { - for (unsigned int fi = 0; fi < meshes[mi].length; fi++) - { - int idx = attrib.material_ids[meshes[mi].face_offset + fi]; - if (idx == -1) idx = 0; // for no material face (which could be the whole model) - matFaces[idx]++; - } + for(int fi = 0; fi< attrib.num_faces; fi++){ + tinyobj_vertex_index_t face = attrib.faces[fi]; + int idx = attrib.material_ids[fi]; + matFaces[idx]++; } + //-------------------------------------- // Create the material meshes From a0f8682905fee1b65c903f1f46adff6e06ab6ae7 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 1 Sep 2021 23:09:30 +0200 Subject: [PATCH 075/570] REVIEWED: Count for consistency Following english rules, it should be singular name before Count. --- src/core.c | 46 +++++++++++------------ src/models.c | 71 ++++++++++++++++++----------------- src/raudio.c | 50 ++++++++++++------------- src/rlgl.h | 100 ++++++++++++++++++++++++------------------------- src/shapes.c | 24 ++++++------ src/textures.c | 66 ++++++++++++++++---------------- 6 files changed, 178 insertions(+), 179 deletions(-) diff --git a/src/core.c b/src/core.c index aff8cdd35..89b9874ac 100644 --- a/src/core.c +++ b/src/core.c @@ -385,7 +385,7 @@ typedef struct CoreData { Matrix screenScale; // Matrix to scale screen (framebuffer rendering) char **dropFilesPath; // Store dropped files paths as strings - int dropFilesCount; // Count dropped files strings + int dropFileCount; // Count dropped files strings } Window; #if defined(PLATFORM_ANDROID) @@ -411,7 +411,7 @@ typedef struct CoreData { int keyPressedQueue[MAX_KEY_PRESSED_QUEUE]; // Input keys queue int keyPressedQueueCount; // Input keys queue count - int charPressedQueue[MAX_CHAR_PRESSED_QUEUE]; // Input characters queue + int charPressedQueue[MAX_CHAR_PRESSED_QUEUE]; // Input characters queue (unicode) int charPressedQueueCount; // Input characters queue count #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM) @@ -481,14 +481,14 @@ typedef struct CoreData { static CoreData CORE = { 0 }; // Global CORE state context static char **dirFilesPath = NULL; // Store directory files paths as strings -static int dirFilesCount = 0; // Count directory files strings +static int dirFileCount = 0; // Count directory files strings #if defined(SUPPORT_SCREEN_CAPTURE) static int screenshotCounter = 0; // Screenshots counter #endif #if defined(SUPPORT_GIF_RECORDING) -static int gifFramesCounter = 0; // GIF frames counter +static int gifFrameCounter = 0; // GIF frames counter static bool gifRecording = false; // GIF recording state static MsfGifState gifState = { 0 }; // MSGIF context state #endif @@ -1926,10 +1926,10 @@ void EndDrawing(void) if (gifRecording) { #define GIF_RECORD_FRAMERATE 10 - gifFramesCounter++; + gifFrameCounter++; // NOTE: We record one gif frame every 10 game frames - if ((gifFramesCounter%GIF_RECORD_FRAMERATE) == 0) + if ((gifFrameCounter%GIF_RECORD_FRAMERATE) == 0) { // Get image data for the current frame (from backbuffer) // NOTE: This process is quite slow... :( @@ -1939,7 +1939,7 @@ void EndDrawing(void) RL_FREE(screenData); // Free image data } - if (((gifFramesCounter/15)%2) == 1) + if (((gifFrameCounter/15)%2) == 1) { DrawCircle(30, CORE.Window.screen.height - 20, 10, MAROON); DrawText("GIF RECORDING", 50, CORE.Window.screen.height - 25, 10, RED); @@ -1953,9 +1953,9 @@ void EndDrawing(void) // Draw record/play indicator if (eventsRecording) { - gifFramesCounter++; + gifFrameCounter++; - if (((gifFramesCounter/15)%2) == 1) + if (((gifFrameCounter/15)%2) == 1) { DrawCircle(30, CORE.Window.screen.height - 20, 10, MAROON); DrawText("EVENTS RECORDING", 50, CORE.Window.screen.height - 25, 10, RED); @@ -1965,9 +1965,9 @@ void EndDrawing(void) } else if (eventsPlaying) { - gifFramesCounter++; + gifFrameCounter++; - if (((gifFramesCounter/15)%2) == 1) + if (((gifFrameCounter/15)%2) == 1) { DrawCircle(30, CORE.Window.screen.height - 20, 10, LIME); DrawText("EVENTS PLAYING", 50, CORE.Window.screen.height - 25, 10, GREEN); @@ -2895,8 +2895,8 @@ char **GetDirectoryFiles(const char *dirPath, int *fileCount) } else TRACELOG(LOG_WARNING, "FILEIO: Failed to open requested directory"); // Maybe it's a file... - dirFilesCount = counter; - *fileCount = dirFilesCount; + dirFileCount = counter; + *fileCount = dirFileCount; return dirFilesPath; } @@ -2904,14 +2904,14 @@ char **GetDirectoryFiles(const char *dirPath, int *fileCount) // Clear directory files paths buffers void ClearDirectoryFiles(void) { - if (dirFilesCount > 0) + if (dirFileCount > 0) { for (int i = 0; i < MAX_DIRECTORY_FILES; i++) RL_FREE(dirFilesPath[i]); RL_FREE(dirFilesPath); } - dirFilesCount = 0; + dirFileCount = 0; } // Change working directory, returns true on success @@ -2927,27 +2927,27 @@ bool ChangeDirectory(const char *dir) // Check if a file has been dropped into window bool IsFileDropped(void) { - if (CORE.Window.dropFilesCount > 0) return true; + if (CORE.Window.dropFileCount > 0) return true; else return false; } // Get dropped files names char **GetDroppedFiles(int *count) { - *count = CORE.Window.dropFilesCount; + *count = CORE.Window.dropFileCount; return CORE.Window.dropFilesPath; } // Clear dropped files paths buffer void ClearDroppedFiles(void) { - if (CORE.Window.dropFilesCount > 0) + if (CORE.Window.dropFileCount > 0) { - for (int i = 0; i < CORE.Window.dropFilesCount; i++) RL_FREE(CORE.Window.dropFilesPath[i]); + for (int i = 0; i < CORE.Window.dropFileCount; i++) RL_FREE(CORE.Window.dropFilesPath[i]); RL_FREE(CORE.Window.dropFilesPath); - CORE.Window.dropFilesCount = 0; + CORE.Window.dropFileCount = 0; } } @@ -4922,7 +4922,7 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i else { gifRecording = true; - gifFramesCounter = 0; + gifFrameCounter = 0; msf_gif_begin(&gifState, CORE.Window.screen.width, CORE.Window.screen.height); screenshotCounter++; @@ -5085,7 +5085,7 @@ static void WindowDropCallback(GLFWwindow *window, int count, const char **paths strcpy(CORE.Window.dropFilesPath[i], paths[i]); } - CORE.Window.dropFilesCount = count; + CORE.Window.dropFileCount = count; } #endif @@ -5145,7 +5145,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd) /* if (assetsReloadRequired) { - for (int i = 0; i < assetsCount; i++) + for (int i = 0; i < assetCount; i++) { // TODO: Unload old asset if required diff --git a/src/models.c b/src/models.c index b175dd94d..b233cf2af 100644 --- a/src/models.c +++ b/src/models.c @@ -201,16 +201,16 @@ void DrawTriangle3D(Vector3 v1, Vector3 v2, Vector3 v3, Color color) } // Draw a triangle strip defined by points -void DrawTriangleStrip3D(Vector3 *points, int pointsCount, Color color) +void DrawTriangleStrip3D(Vector3 *points, int pointCount, Color color) { - if (pointsCount >= 3) + if (pointCount >= 3) { - rlCheckRenderBatchLimit(3*(pointsCount - 2)); + rlCheckRenderBatchLimit(3*(pointCount - 2)); rlBegin(RL_TRIANGLES); rlColor4ub(color.r, color.g, color.b, color.a); - for (int i = 2; i < pointsCount; i++) + for (int i = 2; i < pointCount; i++) { if ((i%2) == 0) { @@ -1144,14 +1144,14 @@ void DrawMesh(Mesh mesh, Material material, Matrix transform) if (mesh.indices != NULL) rlEnableVertexBufferElement(mesh.vboId[6]); } - int eyesCount = 1; - if (rlIsStereoRenderEnabled()) eyesCount = 2; + int eyeCount = 1; + if (rlIsStereoRenderEnabled()) eyeCount = 2; - for (int eye = 0; eye < eyesCount; eye++) + for (int eye = 0; eye < eyeCount; eye++) { // Calculate model-view-projection matrix (MVP) Matrix matModelViewProjection = MatrixIdentity(); - if (eyesCount == 1) matModelViewProjection = MatrixMultiply(matModelView, matProjection); + if (eyeCount == 1) matModelViewProjection = MatrixMultiply(matModelView, matProjection); else { // Setup current eye viewport (half screen width) @@ -1359,14 +1359,14 @@ void DrawMeshInstanced(Mesh mesh, Material material, Matrix *transforms, int ins if (mesh.indices != NULL) rlEnableVertexBufferElement(mesh.vboId[6]); } - int eyesCount = 1; - if (rlIsStereoRenderEnabled()) eyesCount = 2; + int eyeCount = 1; + if (rlIsStereoRenderEnabled()) eyeCount = 2; - for (int eye = 0; eye < eyesCount; eye++) + for (int eye = 0; eye < eyeCount; eye++) { // Calculate model-view-projection matrix (MVP) Matrix matModelViewProjection = MatrixIdentity(); - if (eyesCount == 1) matModelViewProjection = MatrixMultiply(matModelView, matProjection); + if (eyeCount == 1) matModelViewProjection = MatrixMultiply(matModelView, matProjection); else { // Setup current eye viewport (half screen width) @@ -1448,43 +1448,43 @@ bool ExportMesh(Mesh mesh, const char *fileName) // NOTE: Text data buffer size is estimated considering mesh data size char *txtData = (char *)RL_CALLOC(dataSize + 2000, sizeof(char)); - int bytesCount = 0; - bytesCount += sprintf(txtData + bytesCount, "# //////////////////////////////////////////////////////////////////////////////////\n"); - bytesCount += sprintf(txtData + bytesCount, "# // //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // rMeshOBJ exporter v1.0 - Mesh exported as triangle faces and not optimized //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // more info and bugs-report: github.com/raysan5/raylib //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // feedback and support: ray[at]raylib.com //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // Copyright (c) 2018 Ramon Santamaria (@raysan5) //\n"); - bytesCount += sprintf(txtData + bytesCount, "# // //\n"); - bytesCount += sprintf(txtData + bytesCount, "# //////////////////////////////////////////////////////////////////////////////////\n\n"); - bytesCount += sprintf(txtData + bytesCount, "# Vertex Count: %i\n", mesh.vertexCount); - bytesCount += sprintf(txtData + bytesCount, "# Triangle Count: %i\n\n", mesh.triangleCount); + int byteCount = 0; + byteCount += sprintf(txtData + byteCount, "# //////////////////////////////////////////////////////////////////////////////////\n"); + byteCount += sprintf(txtData + byteCount, "# // //\n"); + byteCount += sprintf(txtData + byteCount, "# // rMeshOBJ exporter v1.0 - Mesh exported as triangle faces and not optimized //\n"); + byteCount += sprintf(txtData + byteCount, "# // //\n"); + byteCount += sprintf(txtData + byteCount, "# // more info and bugs-report: github.com/raysan5/raylib //\n"); + byteCount += sprintf(txtData + byteCount, "# // feedback and support: ray[at]raylib.com //\n"); + byteCount += sprintf(txtData + byteCount, "# // //\n"); + byteCount += sprintf(txtData + byteCount, "# // Copyright (c) 2018 Ramon Santamaria (@raysan5) //\n"); + byteCount += sprintf(txtData + byteCount, "# // //\n"); + byteCount += sprintf(txtData + byteCount, "# //////////////////////////////////////////////////////////////////////////////////\n\n"); + byteCount += sprintf(txtData + byteCount, "# Vertex Count: %i\n", mesh.vertexCount); + byteCount += sprintf(txtData + byteCount, "# Triangle Count: %i\n\n", mesh.triangleCount); - bytesCount += sprintf(txtData + bytesCount, "g mesh\n"); + byteCount += sprintf(txtData + byteCount, "g mesh\n"); for (int i = 0, v = 0; i < mesh.vertexCount; i++, v += 3) { - bytesCount += sprintf(txtData + bytesCount, "v %.2f %.2f %.2f\n", mesh.vertices[v], mesh.vertices[v + 1], mesh.vertices[v + 2]); + byteCount += sprintf(txtData + byteCount, "v %.2f %.2f %.2f\n", mesh.vertices[v], mesh.vertices[v + 1], mesh.vertices[v + 2]); } for (int i = 0, v = 0; i < mesh.vertexCount; i++, v += 2) { - bytesCount += sprintf(txtData + bytesCount, "vt %.3f %.3f\n", mesh.texcoords[v], mesh.texcoords[v + 1]); + byteCount += sprintf(txtData + byteCount, "vt %.3f %.3f\n", mesh.texcoords[v], mesh.texcoords[v + 1]); } for (int i = 0, v = 0; i < mesh.vertexCount; i++, v += 3) { - bytesCount += sprintf(txtData + bytesCount, "vn %.3f %.3f %.3f\n", mesh.normals[v], mesh.normals[v + 1], mesh.normals[v + 2]); + byteCount += sprintf(txtData + byteCount, "vn %.3f %.3f %.3f\n", mesh.normals[v], mesh.normals[v + 1], mesh.normals[v + 2]); } for (int i = 0; i < mesh.triangleCount; i += 3) { - bytesCount += sprintf(txtData + bytesCount, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", i, i, i, i + 1, i + 1, i + 1, i + 2, i + 2, i + 2); + byteCount += sprintf(txtData + byteCount, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", i, i, i, i + 1, i + 1, i + 1, i + 2, i + 2, i + 2); } - bytesCount += sprintf(txtData + bytesCount, "\n"); + byteCount += sprintf(txtData + byteCount, "\n"); // NOTE: Text data length exported is determined by '\0' (NULL) character success = SaveFileText(fileName, txtData); @@ -3547,7 +3547,8 @@ static Model LoadOBJ(const char *fileName) // Count the faces for each material int *matFaces = RL_CALLOC(materialCount, sizeof(int)); - for(int fi = 0; fi< attrib.num_faces; fi++){ + for (int fi = 0; fi< attrib.num_faces; fi++) + { tinyobj_vertex_index_t face = attrib.faces[fi]; int idx = attrib.material_ids[fi]; matFaces[idx]++; @@ -4858,14 +4859,14 @@ static Model LoadGLTF(const char *fileName) if (data->scenes_count > 1) TRACELOG(LOG_INFO, "MODEL: [%s] Has multiple scenes but only the first one will be loaded", fileName); - int primitivesCount = 0; + int primitiveCount = 0; for (unsigned int i = 0; i < data->scene->nodes_count; i++) { - GetGLTFPrimitiveCount(data->scene->nodes[i], &primitivesCount); + GetGLTFPrimitiveCount(data->scene->nodes[i], &primitiveCount); } // Process glTF data and map to model - model.meshCount = primitivesCount; + model.meshCount = primitiveCount; model.meshes = RL_CALLOC(model.meshCount, sizeof(Mesh)); model.materialCount = (int)data->materials_count + 1; model.materials = RL_MALLOC(model.materialCount*sizeof(Material)); diff --git a/src/raudio.c b/src/raudio.c index 78bbcd810..5ed3de7c2 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -877,14 +877,14 @@ void UnloadSound(Sound sound) } // Update sound buffer with new data -void UpdateSound(Sound sound, const void *data, int samplesCount) +void UpdateSound(Sound sound, const void *data, int sampleCount) { if (sound.stream.buffer != NULL) { StopAudioBuffer(sound.stream.buffer); // TODO: May want to lock/unlock this since this data buffer is read at mixing time - memcpy(sound.stream.buffer->data, data, samplesCount*ma_get_bytes_per_frame(sound.stream.buffer->converter.config.formatIn, sound.stream.buffer->converter.config.channelsIn)); + memcpy(sound.stream.buffer->data, data, sampleCount*ma_get_bytes_per_frame(sound.stream.buffer->converter.config.formatIn, sound.stream.buffer->converter.config.channelsIn)); } } @@ -944,17 +944,17 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) // and requiring 6 char bytes for every byte: "0x00, " char *txtData = (char *)RL_CALLOC(waveDataSize*6 + 2000, sizeof(char)); - int bytesCount = 0; - bytesCount += sprintf(txtData + bytesCount, "\n//////////////////////////////////////////////////////////////////////////////////\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// WaveAsCode exporter v1.0 - Wave data exported as an array of bytes //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); - bytesCount += sprintf(txtData + bytesCount, "// feedback and support: ray[at]raylib.com //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "//////////////////////////////////////////////////////////////////////////////////\n\n"); + int byteCount = 0; + byteCount += sprintf(txtData + byteCount, "\n//////////////////////////////////////////////////////////////////////////////////\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// WaveAsCode exporter v1.0 - Wave data exported as an array of bytes //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); + byteCount += sprintf(txtData + byteCount, "// feedback and support: ray[at]raylib.com //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "//////////////////////////////////////////////////////////////////////////////////\n\n"); char varFileName[256] = { 0 }; #if !defined(RAUDIO_STANDALONE) @@ -965,18 +965,18 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) strcpy(varFileName, fileName); #endif - bytesCount += sprintf(txtData + bytesCount, "// Wave data information\n"); - bytesCount += sprintf(txtData + bytesCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); - bytesCount += sprintf(txtData + bytesCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); - bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_RATE %u\n", varFileName, wave.sampleRate); - bytesCount += sprintf(txtData + bytesCount, "#define %s_SAMPLE_SIZE %u\n", varFileName, wave.sampleSize); - bytesCount += sprintf(txtData + bytesCount, "#define %s_CHANNELS %u\n\n", varFileName, wave.channels); + byteCount += sprintf(txtData + byteCount, "// Wave data information\n"); + byteCount += sprintf(txtData + byteCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); + byteCount += sprintf(txtData + byteCount, "#define %s_FRAME_COUNT %u\n", varFileName, wave.frameCount); + byteCount += sprintf(txtData + byteCount, "#define %s_SAMPLE_RATE %u\n", varFileName, wave.sampleRate); + byteCount += sprintf(txtData + byteCount, "#define %s_SAMPLE_SIZE %u\n", varFileName, wave.sampleSize); + byteCount += sprintf(txtData + byteCount, "#define %s_CHANNELS %u\n\n", varFileName, wave.channels); // Write byte data as hexadecimal text // NOTE: Frame data exported is interlaced: Frame01[Sample-Channel01, Sample-Channel02, ...], Frame02[], Frame03[] - bytesCount += sprintf(txtData + bytesCount, "static unsigned char %s_DATA[%i] = { ", varFileName, waveDataSize); - for (int i = 0; i < waveDataSize - 1; i++) bytesCount += sprintf(txtData + bytesCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)wave.data)[i]); - bytesCount += sprintf(txtData + bytesCount, "0x%x };\n", ((unsigned char *)wave.data)[waveDataSize - 1]); + byteCount += sprintf(txtData + byteCount, "static unsigned char %s_DATA[%i] = { ", varFileName, waveDataSize); + for (int i = 0; i < waveDataSize - 1; i++) byteCount += sprintf(txtData + byteCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)wave.data)[i]); + byteCount += sprintf(txtData + byteCount, "0x%x };\n", ((unsigned char *)wave.data)[waveDataSize - 1]); // NOTE: Text data length exported is determined by '\0' (NULL) character success = SaveFileText(fileName, txtData); @@ -1505,9 +1505,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, unsigned char *data, int d // Copy data to allocated memory for default UnloadMusicStream unsigned char *newData = (unsigned char *)RL_MALLOC(dataSize); int it = dataSize/sizeof(unsigned char); - for (int i = 0; i < it; i++){ - newData[i] = data[i]; - } + for (int i = 0; i < it; i++) newData[i] = data[i]; // Memory loaded version for jar_mod_load_file() if (dataSize && dataSize < 32*1024*1024) @@ -1716,7 +1714,7 @@ void UpdateMusicStream(Music music) #if defined(SUPPORT_FILEFORMAT_XM) case MUSIC_MODULE_XM: { - // NOTE: Internally we consider 2 channels generation, so samplesCount/2 + // NOTE: Internally we consider 2 channels generation, so sampleCount/2 if (AUDIO_DEVICE_FORMAT == ma_format_f32) jar_xm_generate_samples((jar_xm_context_t *)music.ctxData, (float *)pcm, frameCountToStream); else if (AUDIO_DEVICE_FORMAT == ma_format_s16) jar_xm_generate_samples_16bit((jar_xm_context_t *)music.ctxData, (short *)pcm, frameCountToStream); else if (AUDIO_DEVICE_FORMAT == ma_format_u8) jar_xm_generate_samples_8bit((jar_xm_context_t *)music.ctxData, (char *)pcm, frameCountToStream); diff --git a/src/rlgl.h b/src/rlgl.h index ce99c40e4..ea46c537e 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -279,7 +279,7 @@ typedef enum { // Dynamic vertex buffers (position + texcoords + colors + indices arrays) typedef struct rlVertexBuffer { - int elementsCount; // Number of elements in the buffer (QUADS) + int elementCount; // Number of elements in the buffer (QUADS) int vCounter; // Vertex position counter to process (and draw) from full buffer int tcCounter; // Vertex texcoord counter to process (and draw) from full buffer @@ -316,12 +316,12 @@ typedef struct rlDrawCall { // rlRenderBatch type typedef struct rlRenderBatch { - int buffersCount; // Number of vertex buffers (multi-buffering support) + int bufferCount; // Number of vertex buffers (multi-buffering support) int currentBuffer; // Current buffer tracking in case of multi-buffering rlVertexBuffer *vertexBuffer; // Dynamic buffer(s) for vertex data rlDrawCall *draws; // Draw calls array, depends on textureId - int drawsCounter; // Draw calls counter + int drawCounterer; // Draw calls counter float currentDepth; // Current depth value for next draw } rlRenderBatch; @@ -1210,34 +1210,34 @@ void rlBegin(int mode) { // Draw mode can be RL_LINES, RL_TRIANGLES and RL_QUADS // NOTE: In all three cases, vertex are accumulated over default internal vertex buffer - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode != mode) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode != mode) { - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount > 0) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount > 0) { // Make sure current RLGL.currentBatch->draws[i].vertexCount is aligned a multiple of 4, // that way, following QUADS drawing will keep aligned with index processing // It implies adding some extra alignment vertex at the end of the draw, // those vertex are not processed but they are considered as an additional offset // for the next set of vertex to be drawn - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount%4); - else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount%4))); - else RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = 0; + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4); + else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4))); + else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = 0; - if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment)) + if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment)) { - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->drawsCounter++; + RLGL.currentBatch->drawCounterer++; } } - if (RLGL.currentBatch->drawsCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawCounterer >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode = mode; - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount = 0; - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].textureId = RLGL.State.defaultTextureId; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode = mode; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount = 0; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId = RLGL.State.defaultTextureId; } } @@ -1285,7 +1285,7 @@ void rlEnd(void) // Verify internal buffers limits // NOTE: This check is combined with usage of rlCheckRenderBatchLimit() if ((RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter) >= - (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementsCount*4 - 4)) + (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementCount*4 - 4)) { // WARNING: If we are between rlPushMatrix() and rlPopMatrix() and we need to force a rlDrawRenderBatch(), // we need to call rlPopMatrix() before to recover *RLGL.State.currentMatrix (RLGL.State.modelview) for the next forced draw call! @@ -1312,14 +1312,14 @@ void rlVertex3f(float x, float y, float z) } // Verify that current vertex buffer elements limit has not been reached - if (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter < (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementsCount*4)) + if (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter < (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementCount*4)) { RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter] = tx; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 1] = ty; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 2] = tz; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter++; - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount++; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount++; } else TRACELOG(RL_LOG_ERROR, "RLGL: Batch elements overflow"); } @@ -1390,7 +1390,7 @@ void rlSetTexture(unsigned int id) #else // NOTE: If quads batch limit is reached, we force a draw call and next batch starts if (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter >= - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementsCount*4) + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementCount*4) { rlDrawRenderBatch(RLGL.currentBatch); } @@ -1401,33 +1401,33 @@ void rlSetTexture(unsigned int id) #if defined(GRAPHICS_API_OPENGL_11) rlEnableTexture(id); #else - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].textureId != id) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId != id) { - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount > 0) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount > 0) { // Make sure current RLGL.currentBatch->draws[i].vertexCount is aligned a multiple of 4, // that way, following QUADS drawing will keep aligned with index processing // It implies adding some extra alignment vertex at the end of the draw, // those vertex are not processed but they are considered as an additional offset // for the next set of vertex to be drawn - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount%4); - else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount%4))); - else RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment = 0; + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4); + else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4))); + else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = 0; - if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment)) + if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment)) { - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->drawsCounter++; + RLGL.currentBatch->drawCounterer++; } } - if (RLGL.currentBatch->drawsCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawCounterer >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].textureId = id; - RLGL.currentBatch->draws[RLGL.currentBatch->drawsCounter - 1].vertexCount = 0; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId = id; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount = 0; } #endif } @@ -2169,7 +2169,7 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) for (int i = 0; i < numBuffers; i++) { - batch.vertexBuffer[i].elementsCount = bufferElements; + batch.vertexBuffer[i].elementCount = bufferElements; batch.vertexBuffer[i].vertices = (float *)RL_MALLOC(bufferElements*3*4*sizeof(float)); // 3 float by vertex, 4 vertex by quad batch.vertexBuffer[i].texcoords = (float *)RL_MALLOC(bufferElements*2*4*sizeof(float)); // 2 float by texcoord, 4 texcoord by quad @@ -2274,8 +2274,8 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) //batch.draws[i].RLGL.State.modelview = rlMatrixIdentity(); } - batch.buffersCount = numBuffers; // Record buffer count - batch.drawsCounter = 1; // Reset draws counter + batch.bufferCount = numBuffers; // Record buffer count + batch.drawCounterer = 1; // Reset draws counter batch.currentDepth = -1.0f; // Reset depth value //-------------------------------------------------------------------------------------------- #endif @@ -2297,7 +2297,7 @@ void rlUnloadRenderBatch(rlRenderBatch batch) glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); // Unload all vertex buffers data - for (int i = 0; i < batch.buffersCount; i++) + for (int i = 0; i < batch.bufferCount; i++) { // Delete VBOs from GPU (VRAM) glDeleteBuffers(1, &batch.vertexBuffer[i].vboId[0]); @@ -2338,17 +2338,17 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // Vertex positions buffer glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[0]); glBufferSubData(GL_ARRAY_BUFFER, 0, batch->vertexBuffer[batch->currentBuffer].vCounter*3*sizeof(float), batch->vertexBuffer[batch->currentBuffer].vertices); - //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*3*4*batch->vertexBuffer[batch->currentBuffer].elementsCount, batch->vertexBuffer[batch->currentBuffer].vertices, GL_DYNAMIC_DRAW); // Update all buffer + //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*3*4*batch->vertexBuffer[batch->currentBuffer].elementCount, batch->vertexBuffer[batch->currentBuffer].vertices, GL_DYNAMIC_DRAW); // Update all buffer // Texture coordinates buffer glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[1]); glBufferSubData(GL_ARRAY_BUFFER, 0, batch->vertexBuffer[batch->currentBuffer].vCounter*2*sizeof(float), batch->vertexBuffer[batch->currentBuffer].texcoords); - //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*2*4*batch->vertexBuffer[batch->currentBuffer].elementsCount, batch->vertexBuffer[batch->currentBuffer].texcoords, GL_DYNAMIC_DRAW); // Update all buffer + //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*2*4*batch->vertexBuffer[batch->currentBuffer].elementCount, batch->vertexBuffer[batch->currentBuffer].texcoords, GL_DYNAMIC_DRAW); // Update all buffer // Colors buffer glBindBuffer(GL_ARRAY_BUFFER, batch->vertexBuffer[batch->currentBuffer].vboId[2]); glBufferSubData(GL_ARRAY_BUFFER, 0, batch->vertexBuffer[batch->currentBuffer].vCounter*4*sizeof(unsigned char), batch->vertexBuffer[batch->currentBuffer].colors); - //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*4*4*batch->vertexBuffer[batch->currentBuffer].elementsCount, batch->vertexBuffer[batch->currentBuffer].colors, GL_DYNAMIC_DRAW); // Update all buffer + //glBufferData(GL_ARRAY_BUFFER, sizeof(float)*4*4*batch->vertexBuffer[batch->currentBuffer].elementCount, batch->vertexBuffer[batch->currentBuffer].colors, GL_DYNAMIC_DRAW); // Update all buffer // NOTE: glMapBuffer() causes sync issue. // If GPU is working with this buffer, glMapBuffer() will wait(stall) until GPU to finish its job. @@ -2375,12 +2375,12 @@ void rlDrawRenderBatch(rlRenderBatch *batch) Matrix matProjection = RLGL.State.projection; Matrix matModelView = RLGL.State.modelview; - int eyesCount = 1; - if (RLGL.State.stereoRender) eyesCount = 2; + int eyeCount = 1; + if (RLGL.State.stereoRender) eyeCount = 2; - for (int eye = 0; eye < eyesCount; eye++) + for (int eye = 0; eye < eyeCount; eye++) { - if (eyesCount == 2) + if (eyeCount == 2) { // Setup current eye viewport (half screen width) rlViewport(eye*RLGL.State.framebufferWidth/2, 0, RLGL.State.framebufferWidth/2, RLGL.State.framebufferHeight); @@ -2447,7 +2447,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // NOTE: Batch system accumulates calls by texture0 changes, additional textures are enabled for all the draw calls glActiveTexture(GL_TEXTURE0); - for (int i = 0, vertexOffset = 0; i < batch->drawsCounter; i++) + for (int i = 0, vertexOffset = 0; i < batch->drawCounterer; i++) { // Bind current draw call texture, activated as GL_TEXTURE0 and binded to sampler2D texture0 by default glBindTexture(GL_TEXTURE_2D, batch->draws[i].textureId); @@ -2456,7 +2456,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) else { #if defined(GRAPHICS_API_OPENGL_33) - // We need to define the number of indices to be processed: quadsCount*6 + // We need to define the number of indices to be processed: elementCount*6 // NOTE: The final parameter tells the GPU the offset in bytes from the // start of the index buffer to the location of the first index to process glDrawElements(GL_TRIANGLES, batch->draws[i].vertexCount/4*6, GL_UNSIGNED_INT, (GLvoid *)(vertexOffset/4*6*sizeof(GLuint))); @@ -2510,12 +2510,12 @@ void rlDrawRenderBatch(rlRenderBatch *batch) for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) RLGL.State.activeTextureId[i] = 0; // Reset draws counter to one draw for the batch - batch->drawsCounter = 1; + batch->drawCounterer = 1; //------------------------------------------------------------------------------------------------------------ // Change to next buffer in the list (in case of multi-buffering) batch->currentBuffer++; - if (batch->currentBuffer >= batch->buffersCount) batch->currentBuffer = 0; + if (batch->currentBuffer >= batch->bufferCount) batch->currentBuffer = 0; #endif } @@ -2546,7 +2546,7 @@ bool rlCheckRenderBatchLimit(int vCount) #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) if ((RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + vCount) >= - (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementsCount*4)) + (RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].elementCount*4)) { overflow = true; rlDrawRenderBatch(RLGL.currentBatch); // NOTE: Stereo rendering is checked inside diff --git a/src/shapes.c b/src/shapes.c index 104aef0a7..86e7c97a2 100644 --- a/src/shapes.c +++ b/src/shapes.c @@ -190,16 +190,16 @@ void DrawLineBezierQuad(Vector2 startPos, Vector2 endPos, Vector2 controlPos, fl } // Draw lines sequence -void DrawLineStrip(Vector2 *points, int pointsCount, Color color) +void DrawLineStrip(Vector2 *points, int pointCount, Color color) { - if (pointsCount >= 2) + if (pointCount >= 2) { - rlCheckRenderBatchLimit(pointsCount); + rlCheckRenderBatchLimit(pointCount); rlBegin(RL_LINES); rlColor4ub(color.r, color.g, color.b, color.a); - for (int i = 0; i < pointsCount - 1; i++) + for (int i = 0; i < pointCount - 1; i++) { rlVertex2f(points[i].x, points[i].y); rlVertex2f(points[i + 1].x, points[i + 1].y); @@ -1318,17 +1318,17 @@ void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color) // Draw a triangle fan defined by points // NOTE: First vertex provided is the center, shared by all triangles // By default, following vertex should be provided in counter-clockwise order -void DrawTriangleFan(Vector2 *points, int pointsCount, Color color) +void DrawTriangleFan(Vector2 *points, int pointCount, Color color) { - if (pointsCount >= 3) + if (pointCount >= 3) { - rlCheckRenderBatchLimit((pointsCount - 2)*4); + rlCheckRenderBatchLimit((pointCount - 2)*4); rlSetTexture(texShapes.id); rlBegin(RL_QUADS); rlColor4ub(color.r, color.g, color.b, color.a); - for (int i = 1; i < pointsCount - 1; i++) + for (int i = 1; i < pointCount - 1; i++) { rlTexCoord2f(texShapesRec.x/texShapes.width, texShapesRec.y/texShapes.height); rlVertex2f(points[0].x, points[0].y); @@ -1349,16 +1349,16 @@ void DrawTriangleFan(Vector2 *points, int pointsCount, Color color) // Draw a triangle strip defined by points // NOTE: Every new vertex connects with previous two -void DrawTriangleStrip(Vector2 *points, int pointsCount, Color color) +void DrawTriangleStrip(Vector2 *points, int pointCount, Color color) { - if (pointsCount >= 3) + if (pointCount >= 3) { - rlCheckRenderBatchLimit(3*(pointsCount - 2)); + rlCheckRenderBatchLimit(3*(pointCount - 2)); rlBegin(RL_TRIANGLES); rlColor4ub(color.r, color.g, color.b, color.a); - for (int i = 2; i < pointsCount; i++) + for (int i = 2; i < pointCount; i++) { if ((i%2) == 0) { diff --git a/src/textures.c b/src/textures.c index 92ed19fad..41a0a077b 100644 --- a/src/textures.c +++ b/src/textures.c @@ -258,7 +258,7 @@ Image LoadImageRaw(const char *fileName, int width, int height, int format, int Image LoadImageAnim(const char *fileName, int *frames) { Image image = { 0 }; - int framesCount = 1; + int frameCount = 1; #if defined(SUPPORT_FILEFORMAT_GIF) if (IsFileExtension(fileName, ".gif")) @@ -270,7 +270,7 @@ Image LoadImageAnim(const char *fileName, int *frames) { int comp = 0; int **delays = NULL; - image.data = stbi_load_gif_from_memory(fileData, dataSize, delays, &image.width, &image.height, &framesCount, &comp, 4); + image.data = stbi_load_gif_from_memory(fileData, dataSize, delays, &image.width, &image.height, &frameCount, &comp, 4); image.mipmaps = 1; image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; @@ -286,7 +286,7 @@ Image LoadImageAnim(const char *fileName, int *frames) // TODO: Support APNG animated images? - *frames = framesCount; + *frames = frameCount; return image; } @@ -520,17 +520,17 @@ bool ExportImageAsCode(Image image, const char *fileName) // and requiring 6 char bytes for every byte: "0x00, " char *txtData = (char *)RL_CALLOC(dataSize*6 + 2000, sizeof(char)); - int bytesCount = 0; - bytesCount += sprintf(txtData + bytesCount, "////////////////////////////////////////////////////////////////////////////////////////\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// ImageAsCode exporter v1.0 - Image pixel data exported as an array of bytes //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); - bytesCount += sprintf(txtData + bytesCount, "// feedback and support: ray[at]raylib.com //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); - bytesCount += sprintf(txtData + bytesCount, "// //\n"); - bytesCount += sprintf(txtData + bytesCount, "////////////////////////////////////////////////////////////////////////////////////////\n\n"); + int byteCount = 0; + byteCount += sprintf(txtData + byteCount, "////////////////////////////////////////////////////////////////////////////////////////\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// ImageAsCode exporter v1.0 - Image pixel data exported as an array of bytes //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// more info and bugs-report: github.com/raysan5/raylib //\n"); + byteCount += sprintf(txtData + byteCount, "// feedback and support: ray[at]raylib.com //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "// Copyright (c) 2018-2021 Ramon Santamaria (@raysan5) //\n"); + byteCount += sprintf(txtData + byteCount, "// //\n"); + byteCount += sprintf(txtData + byteCount, "////////////////////////////////////////////////////////////////////////////////////////\n\n"); // Get file name from path and convert variable name to uppercase char varFileName[256] = { 0 }; @@ -538,14 +538,14 @@ bool ExportImageAsCode(Image image, const char *fileName) for (int i = 0; varFileName[i] != '\0'; i++) if ((varFileName[i] >= 'a') && (varFileName[i] <= 'z')) { varFileName[i] = varFileName[i] - 32; } // Add image information - bytesCount += sprintf(txtData + bytesCount, "// Image data information\n"); - bytesCount += sprintf(txtData + bytesCount, "#define %s_WIDTH %i\n", varFileName, image.width); - bytesCount += sprintf(txtData + bytesCount, "#define %s_HEIGHT %i\n", varFileName, image.height); - bytesCount += sprintf(txtData + bytesCount, "#define %s_FORMAT %i // raylib internal pixel format\n\n", varFileName, image.format); + byteCount += sprintf(txtData + byteCount, "// Image data information\n"); + byteCount += sprintf(txtData + byteCount, "#define %s_WIDTH %i\n", varFileName, image.width); + byteCount += sprintf(txtData + byteCount, "#define %s_HEIGHT %i\n", varFileName, image.height); + byteCount += sprintf(txtData + byteCount, "#define %s_FORMAT %i // raylib internal pixel format\n\n", varFileName, image.format); - bytesCount += sprintf(txtData + bytesCount, "static unsigned char %s_DATA[%i] = { ", varFileName, dataSize); - for (int i = 0; i < dataSize - 1; i++) bytesCount += sprintf(txtData + bytesCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)image.data)[i]); - bytesCount += sprintf(txtData + bytesCount, "0x%x };\n", ((unsigned char *)image.data)[dataSize - 1]); + byteCount += sprintf(txtData + byteCount, "static unsigned char %s_DATA[%i] = { ", varFileName, dataSize); + for (int i = 0; i < dataSize - 1; i++) byteCount += sprintf(txtData + byteCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)image.data)[i]); + byteCount += sprintf(txtData + byteCount, "0x%x };\n", ((unsigned char *)image.data)[dataSize - 1]); // NOTE: Text data length exported is determined by '\0' (NULL) character success = SaveFileText(fileName, txtData); @@ -765,11 +765,11 @@ Image GenImageCellular(int width, int height, int tileSize) int seedsPerRow = width/tileSize; int seedsPerCol = height/tileSize; - int seedsCount = seedsPerRow*seedsPerCol; + int seedCount = seedsPerRow*seedsPerCol; - Vector2 *seeds = (Vector2 *)RL_MALLOC(seedsCount*sizeof(Vector2)); + Vector2 *seeds = (Vector2 *)RL_MALLOC(seedCount*sizeof(Vector2)); - for (int i = 0; i < seedsCount; i++) + for (int i = 0; i < seedCount; i++) { int y = (i/seedsPerRow)*tileSize + GetRandomValue(0, tileSize - 1); int x = (i%seedsPerRow)*tileSize + GetRandomValue(0, tileSize - 1); @@ -1180,12 +1180,12 @@ Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Co { if ((codepoint != ' ') && (codepoint != '\t')) { - Rectangle rec = { (float)(textOffsetX + font.chars[index].offsetX), (float)(textOffsetY + font.chars[index].offsetY), (float)font.recs[index].width, (float)font.recs[index].height }; - ImageDraw(&imText, font.chars[index].image, (Rectangle){ 0, 0, (float)font.chars[index].image.width, (float)font.chars[index].image.height }, rec, tint); + Rectangle rec = { (float)(textOffsetX + font.glyphs[index].offsetX), (float)(textOffsetY + font.glyphs[index].offsetY), (float)font.recs[index].width, (float)font.recs[index].height }; + ImageDraw(&imText, font.glyphs[index].image, (Rectangle){ 0, 0, (float)font.glyphs[index].image.width, (float)font.glyphs[index].image.height }, rec, tint); } - if (font.chars[index].advanceX == 0) textOffsetX += (int)(font.recs[index].width + spacing); - else textOffsetX += font.chars[index].advanceX + (int)spacing; + if (font.glyphs[index].advanceX == 0) textOffsetX += (int)(font.recs[index].width + spacing); + else textOffsetX += font.glyphs[index].advanceX + (int)spacing; } i += (codepointByteCount - 1); // Move text bytes counter to next codepoint @@ -2185,7 +2185,7 @@ Color *LoadImageColors(Image image) // Load colors palette from image as a Color array (RGBA - 32bit) // NOTE: Memory allocated should be freed using UnloadImagePalette() -Color *LoadImagePalette(Image image, int maxPaletteSize, int *colorsCount) +Color *LoadImagePalette(Image image, int maxPaletteSize, int *colorCount) { #define COLOR_EQUAL(col1, col2) ((col1.r == col2.r)&&(col1.g == col2.g)&&(col1.b == col2.b)&&(col1.a == col2.a)) @@ -2234,7 +2234,7 @@ Color *LoadImagePalette(Image image, int maxPaletteSize, int *colorsCount) UnloadImageColors(pixels); } - *colorsCount = palCount; + *colorCount = palCount; return palette; } @@ -3487,9 +3487,9 @@ void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle dest, // Draw textured polygon, defined by vertex and texturecoordinates // NOTE: Polygon center must have straight line path to all points // without crossing perimeter, points must be in anticlockwise order -void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 *texcoords, int pointsCount, Color tint) +void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 *texcoords, int pointCount, Color tint) { - rlCheckRenderBatchLimit((pointsCount - 1)*4); + rlCheckRenderBatchLimit((pointCount - 1)*4); rlSetTexture(texture.id); @@ -3498,7 +3498,7 @@ void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 rlColor4ub(tint.r, tint.g, tint.b, tint.a); - for (int i = 0; i < pointsCount - 1; i++) + for (int i = 0; i < pointCount - 1; i++) { rlTexCoord2f(0.5f, 0.5f); rlVertex2f(center.x, center.y); From 6e76baa6a93d039e132fe11eedc74958971bf4a3 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 1 Sep 2021 23:11:31 +0200 Subject: [PATCH 076/570] WARNING: BREAKING: RENAMED: Font struct variables RENAMED: GetCodepointsCount() -> GetCodepointCount() RENAMED: GetTouchPointsCount() -> GetTouchPointCount() --- examples/text/text_rectangle_bounds.c | 2 +- examples/text/text_unicode.c | 4 +- src/gestures.h | 4 +- src/raylib.h | 42 +++--- src/text.c | 184 +++++++++++++------------- 5 files changed, 118 insertions(+), 118 deletions(-) diff --git a/examples/text/text_rectangle_bounds.c b/examples/text/text_rectangle_bounds.c index 0da1a8ab3..b4884fb36 100644 --- a/examples/text/text_rectangle_bounds.c +++ b/examples/text/text_rectangle_bounds.c @@ -166,7 +166,7 @@ static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float glyphWidth = 0; if (codepoint != '\n') { - glyphWidth = (font.chars[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.chars[index].advanceX*scaleFactor; + glyphWidth = (font.glyphs[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.glyphs[index].advanceX*scaleFactor; if (i + 1 < length) glyphWidth = glyphWidth + spacing; } diff --git a/examples/text/text_unicode.c b/examples/text/text_unicode.c index 883d2a5cd..4b6b7780f 100644 --- a/examples/text/text_unicode.c +++ b/examples/text/text_unicode.c @@ -277,7 +277,7 @@ int main(int argc, char **argv) // Draw the info text below the main message int size = (int)strlen(messages[message].text); - int len = GetCodepointsCount(messages[message].text); + int len = GetCodepointCount(messages[message].text); const char *info = TextFormat("%s %u characters %i bytes", messages[message].language, len, size); sz = MeasureTextEx(GetFontDefault(), info, 10, 1.0f); Vector2 pos = { textRect.x + textRect.width - sz.x, msgRect.y + msgRect.height - sz.y - 2 }; @@ -367,7 +367,7 @@ static void DrawTextBoxedSelectable(Font font, const char *text, Rectangle rec, float glyphWidth = 0; if (codepoint != '\n') { - glyphWidth = (font.chars[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.chars[index].advanceX*scaleFactor; + glyphWidth = (font.glyphs[index].advanceX == 0) ? font.recs[index].width*scaleFactor : font.glyphs[index].advanceX*scaleFactor; if (i + 1 < length) glyphWidth = glyphWidth + spacing; } diff --git a/src/gestures.h b/src/gestures.h index 355f60817..09adffd02 100644 --- a/src/gestures.h +++ b/src/gestures.h @@ -118,7 +118,7 @@ void UpdateGestures(void); // Update gestures detec void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags bool IsGestureDetected(int gesture); // Check if a gesture have been detected int GetGestureDetected(void); // Get latest detected gesture -int GetTouchPointsCount(void); // Get touch points count +int GetTouchPointCount(void); // Get touch points count float GetGestureHoldDuration(void); // Get gesture hold time in milliseconds Vector2 GetGestureDragVector(void); // Get gesture drag vector float GetGestureDragAngle(void); // Get gesture drag angle @@ -431,7 +431,7 @@ void UpdateGestures(void) } // Get number of touch points -int GetTouchPointsCount(void) +int GetTouchPointCount(void) { // NOTE: point count is calculated when ProcessGestureEvent(GestureEvent event) is called diff --git a/src/raylib.h b/src/raylib.h index fb0be1783..6b26713d4 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -287,11 +287,11 @@ typedef struct GlyphInfo { // Font, font texture and GlyphInfo array data typedef struct Font { int baseSize; // Base size (default chars height) - int charsCount; // Number of characters - int charsPadding; // Padding around the chars - Texture2D texture; // Characters texture atlas - Rectangle *recs; // Characters rectangles in texture - GlyphInfo *chars; // Characters glyphs info data + int glyphCount; // Number of glyph characters + int glyphPadding; // Padding around the glyph characters + Texture2D texture; // Texture atlas containing the glyphs + Rectangle *recs; // Rectangles in texture for the glyphs + GlyphInfo *glyphs; // Glyphs info data } Font; // Camera, defines position/orientation in 3d space @@ -1111,7 +1111,7 @@ RLAPI Vector2 GetTouchPosition(int index); // Get touch posit RLAPI void SetGesturesEnabled(unsigned int flags); // Enable a set of gestures using flags RLAPI bool IsGestureDetected(int gesture); // Check if a gesture have been detected RLAPI int GetGestureDetected(void); // Get latest detected gesture -RLAPI int GetTouchPointsCount(void); // Get touch points count +RLAPI int GetTouchPointCount(void); // Get touch points count RLAPI float GetGestureHoldDuration(void); // Get gesture hold time in milliseconds RLAPI Vector2 GetGestureDragVector(void); // Get gesture drag vector RLAPI float GetGestureDragAngle(void); // Get gesture drag angle @@ -1145,7 +1145,7 @@ RLAPI void DrawLineV(Vector2 startPos, Vector2 endPos, Color color); RLAPI void DrawLineEx(Vector2 startPos, Vector2 endPos, float thick, Color color); // Draw a line defining thickness RLAPI void DrawLineBezier(Vector2 startPos, Vector2 endPos, float thick, Color color); // Draw a line using cubic-bezier curves in-out RLAPI void DrawLineBezierQuad(Vector2 startPos, Vector2 endPos, Vector2 controlPos, float thick, Color color); //Draw line using quadratic bezier curves with a control point -RLAPI void DrawLineStrip(Vector2 *points, int pointsCount, Color color); // Draw lines sequence +RLAPI void DrawLineStrip(Vector2 *points, int pointCount, Color color); // Draw lines sequence RLAPI void DrawCircle(int centerX, int centerY, float radius, Color color); // Draw a color-filled circle RLAPI void DrawCircleSector(Vector2 center, float radius, float startAngle, float endAngle, int segments, Color color); // Draw a piece of a circle RLAPI void DrawCircleSectorLines(Vector2 center, float radius, float startAngle, float endAngle, int segments, Color color); // Draw circle sector outline @@ -1169,8 +1169,8 @@ RLAPI void DrawRectangleRounded(Rectangle rec, float roundness, int segments, Co RLAPI void DrawRectangleRoundedLines(Rectangle rec, float roundness, int segments, float lineThick, Color color); // Draw rectangle with rounded edges outline RLAPI void DrawTriangle(Vector2 v1, Vector2 v2, Vector2 v3, Color color); // Draw a color-filled triangle (vertex in counter-clockwise order!) RLAPI void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color); // Draw triangle outline (vertex in counter-clockwise order!) -RLAPI void DrawTriangleFan(Vector2 *points, int pointsCount, Color color); // Draw a triangle fan defined by points (first vertex is the center) -RLAPI void DrawTriangleStrip(Vector2 *points, int pointsCount, Color color); // Draw a triangle strip defined by points +RLAPI void DrawTriangleFan(Vector2 *points, int pointCount, Color color); // Draw a triangle fan defined by points (first vertex is the center) +RLAPI void DrawTriangleStrip(Vector2 *points, int pointCount, Color color); // Draw a triangle strip defined by points RLAPI void DrawPoly(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a regular polygon (Vector version) RLAPI void DrawPolyLines(Vector2 center, int sides, float radius, float rotation, Color color); // Draw a polygon outline of n sides RLAPI void DrawPolyLinesEx(Vector2 center, int sides, float radius, float rotation, float lineThick, Color color); // Draw a polygon outline of n sides with extended parameters @@ -1239,7 +1239,7 @@ RLAPI void ImageColorContrast(Image *image, float contrast); RLAPI void ImageColorBrightness(Image *image, int brightness); // Modify image color: brightness (-255 to 255) RLAPI void ImageColorReplace(Image *image, Color color, Color replace); // Modify image color: replace color RLAPI Color *LoadImageColors(Image image); // Load color data from image as a Color array (RGBA - 32bit) -RLAPI Color *LoadImagePalette(Image image, int maxPaletteSize, int *colorsCount); // Load colors palette from image as a Color array (RGBA - 32bit) +RLAPI Color *LoadImagePalette(Image image, int maxPaletteSize, int *colorCount); // Load colors palette from image as a Color array (RGBA - 32bit) RLAPI void UnloadImageColors(Color *colors); // Unload color data loaded with LoadImageColors() RLAPI void UnloadImagePalette(Color *colors); // Unload colors palette loaded with LoadImagePalette() RLAPI Rectangle GetImageAlphaBorder(Image image, float threshold); // Get image alpha border rectangle @@ -1286,7 +1286,7 @@ RLAPI void DrawTextureQuad(Texture2D texture, Vector2 tiling, Vector2 offset, Re RLAPI void DrawTextureTiled(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, float scale, Color tint); // Draw part of a texture (defined by a rectangle) with rotation and scale tiled into dest. RLAPI void DrawTexturePro(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draw a part of a texture defined by a rectangle with 'pro' parameters RLAPI void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle dest, Vector2 origin, float rotation, Color tint); // Draws a texture (or part of it) that stretches or shrinks nicely -RLAPI void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 *texcoords, int pointsCount, Color tint); // Draw a textured polygon +RLAPI void DrawTexturePoly(Texture2D texture, Vector2 center, Vector2 *points, Vector2 *texcoords, int pointCount, Color tint); // Draw a textured polygon // Color/pixel related functions RLAPI Color Fade(Color color, float alpha); // Get color with alpha applied, alpha goes from 0.0f to 1.0f @@ -1309,12 +1309,12 @@ RLAPI int GetPixelDataSize(int width, int height, int format); // G // Font loading/unloading functions RLAPI Font GetFontDefault(void); // Get the default Font RLAPI Font LoadFont(const char *fileName); // Load font from file into GPU memory (VRAM) -RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount); // Load font from file with extended parameters +RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int glyphCount); // Load font from file with extended parameters RLAPI Font LoadFontFromImage(Image image, Color key, int firstChar); // Load font from Image (XNA style) -RLAPI Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount); // Load font from memory buffer, fileType refers to extension: i.e. '.ttf' -RLAPI GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use -RLAPI Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **recs, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info -RLAPI void UnloadFontData(GlyphInfo *chars, int charsCount); // Unload font chars info data (RAM) +RLAPI Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int glyphCount); // Load font from memory buffer, fileType refers to extension: i.e. '.ttf' +RLAPI GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int glyphCount, int type); // Load font data for further use +RLAPI Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **recs, int glyphCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info +RLAPI void UnloadFontData(GlyphInfo *chars, int glyphCount); // Unload font chars info data (RAM) RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM) // Text drawing functions @@ -1334,7 +1334,7 @@ RLAPI Rectangle GetGlyphAtlasRec(Font font, int codepoint); // Text codepoints management functions (unicode characters) RLAPI int *LoadCodepoints(const char *text, int *count); // Load all codepoints from a UTF-8 text string, codepoints count returned by parameter RLAPI void UnloadCodepoints(int *codepoints); // Unload codepoints data from memory -RLAPI int GetCodepointsCount(const char *text); // Get total number of codepoints in a UTF-8 encoded string +RLAPI int GetCodepointCount(const char *text); // Get total number of codepoints in a UTF-8 encoded string RLAPI int GetCodepoint(const char *text, int *bytesProcessed); // Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength); // Encode one codepoint into UTF-8 byte array (array length returned as parameter) RLAPI char *TextCodepointsToUTF8(int *codepoints, int length); // Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!) @@ -1366,7 +1366,7 @@ RLAPI void DrawLine3D(Vector3 startPos, Vector3 endPos, Color color); RLAPI void DrawPoint3D(Vector3 position, Color color); // Draw a point in 3D space, actually a small line RLAPI void DrawCircle3D(Vector3 center, float radius, Vector3 rotationAxis, float rotationAngle, Color color); // Draw a circle in 3D world space RLAPI void DrawTriangle3D(Vector3 v1, Vector3 v2, Vector3 v3, Color color); // Draw a color-filled triangle (vertex in counter-clockwise order!) -RLAPI void DrawTriangleStrip3D(Vector3 *points, int pointsCount, Color color); // Draw a triangle strip defined by points +RLAPI void DrawTriangleStrip3D(Vector3 *points, int pointCount, Color color); // Draw a triangle strip defined by points RLAPI void DrawCube(Vector3 position, float width, float height, float length, Color color); // Draw cube RLAPI void DrawCubeV(Vector3 position, Vector3 size, Color color); // Draw cube (Vector version) RLAPI void DrawCubeWires(Vector3 position, float width, float height, float length, Color color); // Draw cube wires @@ -1434,7 +1434,7 @@ RLAPI void SetMaterialTexture(Material *material, int mapType, Texture2D texture RLAPI void SetModelMeshMaterial(Model *model, int meshId, int materialId); // Set material for a mesh // Model animations loading/unloading functions -RLAPI ModelAnimation *LoadModelAnimations(const char *fileName, int *animsCount); // Load model animations from file +RLAPI ModelAnimation *LoadModelAnimations(const char *fileName, int *animCount); // Load model animations from file RLAPI void UpdateModelAnimation(Model model, ModelAnimation anim, int frame); // Update model animation pose RLAPI void UnloadModelAnimation(ModelAnimation anim); // Unload animation data RLAPI void UnloadModelAnimations(ModelAnimation* animations, unsigned int count); // Unload animation array data @@ -1466,7 +1466,7 @@ RLAPI Wave LoadWave(const char *fileName); // Load wa RLAPI Wave LoadWaveFromMemory(const char *fileType, const unsigned char *fileData, int dataSize); // Load wave from memory buffer, fileType refers to extension: i.e. '.wav' RLAPI Sound LoadSound(const char *fileName); // Load sound from file RLAPI Sound LoadSoundFromWave(Wave wave); // Load sound from wave data -RLAPI void UpdateSound(Sound sound, const void *data, int samplesCount);// Update sound buffer with new data +RLAPI void UpdateSound(Sound sound, const void *data, int sampleCount); // Update sound buffer with new data RLAPI void UnloadWave(Wave wave); // Unload wave data RLAPI void UnloadSound(Sound sound); // Unload sound RLAPI bool ExportWave(Wave wave, const char *fileName); // Export wave data to file, returns true on success @@ -1507,7 +1507,7 @@ RLAPI float GetMusicTimePlayed(Music music); // Get cur // AudioStream management functions RLAPI AudioStream LoadAudioStream(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels); // Load audio stream (to stream raw audio pcm data) RLAPI void UnloadAudioStream(AudioStream stream); // Unload audio stream and free memory -RLAPI void UpdateAudioStream(AudioStream stream, const void *data, int framesCount); // Update audio stream buffers with data +RLAPI void UpdateAudioStream(AudioStream stream, const void *data, int frameCount); // Update audio stream buffers with data RLAPI bool IsAudioStreamProcessed(AudioStream stream); // Check if any audio stream buffers requires refill RLAPI void PlayAudioStream(AudioStream stream); // Play audio stream RLAPI void PauseAudioStream(AudioStream stream); // Pause audio stream diff --git a/src/text.c b/src/text.c index 66a08eb19..ae6f38661 100644 --- a/src/text.c +++ b/src/text.c @@ -129,8 +129,8 @@ extern void LoadFontDefault(void) // NOTE: Using UTF-8 encoding table for Unicode U+0000..U+00FF Basic Latin + Latin-1 Supplement // Ref: http://www.utf8-chartable.de/unicode-utf8-table.pl - defaultFont.charsCount = 224; // Number of chars included in our default font - defaultFont.charsPadding = 0; // Characters padding + defaultFont.glyphCount = 224; // Number of chars included in our default font + defaultFont.glyphPadding = 0; // Characters padding // Default font is directly defined here (data generated from a sprite font image) // This way, we reconstruct Font without creating large global variables @@ -220,21 +220,21 @@ extern void LoadFontDefault(void) defaultFont.texture = LoadTextureFromImage(imFont); - // Reconstruct charSet using charsWidth[], charsHeight, charsDivisor, charsCount + // Reconstruct charSet using charsWidth[], charsHeight, charsDivisor, glyphCount //------------------------------------------------------------------------------ // Allocate space for our characters info data // NOTE: This memory should be freed at end! --> CloseWindow() - defaultFont.chars = (GlyphInfo *)RL_MALLOC(defaultFont.charsCount*sizeof(GlyphInfo)); - defaultFont.recs = (Rectangle *)RL_MALLOC(defaultFont.charsCount*sizeof(Rectangle)); + defaultFont.glyphs = (GlyphInfo *)RL_MALLOC(defaultFont.glyphCount*sizeof(GlyphInfo)); + defaultFont.recs = (Rectangle *)RL_MALLOC(defaultFont.glyphCount*sizeof(Rectangle)); int currentLine = 0; int currentPosX = charsDivisor; int testPosX = charsDivisor; - for (int i = 0; i < defaultFont.charsCount; i++) + for (int i = 0; i < defaultFont.glyphCount; i++) { - defaultFont.chars[i].value = 32 + i; // First char is 32 + defaultFont.glyphs[i].value = 32 + i; // First char is 32 defaultFont.recs[i].x = (float)currentPosX; defaultFont.recs[i].y = (float)(charsDivisor + currentLine*(charsHeight + charsDivisor)); @@ -255,12 +255,12 @@ extern void LoadFontDefault(void) else currentPosX = testPosX; // NOTE: On default font character offsets and xAdvance are not required - defaultFont.chars[i].offsetX = 0; - defaultFont.chars[i].offsetY = 0; - defaultFont.chars[i].advanceX = 0; + defaultFont.glyphs[i].offsetX = 0; + defaultFont.glyphs[i].offsetY = 0; + defaultFont.glyphs[i].advanceX = 0; // Fill character image data from fontClear data - defaultFont.chars[i].image = ImageFromImage(imFont, defaultFont.recs[i]); + defaultFont.glyphs[i].image = ImageFromImage(imFont, defaultFont.recs[i]); } UnloadImage(imFont); @@ -273,9 +273,9 @@ extern void LoadFontDefault(void) // Unload raylib default font extern void UnloadFontDefault(void) { - for (int i = 0; i < defaultFont.charsCount; i++) UnloadImage(defaultFont.chars[i].image); + for (int i = 0; i < defaultFont.glyphCount; i++) UnloadImage(defaultFont.glyphs[i].image); UnloadTexture(defaultFont.texture); - RL_FREE(defaultFont.chars); + RL_FREE(defaultFont.glyphs); RL_FREE(defaultFont.recs); } #endif // SUPPORT_DEFAULT_FONT @@ -337,7 +337,7 @@ Font LoadFont(const char *fileName) // Load Font from TTF font file with generation parameters // NOTE: You can pass an array with desired characters, those characters should be available in the font // if array is NULL, default char set is selected 32..126 -Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount) +Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int glyphCount) { Font font = { 0 }; @@ -348,7 +348,7 @@ Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCou if (fileData != NULL) { // Loading font from memory data - font = LoadFontFromMemory(GetFileExtension(fileName), fileData, fileSize, fontSize, fontChars, charsCount); + font = LoadFontFromMemory(GetFileExtension(fileName), fileData, fileSize, fontSize, fontChars, glyphCount); RL_FREE(fileData); } @@ -449,28 +449,28 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) Font font = { 0 }; font.texture = LoadTextureFromImage(fontClear); // Convert processed image to OpenGL texture - font.charsCount = index; - font.charsPadding = 0; + font.glyphCount = index; + font.glyphPadding = 0; // We got tempCharValues and tempCharsRecs populated with chars data // Now we move temp data to sized charValues and charRecs arrays - font.chars = (GlyphInfo *)RL_MALLOC(font.charsCount*sizeof(GlyphInfo)); - font.recs = (Rectangle *)RL_MALLOC(font.charsCount*sizeof(Rectangle)); + font.glyphs = (GlyphInfo *)RL_MALLOC(font.glyphCount*sizeof(GlyphInfo)); + font.recs = (Rectangle *)RL_MALLOC(font.glyphCount*sizeof(Rectangle)); - for (int i = 0; i < font.charsCount; i++) + for (int i = 0; i < font.glyphCount; i++) { - font.chars[i].value = tempCharValues[i]; + font.glyphs[i].value = tempCharValues[i]; // Get character rectangle in the font atlas texture font.recs[i] = tempCharRecs[i]; // NOTE: On image based fonts (XNA style), character offsets and xAdvance are not required (set to 0) - font.chars[i].offsetX = 0; - font.chars[i].offsetY = 0; - font.chars[i].advanceX = 0; + font.glyphs[i].offsetX = 0; + font.glyphs[i].offsetY = 0; + font.glyphs[i].advanceX = 0; // Fill character image data from fontClear data - font.chars[i].image = ImageFromImage(fontClear, tempCharRecs[i]); + font.glyphs[i].image = ImageFromImage(fontClear, tempCharRecs[i]); } UnloadImage(fontClear); // Unload processed image once converted to texture @@ -481,7 +481,7 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) } // Load font from memory buffer, fileType refers to extension: i.e. ".ttf" -Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount) +Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int glyphCount) { Font font = { 0 }; @@ -493,22 +493,22 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int TextIsEqual(fileExtLower, ".otf")) { font.baseSize = fontSize; - font.charsCount = (charsCount > 0)? charsCount : 95; - font.charsPadding = 0; - font.chars = LoadFontData(fileData, dataSize, font.baseSize, fontChars, font.charsCount, FONT_DEFAULT); + font.glyphCount = (glyphCount > 0)? glyphCount : 95; + font.glyphPadding = 0; + font.glyphs = LoadFontData(fileData, dataSize, font.baseSize, fontChars, font.glyphCount, FONT_DEFAULT); - if (font.chars != NULL) + if (font.glyphs != NULL) { - font.charsPadding = FONT_TTF_DEFAULT_CHARS_PADDING; + font.glyphPadding = FONT_TTF_DEFAULT_CHARS_PADDING; - Image atlas = GenImageFontAtlas(font.chars, &font.recs, font.charsCount, font.baseSize, font.charsPadding, 0); + Image atlas = GenImageFontAtlas(font.glyphs, &font.recs, font.glyphCount, font.baseSize, font.glyphPadding, 0); font.texture = LoadTextureFromImage(atlas); - // Update chars[i].image to use alpha, required to be used on ImageDrawText() - for (int i = 0; i < font.charsCount; i++) + // Update glyphs[i].image to use alpha, required to be used on ImageDrawText() + for (int i = 0; i < font.glyphCount; i++) { - UnloadImage(font.chars[i].image); - font.chars[i].image = ImageFromImage(atlas, font.recs[i]); + UnloadImage(font.glyphs[i].image); + font.glyphs[i].image = ImageFromImage(atlas, font.recs[i]); } UnloadImage(atlas); @@ -524,7 +524,7 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int // Load font data for further use // NOTE: Requires TTF font memory data and can generate SDF data -GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type) +GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSize, int *fontChars, int glyphCount, int type) { // NOTE: Using some SDF generation default values, // trades off precision with ability to handle *smaller* sizes @@ -562,22 +562,22 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz stbtt_GetFontVMetrics(&fontInfo, &ascent, &descent, &lineGap); // In case no chars count provided, default to 95 - charsCount = (charsCount > 0)? charsCount : 95; + glyphCount = (glyphCount > 0)? glyphCount : 95; // Fill fontChars in case not provided externally - // NOTE: By default we fill charsCount consecutevely, starting at 32 (Space) + // NOTE: By default we fill glyphCount consecutevely, starting at 32 (Space) if (fontChars == NULL) { - fontChars = (int *)RL_MALLOC(charsCount*sizeof(int)); - for (int i = 0; i < charsCount; i++) fontChars[i] = i + 32; + fontChars = (int *)RL_MALLOC(glyphCount*sizeof(int)); + for (int i = 0; i < glyphCount; i++) fontChars[i] = i + 32; genFontChars = true; } - chars = (GlyphInfo *)RL_MALLOC(charsCount*sizeof(GlyphInfo)); + chars = (GlyphInfo *)RL_MALLOC(glyphCount*sizeof(GlyphInfo)); // NOTE: Using simple packaging, one char after another - for (int i = 0; i < charsCount; i++) + for (int i = 0; i < glyphCount; i++) { int chw = 0, chh = 0; // Character width and height (on generation) int ch = fontChars[i]; // Character value to get info for @@ -650,7 +650,7 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz // Generate image font atlas using chars info // NOTE: Packing method: 0-Default, 1-Skyline #if defined(SUPPORT_FILEFORMAT_TTF) -Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsCount, int fontSize, int padding, int packMethod) +Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int glyphCount, int fontSize, int padding, int packMethod) { Image atlas = { 0 }; @@ -663,17 +663,17 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsC *charRecs = NULL; // In case no chars count provided we suppose default of 95 - charsCount = (charsCount > 0)? charsCount : 95; + glyphCount = (glyphCount > 0)? glyphCount : 95; // NOTE: Rectangles memory is loaded here! - Rectangle *recs = (Rectangle *)RL_MALLOC(charsCount*sizeof(Rectangle)); + Rectangle *recs = (Rectangle *)RL_MALLOC(glyphCount*sizeof(Rectangle)); // Calculate image size based on required pixel area // NOTE 1: Image is forced to be squared and POT... very conservative! // NOTE 2: SDF font characters already contain an internal padding, // so image size would result bigger than default font type float requiredArea = 0; - for (int i = 0; i < charsCount; i++) requiredArea += ((chars[i].image.width + 2*padding)*(chars[i].image.height + 2*padding)); + for (int i = 0; i < glyphCount; i++) requiredArea += ((chars[i].image.width + 2*padding)*(chars[i].image.height + 2*padding)); float guessSize = sqrtf(requiredArea)*1.3f; int imageSize = (int)powf(2, ceilf(logf((float)guessSize)/logf(2))); // Calculate next POT @@ -692,7 +692,7 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsC int offsetY = padding; // NOTE: Using simple packaging, one char after another - for (int i = 0; i < charsCount; i++) + for (int i = 0; i < glyphCount; i++) { // Copy pixel data from fc.data to atlas for (int y = 0; y < chars[i].image.height; y++) @@ -728,13 +728,13 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsC else if (packMethod == 1) // Use Skyline rect packing algorythm (stb_pack_rect) { stbrp_context *context = (stbrp_context *)RL_MALLOC(sizeof(*context)); - stbrp_node *nodes = (stbrp_node *)RL_MALLOC(charsCount*sizeof(*nodes)); + stbrp_node *nodes = (stbrp_node *)RL_MALLOC(glyphCount*sizeof(*nodes)); - stbrp_init_target(context, atlas.width, atlas.height, nodes, charsCount); - stbrp_rect *rects = (stbrp_rect *)RL_MALLOC(charsCount*sizeof(stbrp_rect)); + stbrp_init_target(context, atlas.width, atlas.height, nodes, glyphCount); + stbrp_rect *rects = (stbrp_rect *)RL_MALLOC(glyphCount*sizeof(stbrp_rect)); // Fill rectangles for packaging - for (int i = 0; i < charsCount; i++) + for (int i = 0; i < glyphCount; i++) { rects[i].id = i; rects[i].w = chars[i].image.width + 2*padding; @@ -742,9 +742,9 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsC } // Package rectangles into atlas - stbrp_pack_rects(context, rects, charsCount); + stbrp_pack_rects(context, rects, glyphCount); - for (int i = 0; i < charsCount; i++) + for (int i = 0; i < glyphCount; i++) { // It return char rectangles in atlas recs[i].x = rects[i].x + (float)padding; @@ -792,12 +792,12 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int charsC } #endif -// Unload font chars info data (RAM) -void UnloadFontData(GlyphInfo *chars, int charsCount) +// Unload font glyphs info data (RAM) +void UnloadFontData(GlyphInfo *glyphs, int glyphCount) { - for (int i = 0; i < charsCount; i++) UnloadImage(chars[i].image); + for (int i = 0; i < glyphCount; i++) UnloadImage(glyphs[i].image); - RL_FREE(chars); + RL_FREE(glyphs); } // Unload Font from GPU memory (VRAM) @@ -806,7 +806,7 @@ void UnloadFont(Font font) // NOTE: Make sure font is not default font (fallback) if (font.texture.id != GetFontDefault().texture.id) { - UnloadFontData(font.chars, font.charsCount); + UnloadFontData(font.glyphs, font.glyphCount); UnloadTexture(font.texture); RL_FREE(font.recs); @@ -883,8 +883,8 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f DrawTextCodepoint(font, codepoint, (Vector2){ position.x + textOffsetX, position.y + textOffsetY }, fontSize, tint); } - if (font.chars[index].advanceX == 0) textOffsetX += ((float)font.recs[index].width*scaleFactor + spacing); - else textOffsetX += ((float)font.chars[index].advanceX*scaleFactor + spacing); + if (font.glyphs[index].advanceX == 0) textOffsetX += ((float)font.recs[index].width*scaleFactor + spacing); + else textOffsetX += ((float)font.glyphs[index].advanceX*scaleFactor + spacing); } i += codepointByteCount; // Move text bytes counter to next codepoint @@ -914,16 +914,16 @@ void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSiz float scaleFactor = fontSize/font.baseSize; // Character quad scaling factor // Character destination rectangle on screen - // NOTE: We consider charsPadding on drawing - Rectangle dstRec = { position.x + font.chars[index].offsetX*scaleFactor - (float)font.charsPadding*scaleFactor, - position.y + font.chars[index].offsetY*scaleFactor - (float)font.charsPadding*scaleFactor, - (font.recs[index].width + 2.0f*font.charsPadding)*scaleFactor, - (font.recs[index].height + 2.0f*font.charsPadding)*scaleFactor }; + // NOTE: We consider glyphPadding on drawing + Rectangle dstRec = { position.x + font.glyphs[index].offsetX*scaleFactor - (float)font.glyphPadding*scaleFactor, + position.y + font.glyphs[index].offsetY*scaleFactor - (float)font.glyphPadding*scaleFactor, + (font.recs[index].width + 2.0f*font.glyphPadding)*scaleFactor, + (font.recs[index].height + 2.0f*font.glyphPadding)*scaleFactor }; // Character source rectangle from font texture atlas // NOTE: We consider chars padding when drawing, it could be required for outline/glow shader effects - Rectangle srcRec = { font.recs[index].x - (float)font.charsPadding, font.recs[index].y - (float)font.charsPadding, - font.recs[index].width + 2.0f*font.charsPadding, font.recs[index].height + 2.0f*font.charsPadding }; + Rectangle srcRec = { font.recs[index].x - (float)font.glyphPadding, font.recs[index].y - (float)font.glyphPadding, + font.recs[index].width + 2.0f*font.glyphPadding, font.recs[index].height + 2.0f*font.glyphPadding }; // Draw the character texture on the screen DrawTexturePro(font.texture, srcRec, dstRec, (Vector2){ 0, 0 }, 0.0f, tint); @@ -978,8 +978,8 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing if (letter != '\n') { - if (font.chars[index].advanceX != 0) textWidth += font.chars[index].advanceX; - else textWidth += (font.recs[index].width + font.chars[index].offsetX); + if (font.glyphs[index].advanceX != 0) textWidth += font.glyphs[index].advanceX; + else textWidth += (font.recs[index].width + font.glyphs[index].offsetX); } else { @@ -1014,9 +1014,9 @@ int GetGlyphIndex(Font font, int codepoint) #if defined(SUPPORT_UNORDERED_CHARSET) int index = GLYPH_NOTFOUND_CHAR_FALLBACK; - for (int i = 0; i < font.charsCount; i++) + for (int i = 0; i < font.glyphCount; i++) { - if (font.chars[i].value == codepoint) + if (font.glyphs[i].value == codepoint) { index = i; break; @@ -1035,7 +1035,7 @@ GlyphInfo GetGlyphInfo(Font font, int codepoint) { GlyphInfo info = { 0 }; - info = font.chars[GetGlyphIndex(font, codepoint)]; + info = font.glyphs[GetGlyphIndex(font, codepoint)]; return info; } @@ -1472,22 +1472,22 @@ int *LoadCodepoints(const char *text, int *count) int textLength = TextLength(text); int bytesProcessed = 0; - int codepointsCount = 0; + int codepointCount = 0; // Allocate a big enough buffer to store as many codepoints as text bytes int *codepoints = RL_CALLOC(textLength, sizeof(int)); - for (int i = 0; i < textLength; codepointsCount++) + for (int i = 0; i < textLength; codepointCount++) { - codepoints[codepointsCount] = GetCodepoint(text + i, &bytesProcessed); + codepoints[codepointCount] = GetCodepoint(text + i, &bytesProcessed); i += bytesProcessed; } // Re-allocate buffer to the actual number of codepoints loaded - void *temp = RL_REALLOC(codepoints, codepointsCount*sizeof(int)); + void *temp = RL_REALLOC(codepoints, codepointCount*sizeof(int)); if (temp != NULL) codepoints = temp; - *count = codepointsCount; + *count = codepointCount; return codepoints; } @@ -1500,7 +1500,7 @@ void UnloadCodepoints(int *codepoints) // Get total number of characters(codepoints) in a UTF-8 encoded text, until '\0' is found // NOTE: If an invalid UTF-8 sequence is encountered a '?'(0x3f) codepoint is counted instead -int GetCodepointsCount(const char *text) +int GetCodepointCount(const char *text) { unsigned int len = 0; char *ptr = (char *)&text[0]; @@ -1657,7 +1657,7 @@ static Font LoadBMFont(const char *fileName) char *searchPoint = NULL; int fontSize = 0; - int charsCount = 0; + int glyphCount = 0; int imWidth = 0; int imHeight = 0; @@ -1694,10 +1694,10 @@ static Font LoadBMFont(const char *fileName) lineBytes = GetLine(fileTextPtr, buffer, MAX_BUFFER_SIZE); searchPoint = strstr(buffer, "count"); - sscanf(searchPoint, "count=%i", &charsCount); + sscanf(searchPoint, "count=%i", &glyphCount); fileTextPtr += (lineBytes + 1); - TRACELOGD(" > Chars count: %i", charsCount); + TRACELOGD(" > Chars count: %i", glyphCount); // Compose correct path using route of .fnt file (fileName) and imFileName char *imPath = NULL; @@ -1746,14 +1746,14 @@ static Font LoadBMFont(const char *fileName) // Fill font characters info data font.baseSize = fontSize; - font.charsCount = charsCount; - font.charsPadding = 0; - font.chars = (GlyphInfo *)RL_MALLOC(charsCount*sizeof(GlyphInfo)); - font.recs = (Rectangle *)RL_MALLOC(charsCount*sizeof(Rectangle)); + font.glyphCount = glyphCount; + font.glyphPadding = 0; + font.glyphs = (GlyphInfo *)RL_MALLOC(glyphCount*sizeof(GlyphInfo)); + font.recs = (Rectangle *)RL_MALLOC(glyphCount*sizeof(Rectangle)); int charId, charX, charY, charWidth, charHeight, charOffsetX, charOffsetY, charAdvanceX; - for (int i = 0; i < charsCount; i++) + for (int i = 0; i < glyphCount; i++) { lineBytes = GetLine(fileTextPtr, buffer, MAX_BUFFER_SIZE); sscanf(buffer, "char id=%i x=%i y=%i width=%i height=%i xoffset=%i yoffset=%i xadvance=%i", @@ -1764,13 +1764,13 @@ static Font LoadBMFont(const char *fileName) font.recs[i] = (Rectangle){ (float)charX, (float)charY, (float)charWidth, (float)charHeight }; // Save data properly in sprite font - font.chars[i].value = charId; - font.chars[i].offsetX = charOffsetX; - font.chars[i].offsetY = charOffsetY; - font.chars[i].advanceX = charAdvanceX; + font.glyphs[i].value = charId; + font.glyphs[i].offsetX = charOffsetX; + font.glyphs[i].offsetY = charOffsetY; + font.glyphs[i].advanceX = charAdvanceX; // Fill character image data from imFont data - font.chars[i].image = ImageFromImage(imFont, font.recs[i]); + font.glyphs[i].image = ImageFromImage(imFont, font.recs[i]); } UnloadImage(imFont); From dfadb3ee379f60f9fdb3d3a1535c716555e05dcc Mon Sep 17 00:00:00 2001 From: atticus Date: Thu, 2 Sep 2021 00:15:32 +0300 Subject: [PATCH 077/570] fix various memory leaks (#1969) --- src/extras/rmem.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/extras/rmem.h b/src/extras/rmem.h index 7f50adf8c..43005cfec 100644 --- a/src/extras/rmem.h +++ b/src/extras/rmem.h @@ -276,7 +276,10 @@ static void __InsertMemNode(MemPool *const mempool, AllocList *const list, MemNo mempool->arena.offs += iter->size; __RemoveMemNode(list, iter); iter = list->head; - if (iter == NULL) return; + if (iter == NULL) { + list->head = node; + return; + } } const uintptr_t inode = ( uintptr_t )node; const uintptr_t iiter = ( uintptr_t )iter; @@ -293,6 +296,14 @@ static void __InsertMemNode(MemPool *const mempool, AllocList *const list, MemNo iter->size += node->size; return; } + else if (iter->next == NULL) + { + // we reached the end of the free list -> append the node + iter->next = node; + node->prev = iter; + list->len++; + return; + } } else if (iter > node) { @@ -326,7 +337,7 @@ static void __InsertMemNode(MemPool *const mempool, AllocList *const list, MemNo } else { - __InsertMemNodeBefore(list, iter, node); + __InsertMemNodeBefore(list, node, iter); list->len++; return; } From 9362eaf9c670c86e3ce4045b7465e55db47bddb7 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 1 Sep 2021 23:40:51 +0200 Subject: [PATCH 078/570] REVIEWED: Naming: length vs size --- examples/text/text_unicode.c | 4 +-- src/core.c | 4 +-- src/raylib.h | 2 +- src/rlgl.h | 70 ++++++++++++++++++------------------ src/text.c | 40 ++++++++++----------- src/textures.c | 6 ++-- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/text/text_unicode.c b/examples/text/text_unicode.c index 4b6b7780f..c1521996f 100644 --- a/examples/text/text_unicode.c +++ b/examples/text/text_unicode.c @@ -277,8 +277,8 @@ int main(int argc, char **argv) // Draw the info text below the main message int size = (int)strlen(messages[message].text); - int len = GetCodepointCount(messages[message].text); - const char *info = TextFormat("%s %u characters %i bytes", messages[message].language, len, size); + int length = GetCodepointCount(messages[message].text); + const char *info = TextFormat("%s %u characters %i bytes", messages[message].language, length, size); sz = MeasureTextEx(GetFontDefault(), info, 10, 1.0f); Vector2 pos = { textRect.x + textRect.width - sz.x, msgRect.y + msgRect.height - sz.y - 2 }; DrawText(info, (int)pos.x, (int)pos.y, 10, RAYWHITE); diff --git a/src/core.c b/src/core.c index 89b9874ac..043f99e90 100644 --- a/src/core.c +++ b/src/core.c @@ -2767,9 +2767,9 @@ const char *GetFileNameWithoutExt(const char *filePath) if (filePath != NULL) strcpy(fileName, GetFileName(filePath)); // Get filename with extension - int len = (int)strlen(fileName); + int size = (int)strlen(fileName); // Get size in bytes - for (int i = 0; (i < len) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++) + for (int i = 0; (i < size) && (i < MAX_FILENAMEWITHOUTEXT_LENGTH); i++) { if (fileName[i] == '.') { diff --git a/src/raylib.h b/src/raylib.h index 6b26713d4..9e46e842e 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1336,7 +1336,7 @@ RLAPI int *LoadCodepoints(const char *text, int *count); // Load al RLAPI void UnloadCodepoints(int *codepoints); // Unload codepoints data from memory RLAPI int GetCodepointCount(const char *text); // Get total number of codepoints in a UTF-8 encoded string RLAPI int GetCodepoint(const char *text, int *bytesProcessed); // Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure -RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength); // Encode one codepoint into UTF-8 byte array (array length returned as parameter) +RLAPI const char *CodepointToUTF8(int codepoint, int *byteSize); // Encode one codepoint into UTF-8 byte array (array length returned as parameter) RLAPI char *TextCodepointsToUTF8(int *codepoints, int length); // Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!) // Text strings management functions (no UTF-8 strings, only byte chars) diff --git a/src/rlgl.h b/src/rlgl.h index ea46c537e..0bed58044 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -321,7 +321,7 @@ typedef struct rlRenderBatch { rlVertexBuffer *vertexBuffer; // Dynamic buffer(s) for vertex data rlDrawCall *draws; // Draw calls array, depends on textureId - int drawCounterer; // Draw calls counter + int drawCounter; // Draw calls counter float currentDepth; // Current depth value for next draw } rlRenderBatch; @@ -1210,34 +1210,34 @@ void rlBegin(int mode) { // Draw mode can be RL_LINES, RL_TRIANGLES and RL_QUADS // NOTE: In all three cases, vertex are accumulated over default internal vertex buffer - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode != mode) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode != mode) { - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount > 0) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount > 0) { // Make sure current RLGL.currentBatch->draws[i].vertexCount is aligned a multiple of 4, // that way, following QUADS drawing will keep aligned with index processing // It implies adding some extra alignment vertex at the end of the draw, // those vertex are not processed but they are considered as an additional offset // for the next set of vertex to be drawn - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4); - else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4))); - else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = 0; + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount%4); + else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount%4))); + else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = 0; - if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment)) + if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment)) { - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; - RLGL.currentBatch->drawCounterer++; + RLGL.currentBatch->drawCounter++; } } - if (RLGL.currentBatch->drawCounterer >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode = mode; - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount = 0; - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId = RLGL.State.defaultTextureId; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode = mode; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount = 0; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId = RLGL.State.defaultTextureId; } } @@ -1319,7 +1319,7 @@ void rlVertex3f(float x, float y, float z) RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vertices[3*RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter + 2] = tz; RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter++; - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount++; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount++; } else TRACELOG(RL_LOG_ERROR, "RLGL: Batch elements overflow"); } @@ -1401,33 +1401,33 @@ void rlSetTexture(unsigned int id) #if defined(GRAPHICS_API_OPENGL_11) rlEnableTexture(id); #else - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId != id) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId != id) { - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount > 0) + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount > 0) { // Make sure current RLGL.currentBatch->draws[i].vertexCount is aligned a multiple of 4, // that way, following QUADS drawing will keep aligned with index processing // It implies adding some extra alignment vertex at the end of the draw, // those vertex are not processed but they are considered as an additional offset // for the next set of vertex to be drawn - if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4); - else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount%4))); - else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment = 0; + if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode == RL_LINES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount < 4)? RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount : RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount%4); + else if (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].mode == RL_TRIANGLES) RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = ((RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount < 4)? 1 : (4 - (RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount%4))); + else RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment = 0; - if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment)) + if (!rlCheckRenderBatchLimit(RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment)) { - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; - RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].vCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].cCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; + RLGL.currentBatch->vertexBuffer[RLGL.currentBatch->currentBuffer].tcCounter += RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexAlignment; - RLGL.currentBatch->drawCounterer++; + RLGL.currentBatch->drawCounter++; } } - if (RLGL.currentBatch->drawCounterer >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); + if (RLGL.currentBatch->drawCounter >= RL_DEFAULT_BATCH_DRAWCALLS) rlDrawRenderBatch(RLGL.currentBatch); - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].textureId = id; - RLGL.currentBatch->draws[RLGL.currentBatch->drawCounterer - 1].vertexCount = 0; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].textureId = id; + RLGL.currentBatch->draws[RLGL.currentBatch->drawCounter - 1].vertexCount = 0; } #endif } @@ -1910,12 +1910,12 @@ void rlLoadExtensions(void *loader) const char *extensions = (const char *)glGetString(GL_EXTENSIONS); // One big const string // NOTE: We have to duplicate string because glGetString() returns a const string - int len = strlen(extensions) + 1; - char *extensionsDup = (char *)RL_CALLOC(len, sizeof(char)); + int size = strlen(extensions) + 1; // Get extensions string size in bytes + char *extensionsDup = (char *)RL_CALLOC(size, sizeof(char)); strcpy(extensionsDup, extensions); extList[numExt] = extensionsDup; - for (int i = 0; i < len; i++) + for (int i = 0; i < size; i++) { if (extensionsDup[i] == ' ') { @@ -2275,7 +2275,7 @@ rlRenderBatch rlLoadRenderBatch(int numBuffers, int bufferElements) } batch.bufferCount = numBuffers; // Record buffer count - batch.drawCounterer = 1; // Reset draws counter + batch.drawCounter = 1; // Reset draws counter batch.currentDepth = -1.0f; // Reset depth value //-------------------------------------------------------------------------------------------- #endif @@ -2447,7 +2447,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) // NOTE: Batch system accumulates calls by texture0 changes, additional textures are enabled for all the draw calls glActiveTexture(GL_TEXTURE0); - for (int i = 0, vertexOffset = 0; i < batch->drawCounterer; i++) + for (int i = 0, vertexOffset = 0; i < batch->drawCounter; i++) { // Bind current draw call texture, activated as GL_TEXTURE0 and binded to sampler2D texture0 by default glBindTexture(GL_TEXTURE_2D, batch->draws[i].textureId); @@ -2510,7 +2510,7 @@ void rlDrawRenderBatch(rlRenderBatch *batch) for (int i = 0; i < RL_DEFAULT_BATCH_MAX_TEXTURE_UNITS; i++) RLGL.State.activeTextureId[i] = 0; // Reset draws counter to one draw for the batch - batch->drawCounterer = 1; + batch->drawCounter = 1; //------------------------------------------------------------------------------------------------------------ // Change to next buffer in the list (in case of multi-buffering) diff --git a/src/text.c b/src/text.c index ae6f38661..a7736bffb 100644 --- a/src/text.c +++ b/src/text.c @@ -851,14 +851,14 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f { if (font.texture.id == 0) font = GetFontDefault(); // Security check in case of not valid font - int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop + int size = TextLength(text); // Total size in bytes of the text, scanned by codepoints in loop int textOffsetY = 0; // Offset between lines (on line break '\n') float textOffsetX = 0.0f; // Offset X to next character to draw float scaleFactor = fontSize/font.baseSize; // Character quad scaling factor - for (int i = 0; i < length;) + for (int i = 0; i < size;) { // Get next codepoint from byte string and glyph index in font int codepointByteCount = 0; @@ -950,9 +950,9 @@ int MeasureText(const char *text, int fontSize) // Measure string size for Font Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing) { - int len = TextLength(text); - int tempLen = 0; // Used to count longer text line num chars - int lenCounter = 0; + int size = TextLength(text); // Get size in bytes of text + int tempByteCounter = 0; // Used to count longer text line num chars + int byteCounter = 0; float textWidth = 0.0f; float tempTextWidth = 0.0f; // Used to count longer text line width @@ -963,9 +963,9 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing int letter = 0; // Current character int index = 0; // Index position in sprite font - for (int i = 0; i < len; i++) + for (int i = 0; i < size; i++) { - lenCounter++; + byteCounter++; int next = 0; letter = GetCodepoint(&text[i], &next); @@ -984,18 +984,18 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing else { if (tempTextWidth < textWidth) tempTextWidth = textWidth; - lenCounter = 0; + byteCounter = 0; textWidth = 0; textHeight += ((float)font.baseSize*1.5f); // NOTE: Fixed line spacing of 1.5 lines } - if (tempLen < lenCounter) tempLen = lenCounter; + if (tempByteCounter < byteCounter) tempByteCounter = byteCounter; } if (tempTextWidth < textWidth) tempTextWidth = textWidth; Vector2 vec = { 0 }; - vec.x = tempTextWidth*scaleFactor + (float)((tempLen - 1)*spacing); // Adds chars spacing to measure + vec.x = tempTextWidth*scaleFactor + (float)((tempByteCounter - 1)*spacing); // Adds chars spacing to measure vec.y = textHeight*scaleFactor; return vec; @@ -1429,28 +1429,28 @@ char *TextCodepointsToUTF8(int *codepoints, int length) // Encode codepoint into utf8 text (char array length returned as parameter) // NOTE: It uses a static array to store UTF-8 bytes -RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength) +RLAPI const char *CodepointToUTF8(int codepoint, int *byteSize) { static char utf8[6] = { 0 }; - int length = 0; + int size = 0; // Byte size of codepoint if (codepoint <= 0x7f) { utf8[0] = (char)codepoint; - length = 1; + size = 1; } else if (codepoint <= 0x7ff) { utf8[0] = (char)(((codepoint >> 6) & 0x1f) | 0xc0); utf8[1] = (char)((codepoint & 0x3f) | 0x80); - length = 2; + size = 2; } else if (codepoint <= 0xffff) { utf8[0] = (char)(((codepoint >> 12) & 0x0f) | 0xe0); utf8[1] = (char)(((codepoint >> 6) & 0x3f) | 0x80); utf8[2] = (char)((codepoint & 0x3f) | 0x80); - length = 3; + size = 3; } else if (codepoint <= 0x10ffff) { @@ -1458,10 +1458,10 @@ RLAPI const char *CodepointToUTF8(int codepoint, int *byteLength) utf8[1] = (char)(((codepoint >> 12) & 0x3f) | 0x80); utf8[2] = (char)(((codepoint >> 6) & 0x3f) | 0x80); utf8[3] = (char)((codepoint & 0x3f) | 0x80); - length = 4; + size = 4; } - *byteLength = length; + *byteSize = size; return utf8; } @@ -1502,7 +1502,7 @@ void UnloadCodepoints(int *codepoints) // NOTE: If an invalid UTF-8 sequence is encountered a '?'(0x3f) codepoint is counted instead int GetCodepointCount(const char *text) { - unsigned int len = 0; + unsigned int length = 0; char *ptr = (char *)&text[0]; while (*ptr != '\0') @@ -1513,10 +1513,10 @@ int GetCodepointCount(const char *text) if (letter == 0x3f) ptr += 1; else ptr += next; - len++; + length++; } - return len; + return length; } #endif // SUPPORT_TEXT_MANIPULATION diff --git a/src/textures.c b/src/textures.c index 41a0a077b..6caaa5bb8 100644 --- a/src/textures.c +++ b/src/textures.c @@ -547,7 +547,7 @@ bool ExportImageAsCode(Image image, const char *fileName) for (int i = 0; i < dataSize - 1; i++) byteCount += sprintf(txtData + byteCount, ((i%TEXT_BYTES_PER_LINE == 0)? "0x%x,\n" : "0x%x, "), ((unsigned char *)image.data)[i]); byteCount += sprintf(txtData + byteCount, "0x%x };\n", ((unsigned char *)image.data)[dataSize - 1]); - // NOTE: Text data length exported is determined by '\0' (NULL) character + // NOTE: Text data size exported is determined by '\0' (NULL) character success = SaveFileText(fileName, txtData); RL_FREE(txtData); @@ -1147,7 +1147,7 @@ Image ImageText(const char *text, int fontSize, Color color) // Create an image from text (custom sprite font) Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Color tint) { - int length = (int)strlen(text); + int size = (int)strlen(text); // Get size in bytes of text int textOffsetX = 0; // Image drawing position X int textOffsetY = 0; // Offset between lines (on line break '\n') @@ -1158,7 +1158,7 @@ Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Co // Create image to store text Image imText = GenImageColor((int)imSize.x, (int)imSize.y, BLANK); - for (int i = 0; i < length; i++) + for (int i = 0; i < size; i++) { // Get next codepoint from byte string and glyph index in font int codepointByteCount = 0; From 59e7275464f9323a617a0f8ce30a5b69746a1915 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 2 Sep 2021 00:35:55 +0200 Subject: [PATCH 079/570] REVIEWED: Glyphs --- examples/text/text_draw_3d.c | 41 ++++++++++++++--------------------- examples/text/text_font_sdf.c | 20 ++++++++--------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/examples/text/text_draw_3d.c b/examples/text/text_draw_3d.c index 04b6e18ca..a140b1194 100644 --- a/examples/text/text_draw_3d.c +++ b/examples/text/text_draw_3d.c @@ -454,16 +454,16 @@ void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontS // Character destination rectangle on screen // NOTE: We consider charsPadding on drawing - position.x += (float)(font.chars[index].offsetX - font.charsPadding)/(float)font.baseSize*scale; - position.z += (float)(font.chars[index].offsetY - font.charsPadding)/(float)font.baseSize*scale; + position.x += (float)(font.glyphs[index].offsetX - font.glyphPadding)/(float)font.baseSize*scale; + position.z += (float)(font.glyphs[index].offsetY - font.glyphPadding)/(float)font.baseSize*scale; // Character source rectangle from font texture atlas // NOTE: We consider chars padding when drawing, it could be required for outline/glow shader effects - Rectangle srcRec = { font.recs[index].x - (float)font.charsPadding, font.recs[index].y - (float)font.charsPadding, - font.recs[index].width + 2.0f*font.charsPadding, font.recs[index].height + 2.0f*font.charsPadding }; + Rectangle srcRec = { font.recs[index].x - (float)font.glyphPadding, font.recs[index].y - (float)font.glyphPadding, + font.recs[index].width + 2.0f*font.glyphPadding, font.recs[index].height + 2.0f*font.glyphPadding }; - float width = (float)(font.recs[index].width + 2.0f*font.charsPadding)/(float)font.baseSize*scale; - float height = (float)(font.recs[index].height + 2.0f*font.charsPadding)/(float)font.baseSize*scale; + float width = (float)(font.recs[index].width + 2.0f*font.glyphPadding)/(float)font.baseSize*scale; + float height = (float)(font.recs[index].height + 2.0f*font.glyphPadding)/(float)font.baseSize*scale; if (font.texture.id > 0) { @@ -477,16 +477,11 @@ void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontS const float tw = (srcRec.x+srcRec.width)/font.texture.width; const float th = (srcRec.y+srcRec.height)/font.texture.height; - if (SHOW_LETTER_BOUNDRY) - DrawCubeWiresV((Vector3){ position.x + width/2, position.y, position.z + height/2}, (Vector3){ width, LETTER_BOUNDRY_SIZE, height }, LETTER_BOUNDRY_COLOR); + if (SHOW_LETTER_BOUNDRY) DrawCubeWiresV((Vector3){ position.x + width/2, position.y, position.z + height/2}, (Vector3){ width, LETTER_BOUNDRY_SIZE, height }, LETTER_BOUNDRY_COLOR); -#if defined(RAYLIB_NEW_RLGL) rlCheckRenderBatchLimit(4 + 4*backface); rlSetTexture(font.texture.id); -#else - if (rlCheckBufferLimit(4 + 4*backface)) rlglDraw(); - rlEnableTexture(font.texture.id); -#endif + rlPushMatrix(); rlTranslatef(position.x, position.y, position.z); @@ -512,11 +507,7 @@ void DrawTextCodepoint3D(Font font, int codepoint, Vector3 position, float fontS rlEnd(); rlPopMatrix(); -#if defined(RAYLIB_NEW_RLGL) rlSetTexture(0); -#else - rlDisableTexture(); -#endif } } @@ -554,8 +545,8 @@ void DrawText3D(Font font, const char *text, Vector3 position, float fontSize, f DrawTextCodepoint3D(font, codepoint, (Vector3){ position.x + textOffsetX, position.y, position.z + textOffsetY }, fontSize, backface, tint); } - if (font.chars[index].advanceX == 0) textOffsetX += (float)(font.recs[index].width + fontSpacing)/(float)font.baseSize*scale; - else textOffsetX += (float)(font.chars[index].advanceX + fontSpacing)/(float)font.baseSize*scale; + if (font.glyphs[index].advanceX == 0) textOffsetX += (float)(font.recs[index].width + fontSpacing)/(float)font.baseSize*scale; + else textOffsetX += (float)(font.glyphs[index].advanceX + fontSpacing)/(float)font.baseSize*scale; } i += codepointByteCount; // Move text bytes counter to next codepoint @@ -592,8 +583,8 @@ Vector3 MeasureText3D(Font font, const char* text, float fontSize, float fontSpa if (letter != '\n') { - if (font.chars[index].advanceX != 0) textWidth += (font.chars[index].advanceX+fontSpacing)/(float)font.baseSize*scale; - else textWidth += (font.recs[index].width + font.chars[index].offsetX)/(float)font.baseSize*scale; + if (font.glyphs[index].advanceX != 0) textWidth += (font.glyphs[index].advanceX+fontSpacing)/(float)font.baseSize*scale; + else textWidth += (font.recs[index].width + font.glyphs[index].offsetX)/(float)font.baseSize*scale; } else { @@ -670,8 +661,8 @@ void DrawTextWave3D(Font font, const char *text, Vector3 position, float fontSiz DrawTextCodepoint3D(font, codepoint, (Vector3){ pos.x + textOffsetX, pos.y, pos.z + textOffsetY }, fontSize, backface, tint); } - if (font.chars[index].advanceX == 0) textOffsetX += (float)(font.recs[index].width + fontSpacing)/(float)font.baseSize*scale; - else textOffsetX += (float)(font.chars[index].advanceX + fontSpacing)/(float)font.baseSize*scale; + if (font.glyphs[index].advanceX == 0) textOffsetX += (float)(font.recs[index].width + fontSpacing)/(float)font.baseSize*scale; + else textOffsetX += (float)(font.glyphs[index].advanceX + fontSpacing)/(float)font.baseSize*scale; } i += codepointByteCount; // Move text bytes counter to next codepoint @@ -714,8 +705,8 @@ Vector3 MeasureTextWave3D(Font font, const char* text, float fontSize, float fon } else { - if (font.chars[index].advanceX != 0) textWidth += (font.chars[index].advanceX+fontSpacing)/(float)font.baseSize*scale; - else textWidth += (font.recs[index].width + font.chars[index].offsetX)/(float)font.baseSize*scale; + if (font.glyphs[index].advanceX != 0) textWidth += (font.glyphs[index].advanceX+fontSpacing)/(float)font.baseSize*scale; + else textWidth += (font.recs[index].width + font.glyphs[index].offsetX)/(float)font.baseSize*scale; } } else diff --git a/examples/text/text_font_sdf.c b/examples/text/text_font_sdf.c index 7de7986b3..8a2c0d773 100644 --- a/examples/text/text_font_sdf.c +++ b/examples/text/text_font_sdf.c @@ -39,24 +39,24 @@ int main(void) // Default font generation from TTF font Font fontDefault = { 0 }; fontDefault.baseSize = 16; - fontDefault.charsCount = 95; + fontDefault.glyphCount = 95; // Loading font data from memory data - // Parameters > font size: 16, no chars array provided (0), chars count: 95 (autogenerate chars array) - fontDefault.chars = LoadFontData(fileData, fileSize, 16, 0, 95, FONT_DEFAULT); - // Parameters > chars count: 95, font size: 16, chars padding in image: 4 px, pack method: 0 (default) - Image atlas = GenImageFontAtlas(fontDefault.chars, &fontDefault.recs, 95, 16, 4, 0); + // Parameters > font size: 16, no glyphs array provided (0), glyphs count: 95 (autogenerate chars array) + fontDefault.glyphs = LoadFontData(fileData, fileSize, 16, 0, 95, FONT_DEFAULT); + // Parameters > glyphs count: 95, font size: 16, glyphs padding in image: 4 px, pack method: 0 (default) + Image atlas = GenImageFontAtlas(fontDefault.glyphs, &fontDefault.recs, 95, 16, 4, 0); fontDefault.texture = LoadTextureFromImage(atlas); UnloadImage(atlas); // SDF font generation from TTF font Font fontSDF = { 0 }; fontSDF.baseSize = 16; - fontSDF.charsCount = 95; - // Parameters > font size: 16, no chars array provided (0), chars count: 0 (defaults to 95) - fontSDF.chars = LoadFontData(fileData, fileSize, 16, 0, 0, FONT_SDF); - // Parameters > chars count: 95, font size: 16, chars padding in image: 0 px, pack method: 1 (Skyline algorythm) - atlas = GenImageFontAtlas(fontSDF.chars, &fontSDF.recs, 95, 16, 0, 1); + fontSDF.glyphCount = 95; + // Parameters > font size: 16, no glyphs array provided (0), glyphs count: 0 (defaults to 95) + fontSDF.glyphs = LoadFontData(fileData, fileSize, 16, 0, 0, FONT_SDF); + // Parameters > glyphs count: 95, font size: 16, glyphs padding in image: 0 px, pack method: 1 (Skyline algorythm) + atlas = GenImageFontAtlas(fontSDF.glyphs, &fontSDF.recs, 95, 16, 0, 1); fontSDF.texture = LoadTextureFromImage(atlas); UnloadImage(atlas); From 9ff8ad853c77453768c59b5f9ae5206ec63f1bdb Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 2 Sep 2021 00:39:47 +0200 Subject: [PATCH 080/570] Update raygui.h --- src/extras/raygui.h | 379 +++++++++++++++++++++++--------------------- 1 file changed, 196 insertions(+), 183 deletions(-) diff --git a/src/extras/raygui.h b/src/extras/raygui.h index 31b7ca774..5aada37e4 100644 --- a/src/extras/raygui.h +++ b/src/extras/raygui.h @@ -220,14 +220,20 @@ int format; // Data format (PixelFormat type) } Texture2D; - // Font character info - typedef struct GlyphInfo GlyphInfo; + // GlyphInfo, font characters glyphs info + typedef struct GlyphInfo { + int value; // Character value (Unicode) + int offsetX; // Character offset X when drawing + int offsetY; // Character offset Y when drawing + int advanceX; // Character advance position X + Image image; // Character image data + } GlyphInfo; // TODO: Font type is very coupled to raylib, mostly required by GuiLoadStyle() // It should be redesigned to be provided by user typedef struct Font { int baseSize; // Base size (default chars height) - int charsCount; // Number of characters + int glyphCount; // Number of characters Texture2D texture; // Characters texture atlas Rectangle *recs; // Characters rectangles in texture GlyphInfo *chars; // Characters info data @@ -406,7 +412,7 @@ typedef enum { extern "C" { // Prevents name mangling of functions #endif -// State modification functions +// Global gui state control functions RAYGUIDEF void GuiEnable(void); // Enable gui controls (global state) RAYGUIDEF void GuiDisable(void); // Disable gui controls (global state) RAYGUIDEF void GuiLock(void); // Lock gui controls (global state) @@ -1067,7 +1073,7 @@ static unsigned int guiIcons[RICON_MAX_ICONS*RICON_DATA_ELEMENTS] = { #endif // RAYGUI_SUPPORT_RICONS #ifndef RICON_SIZE - #define RICON_SIZE 0 + #define RICON_SIZE 0 #endif #define RAYGUI_MAX_CONTROLS 16 // Maximum number of standard controls @@ -1076,7 +1082,7 @@ static unsigned int guiIcons[RICON_MAX_ICONS*RICON_DATA_ELEMENTS] = { // TODO: Avoid animations and time-based states // Functions using it: GuiTextBox(), GuiValueBox(), GuiTextBoxMulti() -#define TEXTEDIT_CURSOR_BLINK_FRAMES 20 // Text edit controls cursor blink timming +//#define TEXTEDIT_CURSOR_BLINK_FRAMES 20 // Text edit controls cursor blink timming //---------------------------------------------------------------------------------- // Types and Structures Definition @@ -1147,14 +1153,14 @@ static Font GetFontDefault(void); // -- GuiLoadStyleDe static Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // -- GetTextWidth(), GuiTextBoxMulti() static void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // -- GuiDrawText() -static Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount); // -- GuiLoadStyle() +static Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int glyphCount); // -- GuiLoadStyle() static char *LoadFileText(const char *fileName); // -- GuiLoadStyle() static const char *GetDirectoryPath(const char *filePath); // -- GuiLoadStyle() //------------------------------------------------------------------------------- // raylib functions already implemented in raygui //------------------------------------------------------------------------------- -static Color GetColor(unsigned int hexValue); // Returns a Color struct from hexadecimal value +static Color GetColor(int hexValue); // Returns a Color struct from hexadecimal value static int ColorToInt(Color color); // Returns hexadecimal value for a Color static Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f static bool CheckCollisionPointRec(Vector2 point, Rectangle rec); // Check if point is inside rectangle @@ -1594,7 +1600,7 @@ bool GuiImageButtonEx(Rectangle bounds, const char *text, Texture2D texture, Rec //-------------------------------------------------------------------- GuiDrawRectangle(bounds, GuiGetStyle(BUTTON, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(BUTTON, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(BUTTON, BASE + (state*3))), guiAlpha)); - if (text != NULL) GuiDrawText(text, GetTextBounds(BUTTON, bounds), GuiGetStyle(BUTTON, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(BUTTON, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, GetTextBounds(BUTTON, bounds), GuiGetStyle(BUTTON, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(BUTTON, TEXT + (state*3))), guiAlpha)); if (texture.id > 0) DrawTextureRec(texture, texSource, RAYGUI_CLITERAL(Vector2){ bounds.x + bounds.width/2 - texSource.width/2, bounds.y + bounds.height/2 - texSource.height/2 }, Fade(GetColor(GuiGetStyle(BUTTON, TEXT + (state*3))), guiAlpha)); //------------------------------------------------------------------ @@ -1654,12 +1660,12 @@ int GuiToggleGroup(Rectangle bounds, const char *text, int active) // Get substrings items from text (items pointers) int rows[TOGGLEGROUP_MAX_ELEMENTS] = { 0 }; - int itemsCount = 0; - const char **items = GuiTextSplit(text, &itemsCount, rows); + int itemCount = 0; + const char **items = GuiTextSplit(text, &itemCount, rows); int prevRow = rows[0]; - for (int i = 0; i < itemsCount; i++) + for (int i = 0; i < itemCount; i++) { if (prevRow != rows[i]) { @@ -1730,7 +1736,7 @@ bool GuiCheckBox(Rectangle bounds, const char *text, bool checked) GuiDrawRectangle(check, 0, BLANK, Fade(GetColor(GuiGetStyle(CHECKBOX, TEXT + state*3)), guiAlpha)); } - if (text != NULL) GuiDrawText(text, textBounds, (GuiGetStyle(CHECKBOX, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(CHECKBOX, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); //-------------------------------------------------------------------- return checked; @@ -1747,15 +1753,15 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) (float)bounds.y, (float)GuiGetStyle(COMBOBOX, COMBO_BUTTON_WIDTH), (float)bounds.height }; // Get substrings items from text (items pointers, lengths and count) - int itemsCount = 0; - const char **items = GuiTextSplit(text, &itemsCount, NULL); + int itemCount = 0; + const char **items = GuiTextSplit(text, &itemCount, NULL); if (active < 0) active = 0; - else if (active > itemsCount - 1) active = itemsCount - 1; + else if (active > itemCount - 1) active = itemCount - 1; // Update control //-------------------------------------------------------------------- - if ((state != GUI_STATE_DISABLED) && !guiLocked && (itemsCount > 1)) + if ((state != GUI_STATE_DISABLED) && !guiLocked && (itemCount > 1)) { Vector2 mousePoint = GetMousePosition(); @@ -1765,7 +1771,7 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) { active += 1; - if (active >= itemsCount) active = 0; + if (active >= itemCount) active = 0; } if (IsMouseButtonDown(MOUSE_LEFT_BUTTON)) state = GUI_STATE_PRESSED; @@ -1787,7 +1793,7 @@ int GuiComboBox(Rectangle bounds, const char *text, int active) GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_CENTER); - GuiButton(selector, TextFormat("%i/%i", active + 1, itemsCount)); + GuiButton(selector, TextFormat("%i/%i", active + 1, itemCount)); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlign); GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); @@ -1805,11 +1811,11 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo int itemFocused = -1; // Get substrings items from text (items pointers, lengths and count) - int itemsCount = 0; - const char **items = GuiTextSplit(text, &itemsCount, NULL); + int itemCount = 0; + const char **items = GuiTextSplit(text, &itemCount, NULL); Rectangle boundsOpen = bounds; - boundsOpen.height = (itemsCount + 1)*(bounds.height + GuiGetStyle(DROPDOWNBOX, DROPDOWN_ITEMS_PADDING)); + boundsOpen.height = (itemCount + 1)*(bounds.height + GuiGetStyle(DROPDOWNBOX, DROPDOWN_ITEMS_PADDING)); Rectangle itemBounds = bounds; @@ -1817,7 +1823,7 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo // Update control //-------------------------------------------------------------------- - if ((state != GUI_STATE_DISABLED) && !guiLocked && (itemsCount > 1)) + if ((state != GUI_STATE_DISABLED) && !guiLocked && (itemCount > 1)) { Vector2 mousePoint = GetMousePosition(); @@ -1835,7 +1841,7 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo if (CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; // Check focused and selected item - for (int i = 0; i < itemsCount; i++) + for (int i = 0; i < itemCount; i++) { // Update item rectangle y position for next item itemBounds.y += (bounds.height + GuiGetStyle(DROPDOWNBOX, DROPDOWN_ITEMS_PADDING)); @@ -1879,7 +1885,7 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo if (editMode) { // Draw visible items - for (int i = 0; i < itemsCount; i++) + for (int i = 0; i < itemCount; i++) { // Update item rectangle y position for next item itemBounds.y += (bounds.height + GuiGetStyle(DROPDOWNBOX, DROPDOWN_ITEMS_PADDING)); @@ -1913,19 +1919,16 @@ bool GuiDropdownBox(Rectangle bounds, const char *text, int *active, bool editMo } // Text Box control, updates input text -// NOTE 1: Requires static variables: framesCounter // NOTE 2: Returns if KEY_ENTER pressed (useful for data validation) bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) { - static int framesCounter = 0; // Blinking cursor counter - GuiControlState state = guiState; bool pressed = false; Rectangle cursor = { bounds.x + GuiGetStyle(TEXTBOX, TEXT_PADDING) + GetTextWidth(text) + 2, bounds.y + bounds.height/2 - GuiGetStyle(DEFAULT, TEXT_SIZE), - 1, + 4, (float)GuiGetStyle(DEFAULT, TEXT_SIZE)*2 }; @@ -1938,8 +1941,7 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) if (editMode) { state = GUI_STATE_PRESSED; - framesCounter++; - + int key = GetCharPressed(); // Returns codepoint as Unicode int keyCount = (int)strlen(text); @@ -1950,10 +1952,10 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) if ((GetTextWidth(text) < (maxWidth - GuiGetStyle(DEFAULT, TEXT_SIZE))) && (key >= 32)) { - int byteLength = 0; - const char *textUTF8 = CodepointToUTF8(key, &byteLength); + int byteSize = 0; + const char *textUTF8 = CodepointToUTF8(key, &byteSize); - for (int i = 0; i < byteLength; i++) + for (int i = 0; i < byteSize; i++) { text[keyCount] = textUTF8[i]; keyCount++; @@ -1970,13 +1972,6 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) { keyCount--; text[keyCount] = '\0'; - framesCounter = 0; - if (keyCount < 0) keyCount = 0; - } - else if (IsKeyDown(KEY_BACKSPACE)) - { - if ((framesCounter > TEXTEDIT_CURSOR_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--; - text[keyCount] = '\0'; if (keyCount < 0) keyCount = 0; } } @@ -1996,8 +1991,6 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; } } - - if (pressed) framesCounter = 0; } //-------------------------------------------------------------------- @@ -2006,9 +1999,6 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) if (state == GUI_STATE_PRESSED) { GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_PRESSED)), guiAlpha)); - - // Draw blinking cursor - if (editMode && ((framesCounter/20)%2 == 0)) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); } else if (state == GUI_STATE_DISABLED) { @@ -2017,6 +2007,9 @@ bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editMode) else GuiDrawRectangle(bounds, 1, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), BLANK); GuiDrawText(text, GetTextBounds(TEXTBOX, bounds), GuiGetStyle(TEXTBOX, TEXT_ALIGNMENT), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + + // Draw cursor + if (editMode) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); //-------------------------------------------------------------------- return pressed; @@ -2090,7 +2083,7 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); // Draw text label if provided - if (text != NULL) GuiDrawText(text, textBounds, (GuiGetStyle(SPINNER, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(SPINNER, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); //-------------------------------------------------------------------- *value = tempValue; @@ -2098,15 +2091,13 @@ bool GuiSpinner(Rectangle bounds, const char *text, int *value, int minValue, in } // Value Box control, updates input text with numbers -// NOTE: Requires static variables: framesCounter +// NOTE: Requires static variables: frameCounter bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, int maxValue, bool editMode) { #if !defined(VALUEBOX_MAX_CHARS) #define VALUEBOX_MAX_CHARS 32 #endif - static int framesCounter = 0; // Blinking cursor counter - GuiControlState state = guiState; bool pressed = false; @@ -2135,8 +2126,6 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i { state = GUI_STATE_PRESSED; - framesCounter++; - int keyCount = (int)strlen(textValue); // Only allow keys in range [48..57] @@ -2161,14 +2150,6 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i { keyCount--; textValue[keyCount] = '\0'; - framesCounter = 0; - if (keyCount < 0) keyCount = 0; - valueHasChanged = true; - } - else if (IsKeyDown(KEY_BACKSPACE)) - { - if ((framesCounter > TEXTEDIT_CURSOR_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--; - textValue[keyCount] = '\0'; if (keyCount < 0) keyCount = 0; valueHasChanged = true; } @@ -2189,8 +2170,6 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; } } - - if (pressed) framesCounter = 0; } //-------------------------------------------------------------------- @@ -2204,16 +2183,16 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i GuiDrawRectangle(bounds, GuiGetStyle(VALUEBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(VALUEBOX, BORDER + (state*3))), guiAlpha), baseColor); GuiDrawText(textValue, GetTextBounds(VALUEBOX, bounds), GUI_TEXT_ALIGN_CENTER, Fade(GetColor(GuiGetStyle(VALUEBOX, TEXT + (state*3))), guiAlpha)); - // Draw blinking cursor - if ((state == GUI_STATE_PRESSED) && (editMode && ((framesCounter/20)%2 == 0))) + // Draw cursor + if (editMode) { // NOTE: ValueBox internal text is always centered - Rectangle cursor = { bounds.x + GetTextWidth(textValue)/2 + bounds.width/2 + 2, bounds.y + 2*GuiGetStyle(VALUEBOX, BORDER_WIDTH), 1, bounds.height - 4*GuiGetStyle(VALUEBOX, BORDER_WIDTH) }; + Rectangle cursor = { bounds.x + GetTextWidth(textValue)/2 + bounds.width/2 + 2, bounds.y + 2*GuiGetStyle(VALUEBOX, BORDER_WIDTH), 4, bounds.height - 4*GuiGetStyle(VALUEBOX, BORDER_WIDTH) }; GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(VALUEBOX, BORDER_COLOR_PRESSED)), guiAlpha)); } // Draw text label if provided - if (text != NULL) GuiDrawText(text, textBounds, (GuiGetStyle(VALUEBOX, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); + GuiDrawText(text, textBounds, (GuiGetStyle(VALUEBOX, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT)? GUI_TEXT_ALIGN_LEFT : GUI_TEXT_ALIGN_RIGHT, Fade(GetColor(GuiGetStyle(LABEL, TEXT + (state*3))), guiAlpha)); //-------------------------------------------------------------------- return pressed; @@ -2222,8 +2201,6 @@ bool GuiValueBox(Rectangle bounds, const char *text, int *value, int minValue, i // Text Box control with multiple lines bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) { - static int framesCounter = 0; // Blinking cursor counter - GuiControlState state = guiState; bool pressed = false; @@ -2235,10 +2212,9 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) }; // Cursor position, [x, y] values should be updated - Rectangle cursor = { 0, 0, 1, (float)GuiGetStyle(DEFAULT, TEXT_SIZE) + 2 }; - - int textWidth = 0; - int currentLine = 0; + Rectangle cursor = { 0, -1, 4, (float)GuiGetStyle(DEFAULT, TEXT_SIZE) + 2 }; + + float scaleFactor = (float)GuiGetStyle(DEFAULT, TEXT_SIZE)/(float)guiFont.baseSize; // Character rectangle scaling factor // Update control //-------------------------------------------------------------------- @@ -2249,77 +2225,52 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) if (editMode) { state = GUI_STATE_PRESSED; - framesCounter++; - int character = GetCharPressed(); - int keyCount = (int)strlen(text); + // We get an Unicode codepoint + int codepoint = GetCharPressed(); + int textLength = (int)strlen(text); // Length in bytes (UTF-8 string) // Introduce characters - if (keyCount < (textSize - 1)) + if (textLength < (textSize - 1)) { - Vector2 textSize = MeasureTextEx(guiFont, text, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); - - if (textSize.y < (textAreaBounds.height - GuiGetStyle(DEFAULT, TEXT_SIZE))) + if (IsKeyPressed(KEY_ENTER)) { - if (IsKeyPressed(KEY_ENTER)) - { - text[keyCount] = '\n'; - keyCount++; - } - else if (((character >= 32) && (character < 255))) // TODO: Support Unicode inputs - { - text[keyCount] = (char)character; - keyCount++; - } + text[textLength] = '\n'; + textLength++; + } + else if (codepoint >= 32) + { + // Supports Unicode inputs -> Encoded to UTF-8 + int charUTF8Length = 0; + const char *charEncoded = CodepointToUTF8(codepoint, &charUTF8Length); + memcpy(text + textLength, charEncoded, charUTF8Length); + textLength += charUTF8Length; } } // Delete characters - if (keyCount > 0) + if (textLength > 0) { if (IsKeyPressed(KEY_BACKSPACE)) { - keyCount--; - text[keyCount] = '\0'; - framesCounter = 0; - - if (keyCount < 0) keyCount = 0; - } - else if (IsKeyDown(KEY_BACKSPACE)) - { - if ((framesCounter > TEXTEDIT_CURSOR_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--; - text[keyCount] = '\0'; - - if (keyCount < 0) keyCount = 0; + if ((unsigned char)text[textLength - 1] < 127) + { + // Remove ASCII equivalent character (1 byte) + textLength--; + text[textLength] = '\0'; + } + else + { + // Remove latest UTF-8 unicode character introduced (n bytes) + int charUTF8Length = 0; + while (((unsigned char)text[textLength - 1 - charUTF8Length] & 0b01000000) == 0) charUTF8Length++; + + textLength -= (charUTF8Length + 1); + text[textLength] = '\0'; + } } } - // Calculate cursor position considering text - char oneCharText[2] = { 0 }; - int lastBreakingPos = -1; - - for (int i = 0; i < keyCount && currentLine < keyCount; i++) - { - oneCharText[0] = text[i]; - textWidth += (GetTextWidth(oneCharText) + GuiGetStyle(DEFAULT, TEXT_SPACING)); - - if (text[i] == ' ' || text[i] == '\n') lastBreakingPos = i; - - if ( text[i] == '\n' || textWidth >= textAreaBounds.width) - { - currentLine++; - textWidth = 0; - - if (lastBreakingPos > 0) i = lastBreakingPos; - else textWidth += (GetTextWidth(oneCharText) + GuiGetStyle(DEFAULT, TEXT_SPACING)); - - lastBreakingPos = -1; - } - } - - cursor.x = bounds.x + GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING) + textWidth - GuiGetStyle(DEFAULT, TEXT_SPACING); - cursor.y = bounds.y + GuiGetStyle(TEXTBOX, BORDER_WIDTH) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING)/2 + ((GuiGetStyle(DEFAULT, TEXT_SIZE) + GuiGetStyle(TEXTBOX, TEXT_INNER_PADDING))*currentLine); - // Exit edit mode if (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; } @@ -2331,8 +2282,6 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) pressed = true; } } - - if (pressed) framesCounter = 0; // Reset blinking cursor } //-------------------------------------------------------------------- @@ -2341,9 +2290,6 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) if (state == GUI_STATE_PRESSED) { GuiDrawRectangle(bounds, GuiGetStyle(TEXTBOX, BORDER_WIDTH), Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), Fade(GetColor(GuiGetStyle(TEXTBOX, BASE_COLOR_PRESSED)), guiAlpha)); - - // Draw blinking cursor - if (editMode && ((framesCounter/20)%2 == 0)) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); } else if (state == GUI_STATE_DISABLED) { @@ -2351,9 +2297,76 @@ bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool editMode) } else GuiDrawRectangle(bounds, 1, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER + (state*3))), guiAlpha), BLANK); - // TODO: Review to support boxed text with word-wrap - //DrawTextBoxed(guiFont, text, textAreaBounds, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), true, Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); - DrawTextEx(guiFont, text, (Vector2){ textAreaBounds.x, textAreaBounds.y }, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + int wrapMode = 1; // 0-No wrap, 1-Char wrap, 2-Word wrap + Vector2 cursorPos = { textAreaBounds.x, textAreaBounds.y }; + + //int lastSpacePos = 0; + //int lastSpaceWidth = 0; + //int lastSpaceCursorPos = 0; + + for (int i = 0, codepointLength = 0; text[i] != '\0'; i += codepointLength) + { + int codepoint = GetCodepoint(text + i, &codepointLength); + int index = GetGlyphIndex(guiFont, codepoint); // If requested codepoint is not found, we get '?' (0x3f) -> TODO: review that case! + Rectangle atlasRec = guiFont.recs[index]; + GlyphInfo glyphInfo = guiFont.glyphs[index]; // Glyph measures + + if ((codepointLength == 1) && (codepoint == '\n')) + { + cursorPos.y += (guiFont.baseSize*scaleFactor + GuiGetStyle(TEXTBOX, TEXT_LINES_PADDING)); // Line feed + cursorPos.x = textAreaBounds.x; // Carriage return + } + else + { + if (wrapMode == 1) + { + int glyphWidth = 0; + if (glyphInfo.advanceX != 0) glyphWidth += glyphInfo.advanceX; + else glyphWidth += (atlasRec.width + glyphInfo.offsetX); + + // Jump line if the end of the text box area has been reached + if ((cursorPos.x + (glyphWidth*scaleFactor)) > (textAreaBounds.x + textAreaBounds.width)) + { + cursorPos.y += (guiFont.baseSize*scaleFactor + GuiGetStyle(TEXTBOX, TEXT_LINES_PADDING)); // Line feed + cursorPos.x = textAreaBounds.x; // Carriage return + } + } + else if (wrapMode == 2) + { + /* + if ((codepointLength == 1) && (codepoint == ' ')) + { + lastSpacePos = i; + lastSpaceWidth = 0; + lastSpaceCursorPos = cursorPos.x; + } + + // Jump line if last word reaches end of text box area + if ((lastSpaceCursorPos + lastSpaceWidth) > (textAreaBounds.x + textAreaBounds.width)) + { + cursorPos.y += 12; // Line feed + cursorPos.x = textAreaBounds.x; // Carriage return + } + */ + } + + // Draw current character glyph + DrawTextCodepoint(guiFont, codepoint, cursorPos, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), Fade(GetColor(GuiGetStyle(TEXTBOX, TEXT + (state*3))), guiAlpha)); + + int glyphWidth = 0; + if (glyphInfo.advanceX != 0) glyphWidth += glyphInfo.advanceX; + else glyphWidth += (atlasRec.width + glyphInfo.offsetX); + + cursorPos.x += (glyphWidth*scaleFactor + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + //if (i > lastSpacePos) lastSpaceWidth += (atlasRec.width + (float)GuiGetStyle(DEFAULT, TEXT_SPACING)); + } + } + + cursor.x = cursorPos.x; + cursor.y = cursorPos.y; + + // Draw cursor position considering text glyphs + if (editMode) GuiDrawRectangle(cursor, 0, BLANK, Fade(GetColor(GuiGetStyle(TEXTBOX, BORDER_COLOR_PRESSED)), guiAlpha)); //-------------------------------------------------------------------- return pressed; @@ -2698,12 +2711,12 @@ int GuiScrollBar(Rectangle bounds, int value, int minValue, int maxValue) // List View control int GuiListView(Rectangle bounds, const char *text, int *scrollIndex, int active) { - int itemsCount = 0; + int itemCount = 0; const char **items = NULL; - if (text != NULL) items = GuiTextSplit(text, &itemsCount, NULL); + if (text != NULL) items = GuiTextSplit(text, &itemCount, NULL); - return GuiListViewEx(bounds, items, itemsCount, NULL, scrollIndex, active); + return GuiListViewEx(bounds, items, itemCount, NULL, scrollIndex, active); } // List View control with extended parameters @@ -3096,12 +3109,12 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons int clicked = -1; // Returns clicked button from buttons list, 0 refers to closed window button - int buttonsCount = 0; - const char **buttonsText = GuiTextSplit(buttons, &buttonsCount, NULL); + int buttonCount = 0; + const char **buttonsText = GuiTextSplit(buttons, &buttonCount, NULL); Rectangle buttonBounds = { 0 }; buttonBounds.x = bounds.x + MESSAGEBOX_BUTTON_PADDING; buttonBounds.y = bounds.y + bounds.height - MESSAGEBOX_BUTTON_HEIGHT - MESSAGEBOX_BUTTON_PADDING; - buttonBounds.width = (bounds.width - MESSAGEBOX_BUTTON_PADDING*(buttonsCount + 1))/buttonsCount; + buttonBounds.width = (bounds.width - MESSAGEBOX_BUTTON_PADDING*(buttonCount + 1))/buttonCount; buttonBounds.height = MESSAGEBOX_BUTTON_HEIGHT; Vector2 textSize = MeasureTextEx(guiFont, message, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), 1); @@ -3124,7 +3137,7 @@ int GuiMessageBox(Rectangle bounds, const char *title, const char *message, cons prevTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_CENTER); - for (int i = 0; i < buttonsCount; i++) + for (int i = 0; i < buttonCount; i++) { if (GuiButton(buttonBounds, buttonsText[i])) clicked = i + 1; buttonBounds.x += (buttonBounds.width + MESSAGEBOX_BUTTON_PADDING); @@ -3151,12 +3164,12 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co int btnIndex = -1; - int buttonsCount = 0; - const char **buttonsText = GuiTextSplit(buttons, &buttonsCount, NULL); + int buttonCount = 0; + const char **buttonsText = GuiTextSplit(buttons, &buttonCount, NULL); Rectangle buttonBounds = { 0 }; buttonBounds.x = bounds.x + TEXTINPUTBOX_BUTTON_PADDING; buttonBounds.y = bounds.y + bounds.height - TEXTINPUTBOX_BUTTON_HEIGHT - TEXTINPUTBOX_BUTTON_PADDING; - buttonBounds.width = (bounds.width - TEXTINPUTBOX_BUTTON_PADDING*(buttonsCount + 1))/buttonsCount; + buttonBounds.width = (bounds.width - TEXTINPUTBOX_BUTTON_PADDING*(buttonCount + 1))/buttonCount; buttonBounds.height = TEXTINPUTBOX_BUTTON_HEIGHT; int messageInputHeight = (int)bounds.height - WINDOW_STATUSBAR_HEIGHT - GuiGetStyle(STATUSBAR, BORDER_WIDTH) - TEXTINPUTBOX_BUTTON_HEIGHT - 2*TEXTINPUTBOX_BUTTON_PADDING; @@ -3198,7 +3211,7 @@ int GuiTextInputBox(Rectangle bounds, const char *title, const char *message, co int prevBtnTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, GUI_TEXT_ALIGN_CENTER); - for (int i = 0; i < buttonsCount; i++) + for (int i = 0; i < buttonCount; i++) { if (GuiButton(buttonBounds, buttonsText[i])) btnIndex = i + 1; buttonBounds.x += (buttonBounds.width + MESSAGEBOX_BUTTON_PADDING); @@ -3322,20 +3335,20 @@ void GuiLoadStyle(const char *fileName) char *charValues = LoadFileText(charmapFileName); if (charValues != NULL) { - int charsCount = 0; - const char **chars = TextSplit(charValues, '\n', &charsCount); + int glyphCount = 0; + const char **chars = TextSplit(charValues, '\n', &glyphCount); - int *values = (int *)RAYGUI_MALLOC(charsCount*sizeof(int)); - for (int i = 0; i < charsCount; i++) values[i] = TextToInteger(chars[i]); + int *values = (int *)RAYGUI_MALLOC(glyphCount*sizeof(int)); + for (int i = 0; i < glyphCount; i++) values[i] = TextToInteger(chars[i]); - font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, values, charsCount); + font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, values, glyphCount); RAYGUI_FREE(values); } } else font = LoadFontEx(TextFormat("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0); - if ((font.texture.id > 0) && (font.charsCount > 0)) GuiSetFont(font); + if ((font.texture.id > 0) && (font.glyphCount > 0)) GuiSetFont(font); } break; default: break; @@ -3358,12 +3371,12 @@ void GuiLoadStyle(const char *fileName) char signature[5] = ""; short version = 0; short reserved = 0; - int propertiesCount = 0; + int propertyCount = 0; fread(signature, 1, 4, rgsFile); fread(&version, 1, sizeof(short), rgsFile); fread(&reserved, 1, sizeof(short), rgsFile); - fread(&propertiesCount, 1, sizeof(int), rgsFile); + fread(&propertyCount, 1, sizeof(int), rgsFile); if ((signature[0] == 'r') && (signature[1] == 'G') && @@ -3374,7 +3387,7 @@ void GuiLoadStyle(const char *fileName) short propertyId = 0; int propertyValue = 0; - for (int i = 0; i < propertiesCount; i++) + for (int i = 0; i < propertyCount; i++) { fread(&controlId, 1, sizeof(short), rgsFile); fread(&propertyId, 1, sizeof(short), rgsFile); @@ -3405,7 +3418,7 @@ void GuiLoadStyle(const char *fileName) Rectangle whiteRec = { 0 }; fread(&font.baseSize, 1, sizeof(int), rgsFile); - fread(&font.charsCount, 1, sizeof(int), rgsFile); + fread(&font.glyphCount, 1, sizeof(int), rgsFile); fread(&fontType, 1, sizeof(int), rgsFile); // Load font white rectangle @@ -3432,17 +3445,17 @@ void GuiLoadStyle(const char *fileName) } // Load font recs data - font.recs = (Rectangle *)RAYGUI_CALLOC(font.charsCount, sizeof(Rectangle)); - for (int i = 0; i < font.charsCount; i++) fread(&font.recs[i], 1, sizeof(Rectangle), rgsFile); + font.recs = (Rectangle *)RAYGUI_CALLOC(font.glyphCount, sizeof(Rectangle)); + for (int i = 0; i < font.glyphCount; i++) fread(&font.recs[i], 1, sizeof(Rectangle), rgsFile); // Load font chars info data - font.chars = (GlyphInfo *)RAYGUI_CALLOC(font.charsCount, sizeof(GlyphInfo)); - for (int i = 0; i < font.charsCount; i++) + font.glyphs = (GlyphInfo *)RAYGUI_CALLOC(font.glyphCount, sizeof(GlyphInfo)); + for (int i = 0; i < font.glyphCount; i++) { - fread(&font.chars[i].value, 1, sizeof(int), rgsFile); - fread(&font.chars[i].offsetX, 1, sizeof(int), rgsFile); - fread(&font.chars[i].offsetY, 1, sizeof(int), rgsFile); - fread(&font.chars[i].advanceX, 1, sizeof(int), rgsFile); + fread(&font.glyphs[i].value, 1, sizeof(int), rgsFile); + fread(&font.glyphs[i].offsetX, 1, sizeof(int), rgsFile); + fread(&font.glyphs[i].offsetY, 1, sizeof(int), rgsFile); + fread(&font.glyphs[i].advanceX, 1, sizeof(int), rgsFile); } GuiSetFont(font); @@ -3572,7 +3585,7 @@ unsigned int *GuiGetIcons(void) { return guiIcons; } // Load raygui icons file (.rgi) // NOTE: In case nameIds are required, they can be requested with loadIconsName, -// they are returned as a guiIconsName[iconsCount][RICON_MAX_NAME_LENGTH], +// they are returned as a guiIconsName[iconCount][RICON_MAX_NAME_LENGTH], // guiIconsName[]][] memory should be manually freed! char **GuiLoadIcons(const char *fileName, bool loadIconsName) { @@ -3609,14 +3622,14 @@ char **GuiLoadIcons(const char *fileName, bool loadIconsName) char signature[5] = ""; short version = 0; short reserved = 0; - short iconsCount = 0; - short iconsSize = 0; + short iconCount = 0; + short iconSize = 0; fread(signature, 1, 4, rgiFile); fread(&version, 1, sizeof(short), rgiFile); fread(&reserved, 1, sizeof(short), rgiFile); - fread(&iconsCount, 1, sizeof(short), rgiFile); - fread(&iconsSize, 1, sizeof(short), rgiFile); + fread(&iconCount, 1, sizeof(short), rgiFile); + fread(&iconSize, 1, sizeof(short), rgiFile); if ((signature[0] == 'r') && (signature[1] == 'G') && @@ -3625,17 +3638,17 @@ char **GuiLoadIcons(const char *fileName, bool loadIconsName) { if (loadIconsName) { - guiIconsName = (char **)RAYGUI_MALLOC(iconsCount*sizeof(char **)); - for (int i = 0; i < iconsCount; i++) + guiIconsName = (char **)RAYGUI_MALLOC(iconCount*sizeof(char **)); + for (int i = 0; i < iconCount; i++) { guiIconsName[i] = (char *)RAYGUI_MALLOC(RICON_MAX_NAME_LENGTH); fread(guiIconsName[i], RICON_MAX_NAME_LENGTH, 1, rgiFile); } } - else fseek(rgiFile, iconsCount*RICON_MAX_NAME_LENGTH, SEEK_CUR); + else fseek(rgiFile, iconCount*RICON_MAX_NAME_LENGTH, SEEK_CUR); // Read icons data directly over guiIcons data array - fread(guiIcons, iconsCount*(iconsSize*iconsSize/32), sizeof(unsigned int), rgiFile); + fread(guiIcons, iconCount*(iconSize*iconSize/32), sizeof(unsigned int), rgiFile); } fclose(rgiFile); @@ -4061,7 +4074,7 @@ static Vector3 ConvertHSVtoRGB(Vector3 hsv) #if defined(RAYGUI_STANDALONE) // Returns a Color struct from hexadecimal value -static Color GetColor(unsigned int hexValue) +static Color GetColor(int hexValue) { Color color; @@ -4186,29 +4199,29 @@ static int TextToInteger(const char *text) return value*sign; } -// Encode codepoint into UTF-8 text (char array length returned as parameter) -static const char *CodepointToUTF8(int codepoint, int *byteLength) +// Encode codepoint into UTF-8 text (char array size returned as parameter) +static const char *CodepointToUTF8(int codepoint, int *byteSize) { static char utf8[6] = { 0 }; - int length = 0; + int size = 0; if (codepoint <= 0x7f) { utf8[0] = (char)codepoint; - length = 1; + size = 1; } else if (codepoint <= 0x7ff) { utf8[0] = (char)(((codepoint >> 6) & 0x1f) | 0xc0); utf8[1] = (char)((codepoint & 0x3f) | 0x80); - length = 2; + size = 2; } else if (codepoint <= 0xffff) { utf8[0] = (char)(((codepoint >> 12) & 0x0f) | 0xe0); utf8[1] = (char)(((codepoint >> 6) & 0x3f) | 0x80); utf8[2] = (char)((codepoint & 0x3f) | 0x80); - length = 3; + size = 3; } else if (codepoint <= 0x10ffff) { @@ -4216,10 +4229,10 @@ static const char *CodepointToUTF8(int codepoint, int *byteLength) utf8[1] = (char)(((codepoint >> 12) & 0x3f) | 0x80); utf8[2] = (char)(((codepoint >> 6) & 0x3f) | 0x80); utf8[3] = (char)((codepoint & 0x3f) | 0x80); - length = 4; + size = 4; } - *byteLength = length; + *byteSize = size; return utf8; } From 93168304cd377fabec9dfa88469f2cc635cd6326 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 3 Sep 2021 15:24:05 +0200 Subject: [PATCH 081/570] Update shell.html --- src/shell.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shell.html b/src/shell.html index aa0210c32..31714f473 100644 --- a/src/shell.html +++ b/src/shell.html @@ -192,7 +192,8 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB + + + + +

+ + {{{ SCRIPT }}} + + diff --git a/src/shell.html b/src/shell.html index 31714f473..333f6528f 100644 --- a/src/shell.html +++ b/src/shell.html @@ -4,28 +4,28 @@ - raylib HTML5 GAME + raylib web game - - + + - + - + - + - + From 7b7424802f44f238deb0cd8998833ca4b954470f Mon Sep 17 00:00:00 2001 From: Archie <46547462+ArchieAtkinson@users.noreply.github.com> Date: Mon, 10 Jan 2022 22:55:21 +0000 Subject: [PATCH 464/570] Fixes an error in the spelling of "appearance" (#2276) --- examples/shaders/shaders_spotlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/shaders/shaders_spotlight.c b/examples/shaders/shaders_spotlight.c index bdc2a0aaf..e0a9ac5b9 100644 --- a/examples/shaders/shaders_spotlight.c +++ b/examples/shaders/shaders_spotlight.c @@ -12,7 +12,7 @@ * ******************************************************************************************** * -* The shader makes alpha holes in the forground to give the apearance of a top +* The shader makes alpha holes in the forground to give the appearance of a top * down look at a spotlight casting a pool of light... * * The right hand side of the screen there is just enough light to see whats From aaf0175d0700698c3c582b78f3683b7085d4226a Mon Sep 17 00:00:00 2001 From: hartmannathan <59230071+hartmannathan@users.noreply.github.com> Date: Tue, 11 Jan 2022 03:04:09 -0500 Subject: [PATCH 465/570] Fix typo in comment: s/simluate/simulate/ (#2277) --- src/extras/physac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extras/physac.h b/src/extras/physac.h index aadc76988..3ab427acd 100644 --- a/src/extras/physac.h +++ b/src/extras/physac.h @@ -5,7 +5,7 @@ * DESCRIPTION: * * Physac is a small 2D physics engine written in pure C. The engine uses a fixed time-step thread loop -* to simluate physics. A physics step contains the following phases: get collision information, +* to simulate physics. A physics step contains the following phases: get collision information, * apply dynamics, collision solving and position correction. It uses a very simple struct for physic * bodies with a position vector to be used in any 3D rendering API. * From cabb5518e5e5f738264ed2eb1f18bfa1b3dc8511 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 11 Jan 2022 11:20:04 +0100 Subject: [PATCH 466/570] Improve Makefile organization --- examples/Makefile | 56 +++++++++++++++++++++++++-------------------- src/Makefile | 58 +++++++++++++++++++++++++---------------------- 2 files changed, 63 insertions(+), 51 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index f0bb6404f..d33dc212b 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -22,18 +22,18 @@ #************************************************************************************************** .PHONY: all clean +# Define required environment variables +#------------------------------------------------------------------------------------------------ # Define required raylib variables PROJECT_NAME ?= raylib_examples RAYLIB_VERSION ?= 4.0.0 RAYLIB_PATH ?= .. -# Define default options - # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP -# Locations of your newly installed library and associated headers. See ../src/Makefile +# Locations of your newly installed library and associated headers. # On Linux, if you have installed raylib but cannot compile the examples, check that # the *_INSTALL_PATH values here are the same as those in src/Makefile or point to known locations. # To enable system-wide compile-time and runtime linking to libraylib.so, run ../src/$ sudo make install RAYLIB_LIBTYPE_SHARED. @@ -75,39 +75,39 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # No uname.exe on MinGW!, but OS=Windows_NT on Windows! # ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) - PLATFORM_OS=WINDOWS + PLATFORM_OS = WINDOWS else - UNAMEOS=$(shell uname) + UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) - PLATFORM_OS=LINUX + PLATFORM_OS = LINUX endif ifeq ($(UNAMEOS),FreeBSD) - PLATFORM_OS=BSD + PLATFORM_OS = BSD endif ifeq ($(UNAMEOS),OpenBSD) - PLATFORM_OS=BSD + PLATFORM_OS = BSD endif ifeq ($(UNAMEOS),NetBSD) - PLATFORM_OS=BSD + PLATFORM_OS = BSD endif ifeq ($(UNAMEOS),DragonFly) - PLATFORM_OS=BSD + PLATFORM_OS = BSD endif ifeq ($(UNAMEOS),Darwin) - PLATFORM_OS=OSX + PLATFORM_OS = OSX endif endif endif ifeq ($(PLATFORM),PLATFORM_RPI) - UNAMEOS=$(shell uname) + UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) - PLATFORM_OS=LINUX + PLATFORM_OS = LINUX endif endif ifeq ($(PLATFORM),PLATFORM_DRM) - UNAMEOS=$(shell uname) + UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) - PLATFORM_OS=LINUX + PLATFORM_OS = LINUX endif endif @@ -158,8 +158,8 @@ RAYLIB_RELEASE_PATH ?= $(RAYLIB_PATH)/src # Look for libraylib.so.1 => $(RAYLIB_INSTALL_PATH)/libraylib.so.1 or similar listing. EXAMPLE_RUNTIME_PATH ?= $(RAYLIB_RELEASE_PATH) -# Define default C compiler: gcc -# NOTE: define g++ compiler if using C++ +# Define default C compiler: CC +#------------------------------------------------------------------------------------------------ CC = gcc ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -186,7 +186,8 @@ ifeq ($(PLATFORM),PLATFORM_WEB) CC = emcc endif -# Define default make program +# Define default make program: MAKE +#------------------------------------------------------------------------------------------------ MAKE ?= make ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -201,7 +202,8 @@ ifeq ($(PLATFORM),PLATFORM_WEB) MAKE = mingw32-make endif -# Define compiler flags: +# Define compiler flags: CFLAGS +#------------------------------------------------------------------------------------------------ # -O1 defines optimization level # -g include debug information on compilation # -s strip unnecessary data from build @@ -245,7 +247,8 @@ ifeq ($(PLATFORM),PLATFORM_DRM) CFLAGS += -std=gnu99 -DEGL_NO_X11 endif -# Define include paths for required headers +# Define include paths for required headers: INCLUDE_PATHS +#------------------------------------------------------------------------------------------------ # NOTE: Some external/extras libraries could be required (stb, physac, easings...) INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external -I$(RAYLIB_PATH)/src/extras @@ -270,7 +273,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif -# Define library paths containing required libs. +# Define library paths containing required libs: LDFLAGS +#------------------------------------------------------------------------------------------------ LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -322,8 +326,9 @@ ifeq ($(PLATFORM),PLATFORM_RPI) LDFLAGS += -L$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/lib endif -# Define any libraries required on linking -# if you want to link libraries (libname.so or libname.a), use the -lname +# Define libraries required on linking: LDLIBS +# NOTE: To link libraries (lib.so or lib.a), use -l +#------------------------------------------------------------------------------------------------ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) # Libraries for Windows desktop compilation @@ -387,7 +392,8 @@ ifeq ($(PLATFORM),PLATFORM_WEB) LDLIBS = $(RAYLIB_RELEASE_PATH)/libraylib.a endif -# Define all object files required +# Define source code object files required +#------------------------------------------------------------------------------------------------ CORE = \ core/core_basic_window \ core/core_basic_screen_manager \ @@ -526,6 +532,8 @@ PHYSICS = \ CURRENT_MAKEFILE = $(lastword $(MAKEFILE_LIST)) +# Define processes to execute +#------------------------------------------------------------------------------------------------ # Default target entry all: $(CORE) $(SHAPES) $(TEXT) $(TEXTURES) $(MODELS) $(SHADERS) $(AUDIO) $(PHYSICS) diff --git a/src/Makefile b/src/Makefile index 4ecad6f8b..23eac580d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,33 +15,33 @@ # Many thanks to Milan Nikolic (@gen2brain) for implementing Android platform pipeline. # Many thanks to Emanuele Petriglia for his contribution on GNU/Linux pipeline. # -# Copyright (c) 2014-2022 Ramon Santamaria (@raysan5) +# Copyright (c) 2013-2022 Ramon Santamaria (@raysan5) # -# This software is provided "as-is", without any express or implied warranty. -# In no event will the authors be held liable for any damages arising from -# the use of this software. +# This software is provided "as-is", without any express or implied warranty. In no event +# will the authors be held liable for any damages arising from the use of this software. # -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: +# Permission is granted to anyone to use this software for any purpose, including commercial +# applications, and to alter it and redistribute it freely, subject to the following restrictions: # -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software in a -# product, an acknowledgment in the product documentation would be -# appreciated but is not required. +# 1. The origin of this software must not be misrepresented; you must not claim that you +# wrote the original software. If you use this software in a product, an acknowledgment +# in the product documentation would be appreciated but is not required. # -# 2. Altered source versions must be plainly marked as such, and must not -# be misrepresented as being the original software. +# 2. Altered source versions must be plainly marked as such, and must not be misrepresented +# as being the original software. # -# 3. This notice may not be removed or altered from any source distribution. +# 3. This notice may not be removed or altered from any source distribution. # -#****************************************************************************** +#************************************************************************************************** # Please read the wiki to know how to compile raylib, because there are different methods. # https://github.com/raysan5/raylib/wiki .PHONY: all clean install uninstall +# Define required environment variables +#------------------------------------------------------------------------------------------------ + # Define required raylib variables RAYLIB_VERSION = 4.0.0 RAYLIB_API_VERSION = 400 @@ -220,7 +220,8 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) GRAPHICS = GRAPHICS_API_OPENGL_ES2 endif -# Define default C compiler and archiver to pack library +# Define default C compiler and archiver to pack library: CC, AR +#------------------------------------------------------------------------------------------------ CC = gcc AR = ar @@ -266,7 +267,8 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) AR = $(ANDROID_TOOLCHAIN)/bin/llvm-ar endif -# Define compiler flags: +# Define compiler flags: CFLAGS +#------------------------------------------------------------------------------------------------ # -O1 defines optimization level # -g include debug information on compilation # -s strip unnecessary data from build @@ -377,7 +379,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif -# Define include paths for required headers +# Define include paths for required headers: INCLUDE_PATHS +#------------------------------------------------------------------------------------------------ # NOTE: Several external required libraries (stb and others) INCLUDE_PATHS = -I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw @@ -418,7 +421,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) endif endif -# Define linker flags (required for dynamic library generation) +# Define library paths containing required libs: LDFLAGS +# NOTE: This is only required for dynamic library generation +#------------------------------------------------------------------------------------------------ LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -452,7 +457,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) LDFLAGS += -Wl,-undefined,dynamic_lookup endif -# Define linker libraries (required for dynamic library generation) +# Define libraries required on linking: LDLIBS +# NOTE: This is only required for dynamic library generation +#------------------------------------------------------------------------------------------------ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) LDLIBS = -static-libgcc -lopengl32 -lgdi32 -lwinmm @@ -485,13 +492,8 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) LDLIBS = -llog -landroid -lEGL -lGLESv2 -lOpenSLES -lc -lm endif -# Define all object files required with a wildcard -# The wildcard takes all files that finish with ".c", -# and replaces extentions with ".o", that are the object files -# NOTE: Some objects depend on the PLATFORM to be added or not! -# OBJS = $(patsubst %.c, %.o, $(wildcard *.c)) - -# Define object required on compilation +# Define source code object files required +#------------------------------------------------------------------------------------------------ OBJS = rcore.o \ rshapes.o \ rtextures.o \ @@ -520,6 +522,8 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) OBJS += android_native_app_glue.o endif +# Define processes to execute +#------------------------------------------------------------------------------------------------ # Default target entry all: raylib From 0416d5ff7b35bc99bc29a72f9b34592533582476 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 11 Jan 2022 11:26:45 +0100 Subject: [PATCH 467/570] Update Makefile --- examples/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index d33dc212b..15b6a8300 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -22,9 +22,9 @@ #************************************************************************************************** .PHONY: all clean + # Define required environment variables #------------------------------------------------------------------------------------------------ - # Define required raylib variables PROJECT_NAME ?= raylib_examples RAYLIB_VERSION ?= 4.0.0 @@ -137,7 +137,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) CLANG_PATH = $(EMSDK_PATH)/upstream/bin PYTHON_PATH = $(EMSDK_PATH)/python/3.9.2-1_64bit NODE_PATH = $(EMSDK_PATH)/node/14.15.5_64bit/bin - export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH);C:\raylib\MinGW\bin:$$(PATH) + export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH):$$(PATH) endif # Define raylib release directory for compiled library. @@ -211,6 +211,7 @@ endif # -std=c99 defines C language mode (standard C from 1999 revision) # -std=gnu99 defines C language mode (GNU C from 1999 revision) # -Wno-missing-braces ignore invalid warning (GCC bug 53119) +# -Wno-unused-value ignore unused return values of some functions (i.e. fread()) # -D_DEFAULT_SOURCE use with -std=c99 on Linux and PLATFORM_WEB, required for timespec CFLAGS = -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces -Wunused-result From b61c9afd047f30d0ad5bd2fb70661fe8165486f4 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 11 Jan 2022 11:57:26 +0100 Subject: [PATCH 468/570] Update Makefile, simplified --- examples/Makefile | 105 +++++++++++++++++----------------------------- src/Makefile | 26 +++++------- 2 files changed, 49 insertions(+), 82 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 15b6a8300..a3318aacd 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -25,40 +25,30 @@ # Define required environment variables #------------------------------------------------------------------------------------------------ +# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB +PLATFORM ?= PLATFORM_DESKTOP + # Define required raylib variables PROJECT_NAME ?= raylib_examples RAYLIB_VERSION ?= 4.0.0 RAYLIB_PATH ?= .. -# One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB -PLATFORM ?= PLATFORM_DESKTOP +# Locations of raylib.h and libraylib.a/libraylib.so +# NOTE: Those variables are only used for PLATFORM_OS: LINUX, BSD +RAYLIB_INCLUDE_PATH ?= /usr/local/include +RAYLIB_LIBRARY_PATH ?= /usr/local/lib -# Locations of your newly installed library and associated headers. -# On Linux, if you have installed raylib but cannot compile the examples, check that -# the *_INSTALL_PATH values here are the same as those in src/Makefile or point to known locations. -# To enable system-wide compile-time and runtime linking to libraylib.so, run ../src/$ sudo make install RAYLIB_LIBTYPE_SHARED. -# To enable compile-time linking to a special version of libraylib.so, change these variables here. -# To enable runtime linking to a special version of libraylib.so, see EXAMPLE_RUNTIME_PATH below. -# If there is a libraylib in both EXAMPLE_RUNTIME_PATH and RAYLIB_INSTALL_PATH, at runtime, -# the library at EXAMPLE_RUNTIME_PATH, if present, will take precedence over the one at RAYLIB_INSTALL_PATH. -# RAYLIB_INSTALL_PATH should be the desired full path to libraylib. No relative paths. -DESTDIR ?= /usr/local -RAYLIB_INSTALL_PATH ?= $(DESTDIR)/lib -# RAYLIB_H_INSTALL_PATH locates the installed raylib header and associated source files. -RAYLIB_H_INSTALL_PATH ?= $(DESTDIR)/include - -# Library type used for raylib: STATIC (.a) or SHARED (.so/.dll) +# Library type compilation: STATIC (.a) or SHARED (.so/.dll) RAYLIB_LIBTYPE ?= STATIC # Build mode for project: DEBUG or RELEASE BUILD_MODE ?= RELEASE # Use external GLFW library instead of rglfw module -# TODO: Review usage on Linux. Target version of choice. Switch on -lglfw or -lglfw3 USE_EXTERNAL_GLFW ?= FALSE -# Use Wayland display server protocol on Linux desktop -# by default it uses X11 windowing system +# Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system) +# NOTE: This variable is only used for PLATFORM_OS: LINUX USE_WAYLAND_DISPLAY ?= FALSE # Use cross-compiler for PLATFORM_RPI @@ -111,18 +101,16 @@ ifeq ($(PLATFORM),PLATFORM_DRM) endif endif -# RAYLIB_PATH adjustment for different platforms. -# If using GNU make, we can get the full path to the top of the tree. Windows? BSD? -# Required for ldconfig or other tools that do not perform path expansion. +# RAYLIB_PATH adjustment for LINUX platform +# TODO: Do we really need this? ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) - RAYLIB_PREFIX ?= .. - RAYLIB_PATH = $(realpath $(RAYLIB_PREFIX)) + RAYLIB_PREFIX ?= .. + RAYLIB_PATH = $(realpath $(RAYLIB_PREFIX)) endif endif -# Default path for raylib on Raspberry Pi, if installed in different path, update it! -# This is not currently used by src/Makefile. Not sure of its origin or usage. Refer to wiki. -# TODO: update install: target in src/Makefile for RPI, consider relation to LINUX. + +# Default path for raylib on Raspberry Pi ifeq ($(PLATFORM),PLATFORM_RPI) RAYLIB_PATH ?= /home/pi/raylib endif @@ -130,6 +118,9 @@ ifeq ($(PLATFORM),PLATFORM_DRM) RAYLIB_PATH ?= /home/pi/raylib endif +# Define raylib release directory for compiled library +RAYLIB_RELEASE_PATH ?= $(RAYLIB_PATH)/src + ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables EMSDK_PATH ?= C:/emsdk @@ -140,24 +131,6 @@ ifeq ($(PLATFORM),PLATFORM_WEB) export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH):$$(PATH) endif -# Define raylib release directory for compiled library. -# RAYLIB_RELEASE_PATH points to provided binaries or your freshly built version -RAYLIB_RELEASE_PATH ?= $(RAYLIB_PATH)/src - -# EXAMPLE_RUNTIME_PATH embeds a custom runtime location of libraylib.so or other desired libraries -# into each example binary compiled with RAYLIB_LIBTYPE=SHARED. It defaults to RAYLIB_RELEASE_PATH -# so that these examples link at runtime with your version of libraylib.so in ../release/libs/linux -# without formal installation from ../src/Makefile. It aids portability and is useful if you have -# multiple versions of raylib, have raylib installed to a non-standard location, or want to -# bundle libraylib.so with your game. Change it to your liking. -# NOTE: If, at runtime, there is a libraylib.so at both EXAMPLE_RUNTIME_PATH and RAYLIB_INSTALL_PATH, -# The library at EXAMPLE_RUNTIME_PATH, if present, will take precedence over RAYLIB_INSTALL_PATH, -# Implemented for LINUX below with CFLAGS += -Wl,-rpath,$(EXAMPLE_RUNTIME_PATH) -# To see the result, run readelf -d core/core_basic_window; looking at the RPATH or RUNPATH attribute. -# To see which libraries a built example is linking to, ldd core/core_basic_window; -# Look for libraylib.so.1 => $(RAYLIB_INSTALL_PATH)/libraylib.so.1 or similar listing. -EXAMPLE_RUNTIME_PATH ?= $(RAYLIB_RELEASE_PATH) - # Define default C compiler: CC #------------------------------------------------------------------------------------------------ CC = gcc @@ -229,6 +202,10 @@ else endif # Additional flags for compiler (if desired) +# -Wextra enables some extra warning flags that are not enabled by -Wall +# -Wmissing-prototypes warn if a global function is defined without a previous prototype declaration +# -Wstrict-prototypes warn if a function is declared or defined without specifying the argument types +# -Werror=implicit-function-declaration catch function calls without prior declaration #CFLAGS += -Wextra -Wmissing-prototypes -Wstrict-prototypes ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) @@ -237,7 +214,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif ifeq ($(RAYLIB_LIBTYPE),SHARED) # Explicitly enable runtime link to libraylib.so - CFLAGS += -Wl,-rpath,$(EXAMPLE_RUNTIME_PATH) + CFLAGS += -Wl,-rpath,$(RAYLIB_RELEASE_PATH) endif endif endif @@ -249,30 +226,27 @@ ifeq ($(PLATFORM),PLATFORM_DRM) endif # Define include paths for required headers: INCLUDE_PATHS -#------------------------------------------------------------------------------------------------ # NOTE: Some external/extras libraries could be required (stb, physac, easings...) +#------------------------------------------------------------------------------------------------ INCLUDE_PATHS = -I. -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external -I$(RAYLIB_PATH)/src/extras # Define additional directories containing required header files +ifeq ($(PLATFORM),PLATFORM_DESKTOP) + ifeq ($(PLATFORM_OS),BSD) + INCLUDE_PATHS += -I$(RAYLIB_INCLUDE_PATH) + endif + ifeq ($(PLATFORM_OS),LINUX) + INCLUDE_PATHS += -I$(RAYLIB_INCLUDE_PATH) + endif +endif ifeq ($(PLATFORM),PLATFORM_RPI) - # RPI required libraries INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vmcs_host/linux INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads endif ifeq ($(PLATFORM),PLATFORM_DRM) - # DRM required libraries INCLUDE_PATHS += -I/usr/include/libdrm endif -ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),BSD) - # Consider -L$(RAYLIB_H_INSTALL_PATH) - INCLUDE_PATHS += -I/usr/local/include - endif - ifeq ($(PLATFORM_OS),LINUX) - INCLUDE_PATHS += -I$(RAYLIB_H_INSTALL_PATH) - endif -endif # Define library paths containing required libs: LDFLAGS #------------------------------------------------------------------------------------------------ @@ -280,21 +254,18 @@ LDFLAGS = -L. -L$(RAYLIB_RELEASE_PATH) -L$(RAYLIB_PATH)/src ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) - # resource file contains windows executable icon and properties + # NOTE: The resource .rc file contains windows executable icon and properties LDFLAGS += $(RAYLIB_PATH)/src/raylib.rc.data # -Wl,--subsystem,windows hides the console window ifeq ($(BUILD_MODE), RELEASE) LDFLAGS += -Wl,--subsystem,windows endif endif - ifeq ($(PLATFORM_OS),BSD) - # Consider -L$(RAYLIB_INSTALL_PATH) - LDFLAGS += -Lsrc -L/usr/local/lib - endif ifeq ($(PLATFORM_OS),LINUX) - # Reset everything. - # Precedence: immediately local, installed version, raysan5 provided libs - LDFLAGS += -L$(RAYLIB_INSTALL_PATH) + LDFLAGS += -L$(RAYLIB_LIBRARY_PATH) + endif + ifeq ($(PLATFORM_OS),BSD) + LDFLAGS += -Lsrc -L$(RAYLIB_LIBRARY_PATH) endif endif ifeq ($(PLATFORM),PLATFORM_WEB) diff --git a/src/Makefile b/src/Makefile index 23eac580d..ddac896cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,13 +34,15 @@ # #************************************************************************************************** -# Please read the wiki to know how to compile raylib, because there are different methods. +# NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms # https://github.com/raysan5/raylib/wiki .PHONY: all clean install uninstall # Define required environment variables #------------------------------------------------------------------------------------------------ +# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB +PLATFORM ?= PLATFORM_DESKTOP # Define required raylib variables RAYLIB_VERSION = 4.0.0 @@ -70,10 +72,6 @@ RAYLIB_RES_FILE ?= ./raylib.dll.rc.data # if NONE, default config.h flags are used RAYLIB_CONFIG_FLAGS ?= NONE -# Define raylib platform -# Options: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB -PLATFORM ?= PLATFORM_DESKTOP - # To define additional cflags: Use make CUSTOM_CFLAGS="" # Include raylib modules on compilation @@ -87,11 +85,11 @@ RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/extras RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/extras # Use external GLFW library instead of rglfw module -USE_EXTERNAL_GLFW ?= FALSE +USE_EXTERNAL_GLFW ?= FALSE -# Use Wayland display server protocol on Linux desktop -# by default it uses X11 windowing system -USE_WAYLAND_DISPLAY ?= FALSE +# Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system) +# NOTE: This variable is only used for PLATFORM_OS: LINUX +USE_WAYLAND_DISPLAY ?= FALSE # Use cross-compiler for PLATFORM_RPI ifeq ($(PLATFORM),PLATFORM_RPI) @@ -102,9 +100,8 @@ ifeq ($(PLATFORM),PLATFORM_RPI) endif endif -# Determine if the file has root access (only for installing raylib) -# "whoami" prints the name of the user that calls him (so, if it is the root -# user, "whoami" prints "root"). +# Determine if the file has root access (only required to install raylib) +# "whoami" prints the name of the user that calls him (so, if it is the root user, "whoami" prints "root") ROOT = $(shell whoami) # By default we suppose we are working on Windows @@ -276,6 +273,7 @@ endif # -std=c99 defines C language mode (standard C from 1999 revision) # -std=gnu99 defines C language mode (GNU C from 1999 revision) # -Wno-missing-braces ignore invalid warning (GCC bug 53119) +# -Wno-unused-value ignore unused return values of some functions (i.e. fread()) # -D_DEFAULT_SOURCE use with -std=c99 on Linux and PLATFORM_WEB, required for timespec # -Werror=pointer-arith catch unportable code that does direct arithmetic on void pointers # -fno-strict-aliasing jar_xm.h does shady stuff (breaks strict aliasing) @@ -380,8 +378,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif # Define include paths for required headers: INCLUDE_PATHS -#------------------------------------------------------------------------------------------------ # NOTE: Several external required libraries (stb and others) +#------------------------------------------------------------------------------------------------ INCLUDE_PATHS = -I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw # Define additional directories containing required header files @@ -391,13 +389,11 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif ifeq ($(PLATFORM),PLATFORM_RPI) - # RPI required libraries INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vmcs_host/linux INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads endif ifeq ($(PLATFORM),PLATFORM_DRM) - # DRM required libraries INCLUDE_PATHS += -I/usr/include/libdrm endif ifeq ($(PLATFORM),PLATFORM_ANDROID) From a134b8bc6dd7e2d819609e3b1cd75a23db0ae124 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 11 Jan 2022 15:39:08 +0100 Subject: [PATCH 469/570] Update Makefile --- examples/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index a3318aacd..ac1284f2f 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -26,17 +26,17 @@ # Define required environment variables #------------------------------------------------------------------------------------------------ # Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB -PLATFORM ?= PLATFORM_DESKTOP +PLATFORM ?= PLATFORM_DESKTOP # Define required raylib variables -PROJECT_NAME ?= raylib_examples -RAYLIB_VERSION ?= 4.0.0 -RAYLIB_PATH ?= .. +PROJECT_NAME ?= raylib_examples +RAYLIB_VERSION ?= 4.0.0 +RAYLIB_PATH ?= .. # Locations of raylib.h and libraylib.a/libraylib.so # NOTE: Those variables are only used for PLATFORM_OS: LINUX, BSD RAYLIB_INCLUDE_PATH ?= /usr/local/include -RAYLIB_LIBRARY_PATH ?= /usr/local/lib +RAYLIB_LIB_PATH ?= /usr/local/lib # Library type compilation: STATIC (.a) or SHARED (.so/.dll) RAYLIB_LIBTYPE ?= STATIC @@ -262,10 +262,10 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif ifeq ($(PLATFORM_OS),LINUX) - LDFLAGS += -L$(RAYLIB_LIBRARY_PATH) + LDFLAGS += -L$(RAYLIB_LIB_PATH) endif ifeq ($(PLATFORM_OS),BSD) - LDFLAGS += -Lsrc -L$(RAYLIB_LIBRARY_PATH) + LDFLAGS += -Lsrc -L$(RAYLIB_LIB_PATH) endif endif ifeq ($(PLATFORM),PLATFORM_WEB) From 464026f15c5d6c31625b5f21676ed6a9a8f30ffe Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 12 Jan 2022 12:00:47 +0100 Subject: [PATCH 470/570] Update rcore.c --- src/rcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rcore.c b/src/rcore.c index 95bb0bab3..d8e96b7a6 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -3261,7 +3261,7 @@ char *EncodeDataBase64(const unsigned char *data, int dataLength, int *outputLen encodedData[j++] = base64encodeTable[(triple >> 0*6) & 0x3F]; } - for (int i = 0; i < modTable[dataLength%3]; i++) encodedData[*outputLength - 1 - i] = '='; + for (int i = 0; i < modTable[dataLength%3]; i++) encodedData[*outputLength - 1 - i] = '='; // Padding character return encodedData; } From e621efe79ff47318969c2b4f7885bfdeb83a4cf9 Mon Sep 17 00:00:00 2001 From: Matthew Owens Date: Thu, 13 Jan 2022 17:42:44 +0000 Subject: [PATCH 471/570] rlLoadShaderCode - set ShaderId variables to RLGL.State.default[VF]ShaderId if repesctive Code is NULL (#2281) --- src/rlgl.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 37af998fc..52d8a9e83 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3544,8 +3544,16 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) unsigned int vertexShaderId = 0; unsigned int fragmentShaderId = 0; - if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); - if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); + if (vsCode != NULL) { + vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); + } else { + vertexShaderId = RLGL.State.defaultVShaderId; + } + if (fsCode != NULL) { + fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); + } else { + fragmentShaderId = RLGL.State.defaultFShaderId; + } // Load shader program if provided vertex/fragment shaders compile successfully if ((vertexShaderId != 0) && (fragmentShaderId != 0)) id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); From f57727995a0676bae6692c376081a836db539917 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 13 Jan 2022 19:05:45 +0100 Subject: [PATCH 472/570] REVIEWED: `rlLoadShaderCode()` --- src/rlgl.h | 101 ++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 52d8a9e83..16f419021 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -3544,61 +3544,66 @@ unsigned int rlLoadShaderCode(const char *vsCode, const char *fsCode) unsigned int vertexShaderId = 0; unsigned int fragmentShaderId = 0; - if (vsCode != NULL) { - vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); - } else { - vertexShaderId = RLGL.State.defaultVShaderId; - } - if (fsCode != NULL) { - fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); - } else { - fragmentShaderId = RLGL.State.defaultFShaderId; - } + // Compile vertex shader (if provided) + if (vsCode != NULL) vertexShaderId = rlCompileShader(vsCode, GL_VERTEX_SHADER); + // In case no vertex shader was provided or compilation failed, we use default vertex shader + if (vertexShaderId == 0) vertexShaderId = RLGL.State.defaultVShaderId; - // Load shader program if provided vertex/fragment shaders compile successfully - if ((vertexShaderId != 0) && (fragmentShaderId != 0)) id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); + // Compile fragment shader (if provided) + if (fsCode != NULL) fragmentShaderId = rlCompileShader(fsCode, GL_FRAGMENT_SHADER); + // In case no fragment shader was provided or compilation failed, we use default fragment shader + if (fragmentShaderId == 0) fragmentShaderId = RLGL.State.defaultFShaderId; - // Once shader program is compiled, we can detach and delete vertex/fragment shaders - // NOTE: Vertex - if (vertexShaderId != 0) - { - // Detach shader before deletion to make sure memory is freed - glDetachShader(id, vertexShaderId); - glDeleteShader(vertexShaderId); - } - if (fragmentShaderId != 0) - { - // Detach shader before deletion to make sure memory is freed - glDetachShader(id, fragmentShaderId); - glDeleteShader(fragmentShaderId); - } - - if (id == 0) - { - // In case shader loading fails, we return the default shader - TRACELOG(RL_LOG_WARNING, "SHADER: Failed to load custom shader code, using default shader"); - id = RLGL.State.defaultShaderId; - } + // In case vertex and fragment shader are the default ones, no need to recompile, we can just assign the default shader program id + if ((vertexShaderId == RLGL.State.defaultVShaderId) && (fragmentShaderId == RLGL.State.defaultFShaderId)) id = RLGL.State.defaultShaderId; else { - // Get available shader uniforms - // NOTE: This information is useful for debug... - int uniformCount = -1; - glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &uniformCount); + // One of or both shader are new, we need to compile a new shader program + id = rlLoadShaderProgram(vertexShaderId, fragmentShaderId); - for (int i = 0; i < uniformCount; i++) + // We can detach and delete vertex/fragment shaders (if not default ones) + // NOTE: We detach shader before deletion to make sure memory is freed + if (vertexShaderId != RLGL.State.defaultVShaderId) { - int namelen = -1; - int num = -1; - char name[256] = { 0 }; // Assume no variable names longer than 256 - GLenum type = GL_ZERO; - - // Get the name of the uniforms - glGetActiveUniform(id, i, sizeof(name) - 1, &namelen, &num, &type, name); - - name[namelen] = 0; - TRACELOGD("SHADER: [ID %i] Active uniform (%s) set at location: %i", id, name, glGetUniformLocation(id, name)); + glDetachShader(id, vertexShaderId); + glDeleteShader(vertexShaderId); } + if (fragmentShaderId != RLGL.State.defaultFShaderId) + { + glDetachShader(id, fragmentShaderId); + glDeleteShader(fragmentShaderId); + } + + // In case shader program loading failed, we assign default shader + if (id == 0) + { + // In case shader loading fails, we return the default shader + TRACELOG(RL_LOG_WARNING, "SHADER: Failed to load custom shader code, using default shader"); + id = RLGL.State.defaultShaderId; + } + /* + else + { + // Get available shader uniforms + // NOTE: This information is useful for debug... + int uniformCount = -1; + glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &uniformCount); + + for (int i = 0; i < uniformCount; i++) + { + int namelen = -1; + int num = -1; + char name[256] = { 0 }; // Assume no variable names longer than 256 + GLenum type = GL_ZERO; + + // Get the name of the uniforms + glGetActiveUniform(id, i, sizeof(name) - 1, &namelen, &num, &type, name); + + name[namelen] = 0; + TRACELOGD("SHADER: [ID %i] Active uniform (%s) set at location: %i", id, name, glGetUniformLocation(id, name)); + } + } + */ } #endif From f4dea6919a34fa8c77cad8a589e5f4c20595988c Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Fri, 14 Jan 2022 11:16:25 -0800 Subject: [PATCH 473/570] [CORE] Bug and formating fixes for GetApplicatonDir (#2285) * Fix formating problems with GetApplicationDir. Don't ever return an empty string * always return a valid path even if it's ./ * remove the need for the dll and just use the normal GetModuleFileName function --- src/rcore.c | 149 +++++++++++++++++++++------------------------------- 1 file changed, 61 insertions(+), 88 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index d8e96b7a6..8e93709ba 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -166,29 +166,13 @@ #ifndef MAX_PATH #define MAX_PATH 1025 #endif - void *LoadLibraryA(void *lpLibFileName); - void *LoadLibraryW(void *lpLibFileName); - - #ifdef UNICODE - #define LoadLibrary LoadLibraryW - #else - #define LoadLibrary LoadLibraryA - #endif // !UNICODE - - void *GetProcAddress(void *hModule, void *lpProcName); - - void *GetCurrentProcess(void); - bool FreeLibrary(void *hLibModule); - + unsigned int GetModuleFileNameA( void* hModule, const char* lpFilename, unsigned int nSize); + unsigned int GetModuleFileNameW( void* hModule, const unsigned short* lpFilename, unsigned int nSize); int WideCharToMultiByte(unsigned int cp, unsigned long flags, const unsigned short *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); - - const char pathDelim = '\\'; #elif defined(__linux__) #include - const char pathDelim = '/'; #elif defined(__APPLE__) #include - const char pathDelim = '/'; #endif // OSs #endif // PLATFORM_DESKTOP @@ -3003,86 +2987,75 @@ const char *GetWorkingDirectory(void) const char *GetApplicationDirectory(void) { - static char appDir[MAX_FILEPATH_LENGTH] = { 0 }; - memset(appDir, 0, MAX_FILEPATH_LENGTH); + static char appDir[MAX_FILEPATH_LENGTH] = { 0 }; + memset(appDir, 0, MAX_FILEPATH_LENGTH); #if defined(_WIN32) - typedef unsigned long(*GetModuleFileNameFunc)(void*, void*, void*, unsigned long); - - GetModuleFileNameFunc getModuleFileNameExWPtr = NULL; - void *lib = LoadLibrary(L"psapi.dll"); - - if (lib == NULL) - { - appDir[0] = '\\'; - } - else - { + int len = 0; #if defined (UNICODE) - getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExW"); + unsigned short widePath[MAX_PATH]; + len = GetModuleFileNameW(NULL, widePath, MAX_PATH); + len = WideCharToMultiByte(0, 0, widePath, len, appDir, MAX_PATH, NULL, NULL); #else - getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExA"); + len = GetModuleFileNameA(NULL, appDir, MAX_PATH); #endif + if (len > 0) + { + for (int i = len; i >= 0; --i) + { + if (appDir[i] == '\\') + { + appDir[i + 1] = '\0'; + i = -1; + } + } + } + else + { + appDir[0] = '.'; + appDir[1] = '\\'; + } - if (getModuleFileNameExWPtr == NULL) - { - appDir[0] = '\\'; - } - else - { - int len = 0; -#if defined (UNICODE) - unsigned short widePath[MAX_PATH]; - len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, widePath, MAX_PATH); - len = WideCharToMultiByte(0, 0, widePath, len, appDir, MAX_PATH, NULL, NULL); -#else - len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, appDir, MAX_PATH); -#endif - if (len > 0) - { - for (int i = len; i >= 0; --i) - { - if (appDir[i] == '\\') - { - appDir[i + 1] = '\0'; - i = -1; - } - } - } - } - - FreeLibrary(lib); - } #elif defined(__linux__) - unsigned int size = sizeof(appDir); - ssize_t len = readlink("/proc/self/exe", appDir, size); + unsigned int size = sizeof(appDir); + ssize_t len = readlink("/proc/self/exe", appDir, size); - if (len > 0) - { - for (int i = len; i >= 0; --i) - { - if (appDir[i] == '/') - { - appDir[i + 1] = '\0'; - i = -1; - } - } - } + if (len > 0) + { + for (int i = len; i >= 0; --i) + { + if (appDir[i] == '/') + { + appDir[i + 1] = '\0'; + i = -1; + } + } + } + else + { + appDir[0] = '.'; + appDir[1] = '/'; + } #elif defined(__APPLE__) - uint32_t size = sizeof(appDir); + uint32_t size = sizeof(appDir); - if (_NSGetExecutablePath(appDir, &size) == 0) - { - int len = strlen(appDir); - for (int i = len; i >= 0; --i) - { - if (appDir[i] == '/') - { - appDir[i + 1] = '\0'; - i = -1; - } - } - } + if (_NSGetExecutablePath(appDir, &size) == 0) + { + int len = strlen(appDir); + for (int i = len; i >= 0; --i) + { + if (appDir[i] == '/') + { + appDir[i + 1] = '\0'; + i = -1; + } + } + } + else + { + appDir[0] = '.'; + appDir[1] = '/'; + } #endif return appDir; From 8ee0eb8f36e65e45d3ab0ed35b9d8dbf219d19c1 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 15 Jan 2022 22:12:58 +0100 Subject: [PATCH 474/570] ADDED: `Vector2Transform()` --- src/raymath.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/raymath.h b/src/raymath.h index 9b86b2936..d0d34e348 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -334,6 +334,21 @@ RMAPI Vector2 Vector2Normalize(Vector2 v) return result; } +// Transforms a Vector2 by a given Matrix +Vector2 Vector2Transform(Vector2 v, Matrix mat) +{ + Vector2 result = { 0 }; + + float x = v.x; + float y = v.y; + float z = 0; + + result.x = mat.m0*x + mat.m4*y + mat.m8*z + mat.m12; + result.y = mat.m1*x + mat.m5*y + mat.m9*z + mat.m13; + + return result; +} + // Calculate linear interpolation between two vectors RMAPI Vector2 Vector2Lerp(Vector2 v1, Vector2 v2, float amount) { From 48a463cca869309f598399b1c2aff431feb5685a Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 15 Jan 2022 22:19:48 +0100 Subject: [PATCH 475/570] REVIEWED: `Vector2Transform(()` --- src/raymath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raymath.h b/src/raymath.h index d0d34e348..8a54bbccc 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -335,7 +335,7 @@ RMAPI Vector2 Vector2Normalize(Vector2 v) } // Transforms a Vector2 by a given Matrix -Vector2 Vector2Transform(Vector2 v, Matrix mat) +RMAPI Vector2 Vector2Transform(Vector2 v, Matrix mat) { Vector2 result = { 0 }; From 5ac07122bd92c008550b3e55ea0555055c99aaa0 Mon Sep 17 00:00:00 2001 From: ptarabbia Date: Sun, 16 Jan 2022 06:49:58 -0500 Subject: [PATCH 476/570] Add panning to raudio and update audio_raw_stream example. (#2205) * Add panning to raudio and update audio_raw_stream example. * remove pan smoothing, code formatting changes following pull request comments Co-authored-by: Ray --- examples/audio/audio_raw_stream.c | 5 +- src/raudio.c | 76 +++++++++++++++++++++++++++---- src/raudio.h | 3 ++ src/raylib.h | 3 ++ 4 files changed, 76 insertions(+), 11 deletions(-) diff --git a/examples/audio/audio_raw_stream.c b/examples/audio/audio_raw_stream.c index c9ec7a9df..9b2d10227 100644 --- a/examples/audio/audio_raw_stream.c +++ b/examples/audio/audio_raw_stream.c @@ -77,6 +77,9 @@ int main(void) { float fp = (float)(mousePosition.y); frequency = 40.0f + (float)(fp); + + float pan = (float)(mousePosition.x) / (float)screenWidth; + SetAudioStreamPan(stream, pan); } // Rewrite the sine wave. @@ -137,7 +140,7 @@ int main(void) ClearBackground(RAYWHITE); DrawText(TextFormat("sine frequency: %i",(int)frequency), GetScreenWidth() - 220, 10, 20, RED); - DrawText("click mouse button to change frequency", 10, 10, 20, DARKGRAY); + DrawText("click mouse button to change frequency or pan", 10, 10, 20, DARKGRAY); // Draw the current buffer state proportionate to the screen for (int i = 0; i < screenWidth; i++) diff --git a/src/raudio.c b/src/raudio.c index 67510dc22..57f4294f5 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -317,6 +317,7 @@ struct rAudioBuffer { float volume; // Audio buffer volume float pitch; // Audio buffer pitch + float pan; // Audio buffer pan (0 to 1) bool playing; // Audio buffer state: AUDIO_PLAYING bool paused; // Audio buffer state: AUDIO_PAUSED @@ -373,7 +374,7 @@ static AudioData AUDIO = { // Global AUDIO context //---------------------------------------------------------------------------------- static void OnLog(ma_context *pContext, ma_device *pDevice, ma_uint32 logLevel, const char *message); static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const void *pFramesInput, ma_uint32 frameCount); -static void MixAudioFrames(float *framesOut, const float *framesIn, ma_uint32 frameCount, float localVolume); +static void MixAudioFrames(float *framesOut, const float *framesIn, ma_uint32 frameCount, AudioBuffer *buffer); #if defined(RAUDIO_STANDALONE) static bool IsFileExtension(const char *fileName, const char *ext); // Check file extension @@ -397,6 +398,7 @@ void StopAudioBuffer(AudioBuffer *buffer); void PauseAudioBuffer(AudioBuffer *buffer); void ResumeAudioBuffer(AudioBuffer *buffer); void SetAudioBufferVolume(AudioBuffer *buffer, float volume); +void SetAudioBufferPan(AudioBuffer *buffer, float pan); void SetAudioBufferPitch(AudioBuffer *buffer, float pitch); void TrackAudioBuffer(AudioBuffer *buffer); void UntrackAudioBuffer(AudioBuffer *buffer); @@ -553,6 +555,8 @@ AudioBuffer *LoadAudioBuffer(ma_format format, ma_uint32 channels, ma_uint32 sam // Init audio buffer values audioBuffer->volume = 1.0f; audioBuffer->pitch = 1.0f; + audioBuffer->pan = 0.5f; + audioBuffer->playing = false; audioBuffer->paused = false; audioBuffer->looping = false; @@ -641,6 +645,12 @@ void SetAudioBufferVolume(AudioBuffer *buffer, float volume) if (buffer != NULL) buffer->volume = volume; } +// Set pan for an audio buffer +void SetAudioBufferPan(AudioBuffer *buffer, float pan) +{ + if (buffer != NULL) buffer->pan = pan; +} + // Set pitch for an audio buffer void SetAudioBufferPitch(AudioBuffer *buffer, float pitch) { @@ -1048,6 +1058,8 @@ void PlaySoundMulti(Sound sound) SetAudioBufferVolume(AUDIO.MultiChannel.pool[index], sound.stream.buffer->volume); SetAudioBufferPitch(AUDIO.MultiChannel.pool[index], sound.stream.buffer->pitch); + SetAudioBufferPan(AUDIO.MultiChannel.pool[index], sound.stream.buffer->pan); + AUDIO.MultiChannel.pool[index]->looping = sound.stream.buffer->looping; AUDIO.MultiChannel.pool[index]->usage = sound.stream.buffer->usage; AUDIO.MultiChannel.pool[index]->isSubBufferProcessed[0] = false; @@ -1113,6 +1125,12 @@ void SetSoundPitch(Sound sound, float pitch) SetAudioBufferPitch(sound.stream.buffer, pitch); } +// Set pan for a sound +void SetSoundPan(Sound sound, float pan) +{ + SetAudioBufferPan(sound.stream.buffer, pan); +} + // Convert wave data to desired format void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels) { @@ -1809,6 +1827,12 @@ void SetMusicPitch(Music music, float pitch) SetAudioBufferPitch(music.stream.buffer, pitch); } +// Set pan for a music +void SetMusicPan(Music music, float pan) +{ + SetAudioBufferPan(music.stream.buffer, pan); +} + // Get music time length (in seconds) float GetMusicTimeLength(Music music) { @@ -1989,6 +2013,14 @@ void SetAudioStreamPitch(AudioStream stream, float pitch) SetAudioBufferPitch(stream.buffer, pitch); } +// Set pan for audio stream +void SetAudioStreamPan(AudioStream stream, float pan) +{ + if (pan < 0.0f) pan = 0.0f; else if (pan > 1.0f) pan = 1.0f; + SetAudioBufferPan(stream.buffer, pan); +} + + // Default size for new audio streams void SetAudioStreamBufferSizeDefault(int size) { @@ -2184,7 +2216,7 @@ static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const float *framesOut = (float *)pFramesOut + (framesRead*AUDIO.System.device.playback.channels); float *framesIn = tempBuffer; - MixAudioFrames(framesOut, framesIn, framesJustRead, audioBuffer->volume); + MixAudioFrames(framesOut, framesIn, framesJustRead, audioBuffer); framesToRead -= framesJustRead; framesRead += framesJustRead; @@ -2226,16 +2258,40 @@ static void OnSendAudioDataToDevice(ma_device *pDevice, void *pFramesOut, const // This is the main mixing function. Mixing is pretty simple in this project - it's just an accumulation. // NOTE: framesOut is both an input and an output. It will be initially filled with zeros outside of this function. -static void MixAudioFrames(float *framesOut, const float *framesIn, ma_uint32 frameCount, float localVolume) +static void MixAudioFrames(float *framesOut, const float *framesIn, ma_uint32 frameCount, AudioBuffer *buffer) { - for (ma_uint32 iFrame = 0; iFrame < frameCount; ++iFrame) - { - for (ma_uint32 iChannel = 0; iChannel < AUDIO.System.device.playback.channels; ++iChannel) - { - float *frameOut = framesOut + (iFrame*AUDIO.System.device.playback.channels); - const float *frameIn = framesIn + (iFrame*AUDIO.System.device.playback.channels); + const float localVolume = buffer->volume; - frameOut[iChannel] += (frameIn[iChannel]*localVolume); + const ma_uint32 nChannels = AUDIO.System.device.playback.channels; + if (nChannels == 2) + { + const float left = buffer->pan; + const float right = 1.0f - left; + + // fast sine approximation in [0..1] for pan law: y = 0.5f * x * (3 - x * x); + const float levels[2] = { localVolume*0.5f*left*(3.0f-left*left), localVolume*0.5f*right*(3.0f-right*right) }; + + float *frameOut = framesOut; + const float *frameIn = framesIn; + for (ma_uint32 iFrame = 0; iFrame < frameCount; ++iFrame) + { + frameOut[0] += (frameIn[0]*levels[0]); + frameOut[1] += (frameIn[1]*levels[1]); + frameOut += 2; + frameIn += 2; + } + } + else // pan is kinda meaningless + { + for (ma_uint32 iFrame = 0; iFrame < frameCount; ++iFrame) + { + for (ma_uint32 iChannel = 0; iChannel < nChannels; ++iChannel) + { + float *frameOut = framesOut + (iFrame * nChannels); + const float *frameIn = framesIn + (iFrame * nChannels); + + frameOut[iChannel] += (frameIn[iChannel] * localVolume); + } } } } diff --git a/src/raudio.h b/src/raudio.h index dbcfbd699..35c850bd3 100644 --- a/src/raudio.h +++ b/src/raudio.h @@ -155,6 +155,7 @@ int GetSoundsPlaying(void); // Get number of bool IsSoundPlaying(Sound sound); // Check if a sound is currently playing void SetSoundVolume(Sound sound, float volume); // Set volume for a sound (1.0 is max level) void SetSoundPitch(Sound sound, float pitch); // Set pitch for a sound (1.0 is base level) +void SetSoundPan(Sound sound, float pan); // Set pan for a sound (0.0 to 1.0, 0.5=center) void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels); // Convert wave data to desired format Wave WaveCopy(Wave wave); // Copy a wave to a new wave void WaveCrop(Wave *wave, int initSample, int finalSample); // Crop a wave to defined samples range @@ -173,6 +174,7 @@ void PauseMusicStream(Music music); // Pause music p void ResumeMusicStream(Music music); // Resume playing paused music void SeekMusicStream(Music music, float position); // Seek music to a position (in seconds) void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level) +void SetMusicPan(Music sound, float pan); // Set pan for a music (0.0 to 1.0, 0.5=center) void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level) float GetMusicTimeLength(Music music); // Get music time length (in seconds) float GetMusicTimePlayed(Music music); // Get current music time played (in seconds) @@ -189,6 +191,7 @@ bool IsAudioStreamPlaying(AudioStream stream); // Check if audi void StopAudioStream(AudioStream stream); // Stop audio stream void SetAudioStreamVolume(AudioStream stream, float volume); // Set volume for audio stream (1.0 is max level) void SetAudioStreamPitch(AudioStream stream, float pitch); // Set pitch for audio stream (1.0 is base level) +void SetAudioStreamPan(AudioStream strean, float pan); // Set pan for audio stream (0.0 to 1.0, 0.5=center) void SetAudioStreamBufferSizeDefault(int size); // Default size for new audio streams #ifdef __cplusplus diff --git a/src/raylib.h b/src/raylib.h index a2e3ea9c9..74df758b8 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1498,6 +1498,7 @@ RLAPI void StopSoundMulti(void); // Stop an RLAPI int GetSoundsPlaying(void); // Get number of sounds playing in the multichannel RLAPI bool IsSoundPlaying(Sound sound); // Check if a sound is currently playing RLAPI void SetSoundVolume(Sound sound, float volume); // Set volume for a sound (1.0 is max level) +RLAPI void SetSoundPan(Sound sound, float pan); // Set pan for a sound (0.5 = center) RLAPI void SetSoundPitch(Sound sound, float pitch); // Set pitch for a sound (1.0 is base level) RLAPI void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels); // Convert wave data to desired format RLAPI Wave WaveCopy(Wave wave); // Copy a wave to a new wave @@ -1517,6 +1518,7 @@ RLAPI void PauseMusicStream(Music music); // Pause m RLAPI void ResumeMusicStream(Music music); // Resume playing paused music RLAPI void SeekMusicStream(Music music, float position); // Seek music to a position (in seconds) RLAPI void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level) +RLAPI void SetMusicPan(Music music, float pan); // Set pan for a music (0.5 = center) RLAPI void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level) RLAPI float GetMusicTimeLength(Music music); // Get music time length (in seconds) RLAPI float GetMusicTimePlayed(Music music); // Get current music time played (in seconds) @@ -1533,6 +1535,7 @@ RLAPI bool IsAudioStreamPlaying(AudioStream stream); // Check i RLAPI void StopAudioStream(AudioStream stream); // Stop audio stream RLAPI void SetAudioStreamVolume(AudioStream stream, float volume); // Set volume for audio stream (1.0 is max level) RLAPI void SetAudioStreamPitch(AudioStream stream, float pitch); // Set pitch for audio stream (1.0 is base level) +RLAPI void SetAudioStreamPan(AudioStream stream, float pan); // Set pan for audio stream (0.5 = centered) RLAPI void SetAudioStreamBufferSizeDefault(int size); // Default size for new audio streams #if defined(__cplusplus) From 15b36e04b2af9eb49c40d265495ad122a3a5b1f3 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 16 Jan 2022 17:16:04 +0100 Subject: [PATCH 477/570] Review formating --- src/raudio.c | 21 +++++++++++---------- src/raylib.h | 10 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index 57f4294f5..5abb1d05c 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -317,7 +317,7 @@ struct rAudioBuffer { float volume; // Audio buffer volume float pitch; // Audio buffer pitch - float pan; // Audio buffer pan (0 to 1) + float pan; // Audio buffer pan (0.0f to 1.0f) bool playing; // Audio buffer state: AUDIO_PLAYING bool paused; // Audio buffer state: AUDIO_PAUSED @@ -398,8 +398,8 @@ void StopAudioBuffer(AudioBuffer *buffer); void PauseAudioBuffer(AudioBuffer *buffer); void ResumeAudioBuffer(AudioBuffer *buffer); void SetAudioBufferVolume(AudioBuffer *buffer, float volume); -void SetAudioBufferPan(AudioBuffer *buffer, float pan); void SetAudioBufferPitch(AudioBuffer *buffer, float pitch); +void SetAudioBufferPan(AudioBuffer *buffer, float pan); void TrackAudioBuffer(AudioBuffer *buffer); void UntrackAudioBuffer(AudioBuffer *buffer); @@ -645,12 +645,6 @@ void SetAudioBufferVolume(AudioBuffer *buffer, float volume) if (buffer != NULL) buffer->volume = volume; } -// Set pan for an audio buffer -void SetAudioBufferPan(AudioBuffer *buffer, float pan) -{ - if (buffer != NULL) buffer->pan = pan; -} - // Set pitch for an audio buffer void SetAudioBufferPitch(AudioBuffer *buffer, float pitch) { @@ -667,6 +661,15 @@ void SetAudioBufferPitch(AudioBuffer *buffer, float pitch) } } +// Set pan for an audio buffer +void SetAudioBufferPan(AudioBuffer *buffer, float pan) +{ + if (pan < 0.0f) pan = 0.0f; + else if (pan > 1.0f) pan = 1.0f; + + if (buffer != NULL) buffer->pan = pan; +} + // Track audio buffer to linked list next position void TrackAudioBuffer(AudioBuffer *buffer) { @@ -2016,11 +2019,9 @@ void SetAudioStreamPitch(AudioStream stream, float pitch) // Set pan for audio stream void SetAudioStreamPan(AudioStream stream, float pan) { - if (pan < 0.0f) pan = 0.0f; else if (pan > 1.0f) pan = 1.0f; SetAudioBufferPan(stream.buffer, pan); } - // Default size for new audio streams void SetAudioStreamBufferSizeDefault(int size) { diff --git a/src/raylib.h b/src/raylib.h index 74df758b8..6c6baa7b7 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1498,12 +1498,12 @@ RLAPI void StopSoundMulti(void); // Stop an RLAPI int GetSoundsPlaying(void); // Get number of sounds playing in the multichannel RLAPI bool IsSoundPlaying(Sound sound); // Check if a sound is currently playing RLAPI void SetSoundVolume(Sound sound, float volume); // Set volume for a sound (1.0 is max level) -RLAPI void SetSoundPan(Sound sound, float pan); // Set pan for a sound (0.5 = center) RLAPI void SetSoundPitch(Sound sound, float pitch); // Set pitch for a sound (1.0 is base level) -RLAPI void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels); // Convert wave data to desired format +RLAPI void SetSoundPan(Sound sound, float pan); // Set pan for a sound (0.5 is center) RLAPI Wave WaveCopy(Wave wave); // Copy a wave to a new wave RLAPI void WaveCrop(Wave *wave, int initSample, int finalSample); // Crop a wave to defined samples range -RLAPI float *LoadWaveSamples(Wave wave); // Load samples data from wave as a floats array +RLAPI void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels); // Convert wave data to desired format +RLAPI float *LoadWaveSamples(Wave wave); // Load samples data from wave as a 32bit float data array RLAPI void UnloadWaveSamples(float *samples); // Unload samples data loaded with LoadWaveSamples() // Music management functions @@ -1518,8 +1518,8 @@ RLAPI void PauseMusicStream(Music music); // Pause m RLAPI void ResumeMusicStream(Music music); // Resume playing paused music RLAPI void SeekMusicStream(Music music, float position); // Seek music to a position (in seconds) RLAPI void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level) -RLAPI void SetMusicPan(Music music, float pan); // Set pan for a music (0.5 = center) RLAPI void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level) +RLAPI void SetMusicPan(Music music, float pan); // Set pan for a music (0.5 is center) RLAPI float GetMusicTimeLength(Music music); // Get music time length (in seconds) RLAPI float GetMusicTimePlayed(Music music); // Get current music time played (in seconds) @@ -1535,7 +1535,7 @@ RLAPI bool IsAudioStreamPlaying(AudioStream stream); // Check i RLAPI void StopAudioStream(AudioStream stream); // Stop audio stream RLAPI void SetAudioStreamVolume(AudioStream stream, float volume); // Set volume for audio stream (1.0 is max level) RLAPI void SetAudioStreamPitch(AudioStream stream, float pitch); // Set pitch for audio stream (1.0 is base level) -RLAPI void SetAudioStreamPan(AudioStream stream, float pan); // Set pan for audio stream (0.5 = centered) +RLAPI void SetAudioStreamPan(AudioStream stream, float pan); // Set pan for audio stream (0.5 is centered) RLAPI void SetAudioStreamBufferSizeDefault(int size); // Default size for new audio streams #if defined(__cplusplus) From 4b998cfd05bb75aa45d33a000c33f559521981a8 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sun, 16 Jan 2022 08:47:17 -0800 Subject: [PATCH 478/570] [Examples] Top down lights example (#2199) * Start 2d lights example. * finish example * update image. * Cleanup render textures * Fixes to handle shadows on edges that are near to the light better. * tabs * move to shapes Co-authored-by: Jeffery Myers --- examples/Makefile | 2 +- examples/shapes/shapes_top_down_lights.c | 380 +++++++++++++++++ examples/shapes/shapes_top_down_lights.png | Bin 0 -> 199203 bytes .../examples/shapes_top_down_lights.vcxproj | 387 ++++++++++++++++++ projects/VS2019/raylib.sln | 19 + 5 files changed, 787 insertions(+), 1 deletion(-) create mode 100644 examples/shapes/shapes_top_down_lights.c create mode 100644 examples/shapes/shapes_top_down_lights.png create mode 100644 projects/VS2019/examples/shapes_top_down_lights.vcxproj diff --git a/examples/Makefile b/examples/Makefile index ac1284f2f..3d48bd773 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -411,7 +411,7 @@ SHAPES = \ shapes/shapes_easings_rectangle_array \ shapes/shapes_draw_ring \ shapes/shapes_draw_circle_sector \ - shapes/shapes_draw_rectangle_rounded + shapes/Sshapes_top_down_lights TEXTURES = \ textures/textures_logo_raylib \ diff --git a/examples/shapes/shapes_top_down_lights.c b/examples/shapes/shapes_top_down_lights.c new file mode 100644 index 000000000..d8cd5e62f --- /dev/null +++ b/examples/shapes/shapes_top_down_lights.c @@ -0,0 +1,380 @@ +/******************************************************************************************* +* +* raylib [SHAPES] example - Top Down Lights +* +* Welcome to raylib! +* +* To test examples, just press F6 and execute raylib_compile_execute script +* Note that compiled executable is placed in the same folder as .c file +* +* You can find all basic examples on C:\raylib\raylib\examples folder or +* raylib official webpage: www.raylib.com +* +* Enjoy using raylib. :) +* +* This example has been created using raylib 4.0 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Copyright (c) 2022 Jeffery Myers +* +********************************************************************************************/ + +#include "raylib.h" +#include "raymath.h" +#include "rlgl.h" + +// Custom Blend Modes +#define RLGL_SRC_ALPHA 0x0302 +#define RLGL_MIN 0x8007 +#define RLGL_MAX 0x8008 + +#define MAX_BOXES 20 + +typedef struct +{ + Vector2 Vertecies[4]; +}ShadowGeometry; + +#define MAX_SHADOWS MAX_BOXES*3 // MAX_BOXES *3. Each box can cast up to two shadow volumes for the edges it is away from, and one for the box itself + +typedef struct +{ + // is this light slot active + bool Active; + + // does this light need to be updated + bool Dirty; + + // is this light in a valid position + bool Valid; + + // Light position + Vector2 Position; + + // alpha mask for the light + RenderTexture Mask; + + // the distance the light touches + float OuterRadius; + + // a cached rectangle of the light bounds to help with culling + Rectangle Bounds; + + ShadowGeometry Shadows[MAX_SHADOWS]; + int ShadowCount; +}LightInfo; + +#define MAX_LIGHTS 16 +LightInfo Lights[MAX_LIGHTS] = { 0 }; + +// move a light and mark it as dirty so that we update it's mask next frame +void MoveLight(int slot, float x, float y) +{ + Lights[slot].Dirty = true; + Lights[slot].Position.x = x; + Lights[slot].Position.y = y; + + // update the cached bounds + Lights[slot].Bounds.x = x - Lights[slot].OuterRadius; + Lights[slot].Bounds.y = y - Lights[slot].OuterRadius; +} + +// compute a shadow volume for the edge +// takes the edge and projects it back by the light radius and turns it into a quad +void ComputeShadowVolumeForEdge(int slot, Vector2 sp, Vector2 ep) +{ + if (Lights[slot].ShadowCount >= MAX_SHADOWS) + return; + + float extension = Lights[slot].OuterRadius*2; + + Vector2 spVector = Vector2Normalize(Vector2Subtract(sp, Lights[slot].Position)); + Vector2 spProjection = Vector2Add(sp, Vector2Scale(spVector, extension)); + + Vector2 epVector = Vector2Normalize(Vector2Subtract(ep, Lights[slot].Position)); + Vector2 epProjection = Vector2Add(ep, Vector2Scale(epVector, extension)); + + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[0] = sp; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[1] = ep; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[2] = epProjection; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[3] = spProjection; + + Lights[slot].ShadowCount++; +} + +// draw the light and shadows to the mask for a light +void UpdateLightMask(int slot) +{ + // use the light mask + BeginTextureMode(Lights[slot].Mask); + + ClearBackground(WHITE); + + // force the blend mode to only set the alpha of the destination + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); + rlSetBlendMode(BLEND_CUSTOM); + + // if we are valid, then draw the light radius to the alpha mask + if (Lights[slot].Valid) + DrawCircleGradient((int)Lights[slot].Position.x, (int)Lights[slot].Position.y, Lights[slot].OuterRadius, ColorAlpha(WHITE, 0), WHITE); + rlDrawRenderBatchActive(); + + // cut out the shadows from the light radius by forcing the alpha to maximum + rlSetBlendMode(BLEND_ALPHA); + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MAX); + rlSetBlendMode(BLEND_CUSTOM); + + // draw the shadows to the alpha mask + for (int i = 0; i < Lights[slot].ShadowCount; i++) + { + DrawTriangleFan(Lights[slot].Shadows[i].Vertecies, 4, WHITE); + } + + rlDrawRenderBatchActive(); + // go back to normal blend mode + rlSetBlendMode(BLEND_ALPHA); + + EndTextureMode(); +} + +// setup a light +void SetUpLight(int slot, float x, float y, float radius) +{ + Lights[slot].Active = true; + Lights[slot].Valid = false; // the light must prove it is valid + Lights[slot].Mask = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); + Lights[slot].OuterRadius = radius; + + Lights[slot].Bounds.width = radius * 2; + Lights[slot].Bounds.height = radius * 2; + + MoveLight(slot, x, y); + + // force the render texture to have something in it + UpdateLightMask(slot); +} + +// see if a light needs to update it's mask +bool UpdateLight(int slot, Rectangle* boxes, int count) +{ + if (!Lights[slot].Active || !Lights[slot].Dirty) + return false; + + Lights[slot].Dirty = false; + Lights[slot].ShadowCount = 0; + Lights[slot].Valid = false; + + for (int i = 0; i < count; i++) + { + // are we in a box, if so we are not valid + if (CheckCollisionPointRec(Lights[slot].Position, boxes[i])) + return false; + + // if this box is outside our bounds, we can skip it + if (!CheckCollisionRecs(Lights[slot].Bounds, boxes[i])) + continue; + + // check the edges that are on the same side we are, and cast shadow volumes out from them. + + // top + Vector2 sp = (Vector2){ boxes[i].x, boxes[i].y }; + Vector2 ep = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y }; + + if (Lights[slot].Position.y > ep.y) + ComputeShadowVolumeForEdge(slot, sp, ep); + + // right + sp = ep; + ep.y += boxes[i].height; + if (Lights[slot].Position.x < ep.x) + ComputeShadowVolumeForEdge(slot, sp, ep); + + // bottom + sp = ep; + ep.x -= boxes[i].width; + if (Lights[slot].Position.y < ep.y) + ComputeShadowVolumeForEdge(slot, sp, ep); + + // left + sp = ep; + ep.y -= boxes[i].height; + if (Lights[slot].Position.x > ep.x) + ComputeShadowVolumeForEdge(slot, sp, ep); + + // the box itself + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[0] = (Vector2){ boxes[i].x, boxes[i].y }; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[1] = (Vector2){ boxes[i].x, boxes[i].y + boxes[i].height }; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[2] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y + boxes[i].height }; + Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[3] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y }; + Lights[slot].ShadowCount++; + } + + Lights[slot].Valid = true; + + UpdateLightMask(slot); + + return true; +} + +// set up some boxes +void SetupBoxes(Rectangle* boxes, int *count) +{ + boxes[0] = (Rectangle){ 150,80, 40, 40 }; + boxes[1] = (Rectangle){ 1200, 700, 40, 40 }; + boxes[2] = (Rectangle){ 200, 600, 40, 40 }; + boxes[3] = (Rectangle){ 1000, 50, 40, 40 }; + boxes[4] = (Rectangle){ 500, 350, 40, 40 }; + + for (int i = 5; i < MAX_BOXES; i++) + { + boxes[i] = (Rectangle){(float)GetRandomValue(0,GetScreenWidth()), (float)GetRandomValue(0,GetScreenHeight()), (float)GetRandomValue(10,100), (float)GetRandomValue(10,100) }; + } + + *count = MAX_BOXES; +} + +int main(void) +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 1280; + const int screenHeight = 800; + InitWindow(screenWidth, screenHeight, "raylib [effects] example - top down lights"); + SetTargetFPS(60); // Set our game to run at 60 frames-per-second + + // initialize our 'world' of boxes + Rectangle boxes[MAX_BOXES]; + int boxCount = 0; + SetupBoxes(boxes, &boxCount); + + // create a checkerboard ground texture + Image img = GenImageChecked(64, 64, 32, 32, DARKBROWN, DARKGRAY); + Texture2D backgroundTexture = LoadTextureFromImage(img); + UnloadImage(img); + + // create a global light mask to hold all the blended lights + RenderTexture lightMask = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); + + // setup initial light + SetUpLight(0, 600, 400, 300); + int nextLight = 1; + + bool showLines = false; + + //-------------------------------------------------------------------------------------- + + // Main game loop + while (!WindowShouldClose()) // Detect window close button or ESC key + { + // Update + // drag light 0 + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) + MoveLight(0, GetMousePosition().x, GetMousePosition().y); + + // make a new light + if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT) && nextLight < MAX_LIGHTS) + { + SetUpLight(nextLight, GetMousePosition().x, GetMousePosition().y, 200); + nextLight++; + } + + // toggle debug info + if (IsKeyPressed(KEY_F1)) + showLines = !showLines; + + // update the lights and keep track if any were dirty so we know if we need to update the master light mask + bool dirtyLights = false; + for (int i = 0; i < MAX_LIGHTS; i++) + { + if (UpdateLight(i, boxes, boxCount)) + dirtyLights = true; + } + + // update the light mask + if (dirtyLights) + { + // build up the light mask + BeginTextureMode(lightMask); + ClearBackground(BLACK); + + // force the blend mode to only set the alpha of the destination + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); + rlSetBlendMode(BLEND_CUSTOM); + + // merge in all the light masks + for (int i = 0; i < MAX_LIGHTS; i++) + { + if (Lights[i].Active) + DrawTextureRec(Lights[i].Mask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), WHITE); + } + + rlDrawRenderBatchActive(); + + // go back to normal + rlSetBlendMode(BLEND_ALPHA); + EndTextureMode(); + } + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(BLACK); + + // draw the tile background + DrawTextureRec(backgroundTexture, (Rectangle){ 0,0,(float)GetScreenWidth(),(float)GetScreenHeight() }, Vector2Zero(), WHITE); + + // overlay the shadows from all the lights + DrawTextureRec(lightMask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), ColorAlpha(WHITE, showLines ? 0.75f : 1.0f)); + + // draw the lights + for (int i = 0; i < MAX_LIGHTS; i++) + { + if (Lights[i].Active) + DrawCircle((int)Lights[i].Position.x, (int)Lights[i].Position.y, 10, i == 0 ? YELLOW : WHITE); + } + + if (showLines) + { + for (int s = 0; s < Lights[0].ShadowCount; s++) + { + DrawTriangleFan(Lights[0].Shadows[s].Vertecies, 4, DARKPURPLE); + } + + for (int b = 0; b < boxCount; b++) + { + if (CheckCollisionRecs(boxes[b],Lights[0].Bounds)) + DrawRectangleRec(boxes[b], PURPLE); + + DrawRectangleLines((int)boxes[b].x, (int)boxes[b].y, (int)boxes[b].width, (int)boxes[b].height, DARKBLUE); + } + + DrawText("(F1) Hide Shadow Volumes", 0, 60, 20, GREEN); + } + else + { + DrawText("(F1) Show Shadow Volumes", 0, 60, 20, GREEN); + } + + DrawFPS(0, 0); + DrawText("Drag to move light #1", 0, 20, 20, DARKGREEN); + DrawText("Right click to add new light", 0, 40, 20, DARKGREEN); + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadTexture(backgroundTexture); + UnloadRenderTexture(lightMask); + for (int i = 0; i < MAX_LIGHTS; i++) + { + if (Lights[i].Active) + UnloadRenderTexture(Lights[i].Mask); + } + + CloseWindow(); // Close window and OpenGL context + //-------------------------------------------------------------------------------------- + + return 0; +} \ No newline at end of file diff --git a/examples/shapes/shapes_top_down_lights.png b/examples/shapes/shapes_top_down_lights.png new file mode 100644 index 0000000000000000000000000000000000000000..0eeac34a56243448f3aac56821d8d2d2fadcdbf8 GIT binary patch literal 199203 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

iKj03J5#Rd#@AKs+)caI7UhUm}?)b^a0r}H! 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 t>K(K8IM~l(2X;CZlRCk}LI9K^7 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≧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 literal 0 HcmV?d00001 diff --git a/projects/VS2019/examples/shapes_top_down_lights.vcxproj b/projects/VS2019/examples/shapes_top_down_lights.vcxproj new file mode 100644 index 000000000..65f4ea896 --- /dev/null +++ b/projects/VS2019/examples/shapes_top_down_lights.vcxproj @@ -0,0 +1,387 @@ + + + + + Debug.DLL + Win32 + + + Debug.DLL + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release.DLL + Win32 + + + Release.DLL + x64 + + + Release + Win32 + + + Release + x64 + + + + {67A9CF3B-A5E8-442E-A437-ED74A08CA312} + Win32Proj + shapes_top_down_lights + 10.0 + shapes_top_down_lights + + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + Application + false + $(DefaultPlatformToolset) + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\ + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + $(SolutionDir)..\..\examples\effects + WindowsLocalDebugger + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + /FS %(AdditionalOptions) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + Copy Debug DLL to output directory + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions) + CompileAsC + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + + + Console + true + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + Copy Debug DLL to output directory + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + + + Copy Release DLL to output directory + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP + $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories) + CompileAsC + true + + + Console + true + true + true + raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\ + + + xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)" + + + Copy Release DLL to output directory + + + + + + + + {e89d61ac-55de-4482-afd4-df7242ebc859} + + + + + + \ No newline at end of file diff --git a/projects/VS2019/raylib.sln b/projects/VS2019/raylib.sln index aa92a456c..82f5fff21 100644 --- a/projects/VS2019/raylib.sln +++ b/projects/VS2019/raylib.sln @@ -199,6 +199,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapes_easings_box_anim", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapes_easings_rectangle_array", "examples\shapes_easings_rectangle_array.vcxproj", "{1EDD4BCF-345C-4065-8CBD-7285224293C3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "top_down_lights", "examples\shapes_top_down_lights.vcxproj", "{67A9CF3B-A5E8-442E-A437-ED74A08CA312}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physics_demo", "examples\physics_demo.vcxproj", "{581F89BD-FBB9-4699-B8DB-EB38E6DEE097}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physics_friction", "examples\physics_friction.vcxproj", "{A6260ED4-5361-4B61-B6B9-8D8119457BA4}" @@ -1675,6 +1677,22 @@ Global {1EDD4BCF-345C-4065-8CBD-7285224293C3}.Release|x64.Build.0 = Release|x64 {1EDD4BCF-345C-4065-8CBD-7285224293C3}.Release|x86.ActiveCfg = Release|Win32 {1EDD4BCF-345C-4065-8CBD-7285224293C3}.Release|x86.Build.0 = Release|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug|x64.ActiveCfg = Debug|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug|x64.Build.0 = Debug|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug|x86.ActiveCfg = Debug|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Debug|x86.Build.0 = Debug|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release.DLL|x64.ActiveCfg = Release.DLL|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release.DLL|x64.Build.0 = Release.DLL|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release.DLL|x86.Build.0 = Release.DLL|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release|x64.ActiveCfg = Release|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release|x64.Build.0 = Release|x64 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release|x86.ActiveCfg = Release|Win32 + {67A9CF3B-A5E8-442E-A437-ED74A08CA312}.Release|x86.Build.0 = Release|Win32 {581F89BD-FBB9-4699-B8DB-EB38E6DEE097}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64 {581F89BD-FBB9-4699-B8DB-EB38E6DEE097}.Debug.DLL|x64.Build.0 = Debug.DLL|x64 {581F89BD-FBB9-4699-B8DB-EB38E6DEE097}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32 @@ -2238,6 +2256,7 @@ Global {1C49E35A-2838-49D9-9D5F-4B8134960EF6} = {278D8859-20B1-428F-8448-064F46E1F021} {F91142E2-A999-47F0-9E74-38C1E2930EBE} = {278D8859-20B1-428F-8448-064F46E1F021} {1EDD4BCF-345C-4065-8CBD-7285224293C3} = {278D8859-20B1-428F-8448-064F46E1F021} + {67A9CF3B-A5E8-442E-A437-ED74A08CA312} = {278D8859-20B1-428F-8448-064F46E1F021} {581F89BD-FBB9-4699-B8DB-EB38E6DEE097} = {D6B669E2-68D0-4E62-83D1-E14DDD6A356F} {A6260ED4-5361-4B61-B6B9-8D8119457BA4} = {D6B669E2-68D0-4E62-83D1-E14DDD6A356F} {29817904-E3D3-4C28-BD8D-A3A09DD199D2} = {D6B669E2-68D0-4E62-83D1-E14DDD6A356F} From 61d0c71b3cc93cbde72002ddc8f6f1223eb99c52 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 16 Jan 2022 18:07:11 +0100 Subject: [PATCH 479/570] REVIEWED: example: shapes_top_down_lights --- examples/Makefile | 2 +- examples/shapes/shapes_top_down_lights.c | 342 ++++++++++----------- examples/shapes/shapes_top_down_lights.png | Bin 199203 -> 73147 bytes 3 files changed, 157 insertions(+), 187 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 3d48bd773..50a12e5c1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -411,7 +411,7 @@ SHAPES = \ shapes/shapes_easings_rectangle_array \ shapes/shapes_draw_ring \ shapes/shapes_draw_circle_sector \ - shapes/Sshapes_top_down_lights + shapes/shapes_top_down_lights TEXTURES = \ textures/textures_logo_raylib \ diff --git a/examples/shapes/shapes_top_down_lights.c b/examples/shapes/shapes_top_down_lights.c index d8cd5e62f..5234c28c0 100644 --- a/examples/shapes/shapes_top_down_lights.c +++ b/examples/shapes/shapes_top_down_lights.c @@ -1,21 +1,13 @@ /******************************************************************************************* * -* raylib [SHAPES] example - Top Down Lights -* -* Welcome to raylib! -* -* To test examples, just press F6 and execute raylib_compile_execute script -* Note that compiled executable is placed in the same folder as .c file -* -* You can find all basic examples on C:\raylib\raylib\examples folder or -* raylib official webpage: www.raylib.com -* -* Enjoy using raylib. :) +* raylib [shapes] example - top down lights * * This example has been created using raylib 4.0 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2022 Jeffery Myers +* Example contributed by Vlad Adrian (@demizdor) and reviewed by Ramon Santamaria (@raysan5) +* +* Copyright (c) 2022 Jeffery Myers (@JeffM2501) * ********************************************************************************************/ @@ -28,196 +20,177 @@ #define RLGL_MIN 0x8007 #define RLGL_MAX 0x8008 -#define MAX_BOXES 20 +#define MAX_BOXES 20 +#define MAX_SHADOWS MAX_BOXES*3 // MAX_BOXES *3. Each box can cast up to two shadow volumes for the edges it is away from, and one for the box itself +#define MAX_LIGHTS 16 -typedef struct -{ - Vector2 Vertecies[4]; -}ShadowGeometry; +// Shadow geometry type +typedef struct ShadowGeometry { + Vector2 vertices[4]; +} ShadowGeometry; -#define MAX_SHADOWS MAX_BOXES*3 // MAX_BOXES *3. Each box can cast up to two shadow volumes for the edges it is away from, and one for the box itself +// Light info type +typedef struct LightInfo { + bool active; // Is this light slot active? + bool dirty; // Does this light need to be updated? + bool valid; // Is this light in a valid position? -typedef struct -{ - // is this light slot active - bool Active; + Vector2 position; // Light position + RenderTexture mask; // Alpha mask for the light + float outerRadius; // The distance the light touches + Rectangle bounds; // A cached rectangle of the light bounds to help with culling - // does this light need to be updated - bool Dirty; + ShadowGeometry shadows[MAX_SHADOWS]; + int shadowCount; +} LightInfo; - // is this light in a valid position - bool Valid; - // Light position - Vector2 Position; +LightInfo lights[MAX_LIGHTS] = { 0 }; - // alpha mask for the light - RenderTexture Mask; - - // the distance the light touches - float OuterRadius; - - // a cached rectangle of the light bounds to help with culling - Rectangle Bounds; - - ShadowGeometry Shadows[MAX_SHADOWS]; - int ShadowCount; -}LightInfo; - -#define MAX_LIGHTS 16 -LightInfo Lights[MAX_LIGHTS] = { 0 }; - -// move a light and mark it as dirty so that we update it's mask next frame +// Move a light and mark it as dirty so that we update it's mask next frame void MoveLight(int slot, float x, float y) { - Lights[slot].Dirty = true; - Lights[slot].Position.x = x; - Lights[slot].Position.y = y; + lights[slot].dirty = true; + lights[slot].position.x = x; + lights[slot].position.y = y; // update the cached bounds - Lights[slot].Bounds.x = x - Lights[slot].OuterRadius; - Lights[slot].Bounds.y = y - Lights[slot].OuterRadius; + lights[slot].bounds.x = x - lights[slot].outerRadius; + lights[slot].bounds.y = y - lights[slot].outerRadius; } -// compute a shadow volume for the edge -// takes the edge and projects it back by the light radius and turns it into a quad +// Compute a shadow volume for the edge +// It takes the edge and projects it back by the light radius and turns it into a quad void ComputeShadowVolumeForEdge(int slot, Vector2 sp, Vector2 ep) { - if (Lights[slot].ShadowCount >= MAX_SHADOWS) - return; + if (lights[slot].shadowCount >= MAX_SHADOWS) return; - float extension = Lights[slot].OuterRadius*2; + float extension = lights[slot].outerRadius*2; - Vector2 spVector = Vector2Normalize(Vector2Subtract(sp, Lights[slot].Position)); + Vector2 spVector = Vector2Normalize(Vector2Subtract(sp, lights[slot].position)); Vector2 spProjection = Vector2Add(sp, Vector2Scale(spVector, extension)); - Vector2 epVector = Vector2Normalize(Vector2Subtract(ep, Lights[slot].Position)); + Vector2 epVector = Vector2Normalize(Vector2Subtract(ep, lights[slot].position)); Vector2 epProjection = Vector2Add(ep, Vector2Scale(epVector, extension)); - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[0] = sp; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[1] = ep; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[2] = epProjection; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[3] = spProjection; + lights[slot].shadows[lights[slot].shadowCount].vertices[0] = sp; + lights[slot].shadows[lights[slot].shadowCount].vertices[1] = ep; + lights[slot].shadows[lights[slot].shadowCount].vertices[2] = epProjection; + lights[slot].shadows[lights[slot].shadowCount].vertices[3] = spProjection; - Lights[slot].ShadowCount++; + lights[slot].shadowCount++; } -// draw the light and shadows to the mask for a light -void UpdateLightMask(int slot) +// Draw the light and shadows to the mask for a light +void DrawLightMask(int slot) { - // use the light mask - BeginTextureMode(Lights[slot].Mask); + // Use the light mask + BeginTextureMode(lights[slot].mask); - ClearBackground(WHITE); + ClearBackground(WHITE); - // force the blend mode to only set the alpha of the destination - rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); - rlSetBlendMode(BLEND_CUSTOM); + // Force the blend mode to only set the alpha of the destination + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); + rlSetBlendMode(BLEND_CUSTOM); - // if we are valid, then draw the light radius to the alpha mask - if (Lights[slot].Valid) - DrawCircleGradient((int)Lights[slot].Position.x, (int)Lights[slot].Position.y, Lights[slot].OuterRadius, ColorAlpha(WHITE, 0), WHITE); - rlDrawRenderBatchActive(); + // If we are valid, then draw the light radius to the alpha mask + if (lights[slot].valid) DrawCircleGradient((int)lights[slot].position.x, (int)lights[slot].position.y, lights[slot].outerRadius, ColorAlpha(WHITE, 0), WHITE); + + rlDrawRenderBatchActive(); - // cut out the shadows from the light radius by forcing the alpha to maximum - rlSetBlendMode(BLEND_ALPHA); - rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MAX); - rlSetBlendMode(BLEND_CUSTOM); + // Cut out the shadows from the light radius by forcing the alpha to maximum + rlSetBlendMode(BLEND_ALPHA); + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MAX); + rlSetBlendMode(BLEND_CUSTOM); - // draw the shadows to the alpha mask - for (int i = 0; i < Lights[slot].ShadowCount; i++) - { - DrawTriangleFan(Lights[slot].Shadows[i].Vertecies, 4, WHITE); - } + // Draw the shadows to the alpha mask + for (int i = 0; i < lights[slot].shadowCount; i++) + { + DrawTriangleFan(lights[slot].shadows[i].vertices, 4, WHITE); + } - rlDrawRenderBatchActive(); - // go back to normal blend mode - rlSetBlendMode(BLEND_ALPHA); + rlDrawRenderBatchActive(); + + // Go back to normal blend mode + rlSetBlendMode(BLEND_ALPHA); EndTextureMode(); } -// setup a light -void SetUpLight(int slot, float x, float y, float radius) +// Setup a light +void SetupLight(int slot, float x, float y, float radius) { - Lights[slot].Active = true; - Lights[slot].Valid = false; // the light must prove it is valid - Lights[slot].Mask = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); - Lights[slot].OuterRadius = radius; + lights[slot].active = true; + lights[slot].valid = false; // The light must prove it is valid + lights[slot].mask = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); + lights[slot].outerRadius = radius; - Lights[slot].Bounds.width = radius * 2; - Lights[slot].Bounds.height = radius * 2; + lights[slot].bounds.width = radius * 2; + lights[slot].bounds.height = radius * 2; MoveLight(slot, x, y); - // force the render texture to have something in it - UpdateLightMask(slot); + // Force the render texture to have something in it + DrawLightMask(slot); } -// see if a light needs to update it's mask +// See if a light needs to update it's mask bool UpdateLight(int slot, Rectangle* boxes, int count) { - if (!Lights[slot].Active || !Lights[slot].Dirty) - return false; + if (!lights[slot].active || !lights[slot].dirty) return false; - Lights[slot].Dirty = false; - Lights[slot].ShadowCount = 0; - Lights[slot].Valid = false; + lights[slot].dirty = false; + lights[slot].shadowCount = 0; + lights[slot].valid = false; for (int i = 0; i < count; i++) { - // are we in a box, if so we are not valid - if (CheckCollisionPointRec(Lights[slot].Position, boxes[i])) - return false; + // Are we in a box? if so we are not valid + if (CheckCollisionPointRec(lights[slot].position, boxes[i])) return false; - // if this box is outside our bounds, we can skip it - if (!CheckCollisionRecs(Lights[slot].Bounds, boxes[i])) - continue; + // If this box is outside our bounds, we can skip it + if (!CheckCollisionRecs(lights[slot].bounds, boxes[i])) continue; - // check the edges that are on the same side we are, and cast shadow volumes out from them. + // Check the edges that are on the same side we are, and cast shadow volumes out from them - // top + // Top Vector2 sp = (Vector2){ boxes[i].x, boxes[i].y }; Vector2 ep = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y }; - if (Lights[slot].Position.y > ep.y) - ComputeShadowVolumeForEdge(slot, sp, ep); + if (lights[slot].position.y > ep.y) ComputeShadowVolumeForEdge(slot, sp, ep); - // right + // Right sp = ep; ep.y += boxes[i].height; - if (Lights[slot].Position.x < ep.x) - ComputeShadowVolumeForEdge(slot, sp, ep); + if (lights[slot].position.x < ep.x) ComputeShadowVolumeForEdge(slot, sp, ep); - // bottom + // Bottom sp = ep; ep.x -= boxes[i].width; - if (Lights[slot].Position.y < ep.y) - ComputeShadowVolumeForEdge(slot, sp, ep); + if (lights[slot].position.y < ep.y) ComputeShadowVolumeForEdge(slot, sp, ep); - // left + // Left sp = ep; ep.y -= boxes[i].height; - if (Lights[slot].Position.x > ep.x) - ComputeShadowVolumeForEdge(slot, sp, ep); + if (lights[slot].position.x > ep.x) ComputeShadowVolumeForEdge(slot, sp, ep); - // the box itself - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[0] = (Vector2){ boxes[i].x, boxes[i].y }; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[1] = (Vector2){ boxes[i].x, boxes[i].y + boxes[i].height }; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[2] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y + boxes[i].height }; - Lights[slot].Shadows[Lights[slot].ShadowCount].Vertecies[3] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y }; - Lights[slot].ShadowCount++; + // The box itself + lights[slot].shadows[lights[slot].shadowCount].vertices[0] = (Vector2){ boxes[i].x, boxes[i].y }; + lights[slot].shadows[lights[slot].shadowCount].vertices[1] = (Vector2){ boxes[i].x, boxes[i].y + boxes[i].height }; + lights[slot].shadows[lights[slot].shadowCount].vertices[2] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y + boxes[i].height }; + lights[slot].shadows[lights[slot].shadowCount].vertices[3] = (Vector2){ boxes[i].x + boxes[i].width, boxes[i].y }; + lights[slot].shadowCount++; } - Lights[slot].Valid = true; + lights[slot].valid = true; - UpdateLightMask(slot); + DrawLightMask(slot); return true; } -// set up some boxes -void SetupBoxes(Rectangle* boxes, int *count) +// Set up some boxes +void SetupBoxes(Rectangle *boxes, int *count) { boxes[0] = (Rectangle){ 150,80, 40, 40 }; boxes[1] = (Rectangle){ 1200, 700, 40, 40 }; @@ -237,83 +210,83 @@ int main(void) { // Initialization //-------------------------------------------------------------------------------------- - const int screenWidth = 1280; - const int screenHeight = 800; - InitWindow(screenWidth, screenHeight, "raylib [effects] example - top down lights"); - SetTargetFPS(60); // Set our game to run at 60 frames-per-second + const int screenWidth = 800; + const int screenHeight = 450; + + InitWindow(screenWidth, screenHeight, "raylib [shapes] example - top down lights"); - // initialize our 'world' of boxes - Rectangle boxes[MAX_BOXES]; + // Initialize our 'world' of boxes int boxCount = 0; + Rectangle boxes[MAX_BOXES] = { 0 }; SetupBoxes(boxes, &boxCount); - // create a checkerboard ground texture + // Create a checkerboard ground texture Image img = GenImageChecked(64, 64, 32, 32, DARKBROWN, DARKGRAY); Texture2D backgroundTexture = LoadTextureFromImage(img); UnloadImage(img); - // create a global light mask to hold all the blended lights + // Create a global light mask to hold all the blended lights RenderTexture lightMask = LoadRenderTexture(GetScreenWidth(), GetScreenHeight()); - // setup initial light - SetUpLight(0, 600, 400, 300); + // Setup initial light + SetupLight(0, 600, 400, 300); int nextLight = 1; bool showLines = false; + 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 - // drag light 0 - if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) - MoveLight(0, GetMousePosition().x, GetMousePosition().y); + //---------------------------------------------------------------------------------- + // Drag light 0 + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) MoveLight(0, GetMousePosition().x, GetMousePosition().y); - // make a new light - if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT) && nextLight < MAX_LIGHTS) + // Make a new light + if (IsMouseButtonPressed(MOUSE_BUTTON_RIGHT) && (nextLight < MAX_LIGHTS)) { - SetUpLight(nextLight, GetMousePosition().x, GetMousePosition().y, 200); + SetupLight(nextLight, GetMousePosition().x, GetMousePosition().y, 200); nextLight++; } - // toggle debug info - if (IsKeyPressed(KEY_F1)) - showLines = !showLines; + // Toggle debug info + if (IsKeyPressed(KEY_F1)) showLines = !showLines; - // update the lights and keep track if any were dirty so we know if we need to update the master light mask + // Update the lights and keep track if any were dirty so we know if we need to update the master light mask bool dirtyLights = false; for (int i = 0; i < MAX_LIGHTS; i++) { - if (UpdateLight(i, boxes, boxCount)) - dirtyLights = true; + if (UpdateLight(i, boxes, boxCount)) dirtyLights = true; } - // update the light mask + // Update the light mask if (dirtyLights) { - // build up the light mask + // Build up the light mask BeginTextureMode(lightMask); - ClearBackground(BLACK); + + ClearBackground(BLACK); - // force the blend mode to only set the alpha of the destination - rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); - rlSetBlendMode(BLEND_CUSTOM); + // Force the blend mode to only set the alpha of the destination + rlSetBlendFactors(RLGL_SRC_ALPHA, RLGL_SRC_ALPHA, RLGL_MIN); + rlSetBlendMode(BLEND_CUSTOM); - // merge in all the light masks - for (int i = 0; i < MAX_LIGHTS; i++) - { - if (Lights[i].Active) - DrawTextureRec(Lights[i].Mask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), WHITE); - } + // Merge in all the light masks + for (int i = 0; i < MAX_LIGHTS; i++) + { + if (lights[i].active) DrawTextureRec(lights[i].mask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), WHITE); + } - rlDrawRenderBatchActive(); + rlDrawRenderBatchActive(); - // go back to normal - rlSetBlendMode(BLEND_ALPHA); + // Go back to normal blend + rlSetBlendMode(BLEND_ALPHA); EndTextureMode(); } + //---------------------------------------------------------------------------------- // Draw //---------------------------------------------------------------------------------- @@ -321,44 +294,42 @@ int main(void) ClearBackground(BLACK); - // draw the tile background - DrawTextureRec(backgroundTexture, (Rectangle){ 0,0,(float)GetScreenWidth(),(float)GetScreenHeight() }, Vector2Zero(), WHITE); + // Draw the tile background + DrawTextureRec(backgroundTexture, (Rectangle){ 0, 0, (float)GetScreenWidth(), (float)GetScreenHeight() }, Vector2Zero(), WHITE); - // overlay the shadows from all the lights - DrawTextureRec(lightMask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), ColorAlpha(WHITE, showLines ? 0.75f : 1.0f)); + // Overlay the shadows from all the lights + DrawTextureRec(lightMask.texture, (Rectangle){ 0, 0, (float)GetScreenWidth(), -(float)GetScreenHeight() }, Vector2Zero(), ColorAlpha(WHITE, showLines? 0.75f : 1.0f)); - // draw the lights + // Draw the lights for (int i = 0; i < MAX_LIGHTS; i++) { - if (Lights[i].Active) - DrawCircle((int)Lights[i].Position.x, (int)Lights[i].Position.y, 10, i == 0 ? YELLOW : WHITE); + if (lights[i].active) DrawCircle((int)lights[i].position.x, (int)lights[i].position.y, 10, (i == 0)? YELLOW : WHITE); } if (showLines) { - for (int s = 0; s < Lights[0].ShadowCount; s++) + for (int s = 0; s < lights[0].shadowCount; s++) { - DrawTriangleFan(Lights[0].Shadows[s].Vertecies, 4, DARKPURPLE); + DrawTriangleFan(lights[0].shadows[s].vertices, 4, DARKPURPLE); } for (int b = 0; b < boxCount; b++) { - if (CheckCollisionRecs(boxes[b],Lights[0].Bounds)) - DrawRectangleRec(boxes[b], PURPLE); + if (CheckCollisionRecs(boxes[b],lights[0].bounds)) DrawRectangleRec(boxes[b], PURPLE); DrawRectangleLines((int)boxes[b].x, (int)boxes[b].y, (int)boxes[b].width, (int)boxes[b].height, DARKBLUE); } - DrawText("(F1) Hide Shadow Volumes", 0, 60, 20, GREEN); + DrawText("(F1) Hide Shadow Volumes", 10, 50, 10, GREEN); } else { - DrawText("(F1) Show Shadow Volumes", 0, 60, 20, GREEN); + DrawText("(F1) Show Shadow Volumes", 10, 50, 10, GREEN); } - DrawFPS(0, 0); - DrawText("Drag to move light #1", 0, 20, 20, DARKGREEN); - DrawText("Right click to add new light", 0, 40, 20, DARKGREEN); + DrawFPS(screenWidth - 80, 10); + DrawText("Drag to move light #1", 10, 10, 10, DARKGREEN); + DrawText("Right click to add new light", 10, 30, 10, DARKGREEN); EndDrawing(); //---------------------------------------------------------------------------------- } @@ -369,8 +340,7 @@ int main(void) UnloadRenderTexture(lightMask); for (int i = 0; i < MAX_LIGHTS; i++) { - if (Lights[i].Active) - UnloadRenderTexture(Lights[i].Mask); + if (lights[i].active) UnloadRenderTexture(lights[i].mask); } CloseWindow(); // Close window and OpenGL context diff --git a/examples/shapes/shapes_top_down_lights.png b/examples/shapes/shapes_top_down_lights.png index 0eeac34a56243448f3aac56821d8d2d2fadcdbf8..e14bb54947146c32c5ee96afa31e1d7c70b47c01 100644 GIT binary patch literal 73147 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%11EXw{r;B4qMO<=9Lc)*p z23&5=2_`IHB14ENXN}H|v#BXerwxsaF6n%kc=q4N$Hy~t`r8gtY&6Ty-8tb$JJ_33p}`IE=DqU^0^5_f1RKt(Y0u&?Fm%*= zbY$z7ERc?EARTRB9i=cG%(hhuPi`CDIw|41=&&UVN2$q#%l}{4O}x0rK#J+GGRusP zZ*D93n3=7Xl}a?ck=AjjPXGU<-29y5t>yNCE^wkA>zuBI}V>aW(o>dHdGwr{)swbKsW$`=~KK{&O#?1|GwtBlS ze4X@I?MWZ=nqt>AwI{v_FBZQWQ}X}et0M;v@kjp6P@j+}($jX}0Uu+Iw1b3%$6J-2 zGA*~uKMOb*(_Y-;XUjM~`+}Ung!vm+DlS`WG%E?5kl4~W0`mDewz(N>lN64ySYZCG zu$5o2_+#%6W%FwjuL@?Hugp98j6J4IP}y!)HdsrWBZq^vd`7K6(sLU(YuUv!6Lz#S zY&4czP;lU?AjofL)tSYZHq2yAl5Oy|U1=<3@Y`eS{D|5ecbwPNW;}Gh?fc?zs^x_j zo0eUilnY8I4R-__US$egez~Buy}7-;{o(29`innWN-;4DF`YScVC`~?chV|pn=RKZ z4PU%jaWQ9=2}@fT$Ay0)Izj2uY+8RVqoi&!H0=MVFH-MY@9gN2S7Mf8;tvWle#T2y3Ol~(KKQJ@?k00m zy66Voxr<8Nn5Ne~@#EMuzvHXNW`aXU$DDy%V)!=b3JVbCh#%_S@AEH?Y-Dy zcg4A(RkG-V+M53#=X3B+ynOS3skhOrCUB6k`ExX|E3@6PR9-4*dn;1n?C-^j29KN? zx|?|~pWl$H=(EP+aPu_TzKg06izN#coEWY#Hr_tl@n6X)C+~>qZpT$WGPopo8M~Yl zR?KN?-Iv~cZ+ZGdju(wPJ0@I`>{&P|->u8u{q#mqA;S1avEi$LPKaYxxrJN0kDKt* z1TID~u{1WeDVqE&?Nk0r|M=F>lNTWG`+2dVL5WjBf|WvZra!ChOt0UYKZnnaLJ(Rrs|))ZC`lJo}B`1S}69GMaS-91LJ0L!7CHr$CnX*6Dg)S*aaS9|3O1Ru<%>J>p#I1ZVX}#N6EJz>oL`5}cwGpKDz$J+cW|3*qwCC2`HgwG zt;;=Tr+2dQF0ZBEw)CX6T@+YQ&CzqNp+{{O$V8C8GC35i`yb9GOt^JZq124! z`5B%!PdYB%oN$rHLW;?Rn^A3%uin+fgad7kYz;>~O15~D z-5V6tD;0JpD?G|K3GQz@z`@U$BdolDO~gn|z2m~!14re38x|`%bPF&n&At-rpP?xm z%6Nx!LrK>=wV$BlavE-o|Gq}ijcL^elU^9@knCAJ(MpQx3oj!dAK#AF zmPzsz%s>9`*AOp!5cRI*vx)YM-2a9WJPN-zax{znOK&(~z~uk1Y4gP^qB2FYJDt#q!u#_?dmu8+ShL8C5wCoA0eu zI#xHqa>tcGtH+LAJ2zN3@OjtNsjB`t(Yya*3^=DS@H2jy7#YK>x9At2OPPU$Zae9WBNXQ5`{5&>ZvXBCPX>$7UldZ+$lSK zzvH75iLO~Q7PK>4{_1>Lk-(iFb>x1=IvL(ZK^dl&Y0V8yZFBh8*YzFENRsAlY~*0{ z^Yh!WbxDbfz$^tFw+w!ky~<7JeSYMyt2HxD+y8H|L4Y$yygJJgp}n7-r~P-E{1ogG zFOCV@S-S5Wd+Wev_v;MX*1JwV&vPtpSk7t$7g{UCm@2I0B2?V1WfynmYqT;vY_q!b zh5bzO1wWQO`i;*L-E1~1e(+=SIA0&Kx$tb;fwf1A=jcCvk#i#Bm^3frs&N+rSpe(I9PlLT^!ddvl?QV^14HsZ&FDH+PP} zy1#-utdu(Z*rME7PN|lfu^biI@o+_~q)4L9J@s@?u@f^c?p0j8Gt-2{gPZZw_l5_r zS|(TtH)O9A+GPLXt^JE*8x7@_$;ZwMc+NSyy5p;`Ug?r9Vd?fChgehC6w8xe_gqx^ z=T-~}2Igx^BQoYPbfsCiS&J-QnbY9hF!72vV`HY+*2#^xA{*YSxC^)bp0whofKK-M z3%jf(7Pf6Z>~c)!WX2+JBlmzD(~eK3rH8UtoSoFOOz4V$MDPBKB8E~-BJB+g4Gek4 z|NbeRud$iS8}v)@y?t+wxqHC`~REyV%x^|%(?6wLepodry4f+ z9sKoQKA+)%O(S>vzKb&_T$C}DVmi{wP^zz_Qu?LFWExvIN6)eQ8C^2GjRz%}BC14N ztfdwQD=j`b^P6Hrwir{2@j^+#9j_O7iW*8cnYlL}S^6u7qwlY*!S;z((oS3Ey9+J^I2TCU6#nBe@dDuKt%?bIFqtAFc3?F;eVHinam2aKfB zprxOI6w?-7#x=j~FRWcs*xp=N;*?@C)A)k=+{v3HWs^mwoVY3QO6GdElw6O?nYM(z z{Vd1tO}Kb-!bKf(DW)CH4Vfkd-~lSrBhQ}XA9 z8#a8%xYFOo5UF_J@ZsiQd5yD=y}xr*dUUy;V&X7Ploi~;5%uf%1ou)tz26U)HGJkt zo2PW|?TmZJGoNR?uQ!?A+s5Dq?q3KW1?7+f85}$T917(Y3ciXyf;oQ9?+SX{?qzWB zgm4JljyQf(((xTHgKgtQ*#oyY9fMfU>P1)^D12^^WSxEY#H*8UO(v}BFWe$*G%L{E znL(AsZF)klS_iCV3FcT}?xf&-QIhkP-K{c7-$l)uEEm%4J0i1Me0epVD!=1yDLtsT zlWAW(^EFP#o6=0zIyrG-tO9dp+n z6g$_$;>J*LGFdoXM%Gv2?3u-i41A3jB_~{Lfpn>)n3!dlwq#A7aJxXtS75PXgEmV= zW#z-5AAWlenOZYk>ai1Mcx^DjPMYaDXQ8l=_>m)JL1L<#6`%YNpIzH>$6(ekH|GSE zmIE(%PGnfgLsK0i2jhtj9cJdGbNO$a&@-ztNpg2?n5O8E5yp7!rb3xogV<)p8-MtV z`Srd}*6Pb)zgQ6Kv+5a|IS8O{nUSW8r>d1`5b`IVs;C6iKgqWN^6iT}zMJ!HWVC2O*XAKWMUb zI4q!W#Xvd5RM$#ogPY{z7aDIeZY?k3c;NkBqR66(y&%zqE$r!pd+f~0cjS9k*d3a1 z{9R(rT;3R2u9~0eps3&K=FCvfG2t3xWzvBI42PDqXjxXdCBxcEZW$aCZa-`&*J^m^ z)?qtqhnsW56@dqjA15m;HTGShe2Bqs`HyP$59?T@ng#EEjIdVpShYZsDVv?`q)yVE zoKI2Nsrp2yI;%>a$@|@ZS8>TI_T3EKks8k&p8oG&1`1GoG?ixFPlG35&wI zV^$}0VovW%`JltDoF*x>vMee4&fz~^+U7!B-jYhwjyyDC-f7$-BX;CR>XsSc7*nuf z@yL9V{8mTcB6p%pZ~sMs14JR)q*R$)@2d&<0IqNsLD3+LT+g;+I<7>X-8TqLutU{7ZCpOEU zh+1(~kg?QoL#dNP*+diRPx6bJ87+jHwhA*%ar=@k5G#=*%T!Z$c0^ETLTJs!E8XfW8gDZMWIndv>Rm6)6!dBSg&dAO{)~wUIwzSVn@Y`C zHpz2eU&Frf(UCGAi3k5uTk`AVL0yM~6Q!7#?=vcvr!`*iu(d1BOjWPaT6Cn>VDpBv zEeD=_n92XzWWuZP9AnuhZPzn)f}6Mp8n#d5e{YiTO)lf=ONrh|7X=j5SXfwC9-QiU z+tFZ>Fq`*)8lR!e#XoIdTQ|zuxn8{~kg#5U@5S>Tt-Q}uN}U|4!#C_;moZyxthiXR zbVfVFwR7fv_J^ewE$KNjd2zbQ&E7W1Xq*8jV_;z59J@x@!`wj*Yx&qUg%x|XFr zTl2HXWN&X9gBOQFxxwGd`tfP|6eZ
`f>*EM4`cUnVux;`U!GjO?{FgZP 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 T*W|^(z`)??>gTe~DWM4f`)0I) literal 199203 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≧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 From bec27a6ebc05e3ff59f69a19ccf8ed268aa5fdd1 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Mon, 17 Jan 2022 09:05:48 -0800 Subject: [PATCH 480/570] [CORE] Fixes for GetApplicationDirectory on 32 bit windows builds (#2290) * Fix a signature error with the windows calls in GetApplicationDirectory for 32 bit builds. * break is better than loop var to -1 --- src/rcore.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index 8e93709ba..deaf32da9 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -166,9 +166,9 @@ #ifndef MAX_PATH #define MAX_PATH 1025 #endif - unsigned int GetModuleFileNameA( void* hModule, const char* lpFilename, unsigned int nSize); - unsigned int GetModuleFileNameW( void* hModule, const unsigned short* lpFilename, unsigned int nSize); - int WideCharToMultiByte(unsigned int cp, unsigned long flags, const unsigned short *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default); + __declspec(dllimport) unsigned long __stdcall GetModuleFileNameA(void* hModule, void* lpFilename, unsigned long nSize); + __declspec(dllimport) unsigned long __stdcall GetModuleFileNameW(void* hModule, void* lpFilename, unsigned long nSize); + __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, void* widestr, int cchwide, void* str, int cbmb, void* defchar, int* used_default); #elif defined(__linux__) #include #elif defined(__APPLE__) @@ -3006,7 +3006,7 @@ const char *GetApplicationDirectory(void) if (appDir[i] == '\\') { appDir[i + 1] = '\0'; - i = -1; + break; } } } @@ -3027,7 +3027,7 @@ const char *GetApplicationDirectory(void) if (appDir[i] == '/') { appDir[i + 1] = '\0'; - i = -1; + break; } } } @@ -3047,7 +3047,7 @@ const char *GetApplicationDirectory(void) if (appDir[i] == '/') { appDir[i + 1] = '\0'; - i = -1; + break; } } } From 3c359ff4bcecfc02d415448fcdd137154645823a Mon Sep 17 00:00:00 2001 From: Laurentino Luna <81370009+catmanl@users.noreply.github.com> Date: Tue, 18 Jan 2022 14:30:19 -0300 Subject: [PATCH 481/570] Review code conventions for specific defines for GetApplicationDirectory() (#2293) Unless these imports require to have this format, the code has been adjusted to the conventions --- src/rcore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index deaf32da9..eed636675 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -166,9 +166,9 @@ #ifndef MAX_PATH #define MAX_PATH 1025 #endif - __declspec(dllimport) unsigned long __stdcall GetModuleFileNameA(void* hModule, void* lpFilename, unsigned long nSize); - __declspec(dllimport) unsigned long __stdcall GetModuleFileNameW(void* hModule, void* lpFilename, unsigned long nSize); - __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, void* widestr, int cchwide, void* str, int cbmb, void* defchar, int* used_default); + __declspec(dllimport) unsigned long __stdcall GetModuleFileNameA(void *hModule, void *lpFilename, unsigned long nSize); + __declspec(dllimport) unsigned long __stdcall GetModuleFileNameW(void *hModule, void *lpFilename, unsigned long nSize); + __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, void *widestr, int cchwide, void *str, int cbmb, void *defchar, int *used_default); #elif defined(__linux__) #include #elif defined(__APPLE__) From dfac74ffa7f2f24516ec18a3fa6345a2d238f247 Mon Sep 17 00:00:00 2001 From: Philip Shenk Date: Fri, 21 Jan 2022 02:53:25 -0500 Subject: [PATCH 482/570] updated VSCode project to work with latest raylib makefile and 'working for web' instructions (#2296) --- projects/VSCode/Makefile | 15 +++--- projects/VSCode/main.c | 85 ++++++++++++++++++++----------- projects/VSCode/resources/LICENSE | 1 + 3 files changed, 64 insertions(+), 37 deletions(-) create mode 100644 projects/VSCode/resources/LICENSE diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile index d89a80ffe..9907c036d 100644 --- a/projects/VSCode/Makefile +++ b/projects/VSCode/Makefile @@ -117,13 +117,12 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables - EMSDK_PATH ?= C:/emsdk - EMSCRIPTEN_VERSION ?= 1.38.31 - CLANG_VERSION = e$(EMSCRIPTEN_VERSION)_64bit - PYTHON_VERSION = 2.7.13.1_64bit\python-2.7.13.amd64 - NODE_VERSION = 8.9.1_64bit - export PATH = $(EMSDK_PATH);$(EMSDK_PATH)\clang\$(CLANG_VERSION);$(EMSDK_PATH)\node\$(NODE_VERSION)\bin;$(EMSDK_PATH)\python\$(PYTHON_VERSION);$(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION);C:\raylib\MinGW\bin:$$(PATH) - EMSCRIPTEN = $(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION) + EMSDK_PATH ?= C:/emsdk + EMSCRIPTEN_PATH ?= $(EMSDK_PATH)/upstream/emscripten + CLANG_PATH = $(EMSDK_PATH)/upstream/bin + PYTHON_PATH = $(EMSDK_PATH)/python/3.9.2-1_64bit + NODE_PATH = $(EMSDK_PATH)/node/14.18.2_64bit/bin + export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH):$$(PATH) endif # Define raylib release directory for compiled library. @@ -344,7 +343,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) endif ifeq ($(PLATFORM),PLATFORM_WEB) # Libraries for web (HTML5) compiling - LDLIBS = $(RAYLIB_RELEASE_PATH)/libraylib.bc + LDLIBS = $(RAYLIB_RELEASE_PATH)/libraylib.a endif # Define a recursive wildcard function diff --git a/projects/VSCode/main.c b/projects/VSCode/main.c index 835b4b08f..2d7b121f9 100644 --- a/projects/VSCode/main.c +++ b/projects/VSCode/main.c @@ -15,12 +15,30 @@ * 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-2020 Ramon Santamaria (@raysan5) +* Copyright (c) 2013-2022 Ramon Santamaria (@raysan5) * ********************************************************************************************/ #include "raylib.h" +#if defined(PLATFORM_WEB) + #include +#endif + +//---------------------------------------------------------------------------------- +// Local Variables Definition (local to this module) +//---------------------------------------------------------------------------------- +Camera camera = { 0 }; +Vector3 cubePosition = { 0 }; + +//---------------------------------------------------------------------------------- +// Local Functions Declaration +//---------------------------------------------------------------------------------- +static void UpdateDrawFrame(void); // Update and draw one frame + +//---------------------------------------------------------------------------------- +// Main entry point +//---------------------------------------------------------------------------------- int main() { // Initialization @@ -30,7 +48,6 @@ int main() InitWindow(screenWidth, screenHeight, "raylib"); - Camera camera = { 0 }; camera.position = (Vector3){ 10.0f, 10.0f, 8.0f }; camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; @@ -39,45 +56,55 @@ int main() SetCameraMode(camera, CAMERA_ORBITAL); - Vector3 cubePosition = { 0 }; + //-------------------------------------------------------------------------------------- +#if defined(PLATFORM_WEB) + emscripten_set_main_loop(UpdateDrawFrame, 60, 1); +#else 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 - //---------------------------------------------------------------------------------- - UpdateCamera(&camera); - //---------------------------------------------------------------------------------- - - // Draw - //---------------------------------------------------------------------------------- - BeginDrawing(); - - ClearBackground(RAYWHITE); - - BeginMode3D(camera); - - DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED); - DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON); - DrawGrid(10, 1.0f); - - EndMode3D(); - - DrawText("This is a raylib example", 10, 40, 20, DARKGRAY); - - DrawFPS(10, 10); - - EndDrawing(); - //---------------------------------------------------------------------------------- + UpdateDrawFrame(); } +#endif // De-Initialization //-------------------------------------------------------------------------------------- - CloseWindow(); // Close window and OpenGL context + CloseWindow(); // Close window and OpenGL context //-------------------------------------------------------------------------------------- return 0; +} + +// Update and draw game frame +static void UpdateDrawFrame(void) +{ + // Update + //---------------------------------------------------------------------------------- + UpdateCamera(&camera); + //---------------------------------------------------------------------------------- + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + + ClearBackground(RAYWHITE); + + BeginMode3D(camera); + + DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED); + DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON); + DrawGrid(10, 1.0f); + + EndMode3D(); + + DrawText("This is a raylib example", 10, 40, 20, DARKGRAY); + + DrawFPS(10, 10); + + EndDrawing(); + //---------------------------------------------------------------------------------- } \ No newline at end of file diff --git a/projects/VSCode/resources/LICENSE b/projects/VSCode/resources/LICENSE new file mode 100644 index 000000000..ebde2c573 --- /dev/null +++ b/projects/VSCode/resources/LICENSE @@ -0,0 +1 @@ +Assets license. From 45ef46c5e809e4dbfb2dfe2530350f05db7641b8 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Fri, 21 Jan 2022 19:52:07 +0800 Subject: [PATCH 483/570] fix: material color won't be loaded if there's no texture for that material (#2298) --- src/rmodels.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/rmodels.c b/src/rmodels.c index 22559e34f..601ce234d 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -4692,13 +4692,12 @@ static Model LoadGLTF(const char *fileName) model.materials[j].maps[MATERIAL_MAP_ALBEDO].texture = LoadTextureFromImage(imAlbedo); UnloadImage(imAlbedo); } - - // Load base color factor (tint) - model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.r = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[0]*255); - model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.g = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[1]*255); - model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.b = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[2]*255); - model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.a = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[3]*255); } + // Load base color factor (tint) + model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.r = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[0]*255); + model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.g = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[1]*255); + model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.b = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[2]*255); + model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.a = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[3]*255); // Load metallic/roughness texture if (data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture) From 5b8b24c0c53288a94bfce7cc6e7eb21a9eee3f4a Mon Sep 17 00:00:00 2001 From: Nikolas Date: Sat, 22 Jan 2022 17:25:53 +0100 Subject: [PATCH 484/570] Fix GetApplicationDirectory on macOS (#2304) Previously failed to build with an implicit declaration of `_NSGetExecutablePath`. --- src/rcore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rcore.c b/src/rcore.c index eed636675..70cc350bb 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -173,6 +173,7 @@ #include #elif defined(__APPLE__) #include + #include #endif // OSs #endif // PLATFORM_DESKTOP From b422e407e8ec02156ec83ec9457f7db671e7a9c4 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 22 Jan 2022 18:42:44 +0100 Subject: [PATCH 485/570] Update rtextures.c --- src/rtextures.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rtextures.c b/src/rtextures.c index a7f4323b2..81d6f73e0 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -4324,6 +4324,7 @@ static Image LoadPKM(const unsigned char *fileData, unsigned int fileSize) #if defined(SUPPORT_FILEFORMAT_KTX) // Load KTX compressed image data (ETC1/ETC2 compression) +// TODO: Review KTX loading, many things changed! static Image LoadKTX(const unsigned char *fileData, unsigned int fileSize) { unsigned char *fileDataPtr = (unsigned char *)fileData; @@ -4398,6 +4399,8 @@ static Image LoadKTX(const unsigned char *fileData, unsigned int fileSize) if (ktxHeader->glInternalFormat == 0x8D64) image.format = PIXELFORMAT_COMPRESSED_ETC1_RGB; else if (ktxHeader->glInternalFormat == 0x9274) image.format = PIXELFORMAT_COMPRESSED_ETC2_RGB; else if (ktxHeader->glInternalFormat == 0x9278) image.format = PIXELFORMAT_COMPRESSED_ETC2_EAC_RGBA; + + // TODO: Support uncompressed data formats? Right now it returns format = 0! } } @@ -4406,11 +4409,12 @@ static Image LoadKTX(const unsigned char *fileData, unsigned int fileSize) // Save image data as KTX file // NOTE: By default KTX 1.1 spec is used, 2.0 is still on draft (01Oct2018) +// TODO: Review KTX saving, many things changed! static int SaveKTX(Image image, const char *fileName) { // KTX file Header (64 bytes) // v1.1 - https://www.khronos.org/opengles/sdk/tools/KTX/file_format_spec/ - // v2.0 - http://github.khronos.org/KTX-Specification/ - still on draft, not ready for implementation + // v2.0 - http://github.khronos.org/KTX-Specification/ - Final specs by 2021-04-18 typedef struct { char id[12]; // Identifier: "«KTX 11»\r\n\x1A\n" // KTX 2.0: "«KTX 22»\r\n\x1A\n" unsigned int endianness; // Little endian: 0x01 0x02 0x03 0x04 From b4e0f7ab08dfa950b0a5d643c639d28833536271 Mon Sep 17 00:00:00 2001 From: Tobias Mock Date: Sun, 23 Jan 2022 12:22:25 +0100 Subject: [PATCH 486/570] Update raylib-ocaml to 4.0 (#2305) --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index b415065d7..ac79a1fa9 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -36,7 +36,7 @@ Some people ported raylib to other languages in form of bindings or wrappers to | raylib_odin_bindings | 4.0-dev | [Odin](https://odin-lang.org/) | MIT | https://github.com/Deathbat2190/raylib_odin_bindings | | raylib-odin | **4.0** | [Odin](https://odin-lang.org/) | BSD-3Clause | https://github.com/odin-lang/Odin/tree/master/vendor/raylib | | raylib.v | **4.0** | [V](https://vlang.io/) | Zlib | https://github.com/irishgreencitrus/raylib.v | -| raylib-ocaml | 3.7 | [OCaml](https://ocaml.org/) | MIT | https://github.com/tjammer/raylib-ocaml | +| raylib-ocaml | **4.0** | [OCaml](https://ocaml.org/) | MIT | https://github.com/tjammer/raylib-ocaml | | raylib-swift | 3.7 | [Swift](https://swift.org/) | MIT | https://github.com/STREGAsGate/Raylib | | hb-raylib | 3.5 | [Harbour](https://harbour.github.io) | MIT | https://github.com/MarcosLeonardoMendezGerencir/hb-raylib | | Relib | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | ? | https://github.com/RedCubeDev-ByteSpace/Relib | From ebdc34a20ef195919ca22c8bee3fd6f032e87e52 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 25 Jan 2022 14:04:55 +0100 Subject: [PATCH 487/570] Update minshell.html --- src/minshell.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/minshell.html b/src/minshell.html index 73c92f2fc..c34637f99 100644 --- a/src/minshell.html +++ b/src/minshell.html @@ -31,6 +31,7 @@ From 76b6efc827ccd90ddfb5d7a0d6890d9f0a5074cf Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 26 Jan 2022 11:30:38 +0100 Subject: [PATCH 488/570] Support export .jpeg files --- src/rtextures.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rtextures.c b/src/rtextures.c index 81d6f73e0..12732274f 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -500,7 +500,8 @@ bool ExportImage(Image image, const char *fileName) else if (IsFileExtension(fileName, ".tga")) success = stbi_write_tga(fileName, image.width, image.height, channels, imgData); #endif #if defined(SUPPORT_FILEFORMAT_JPG) - else if (IsFileExtension(fileName, ".jpg")) success = stbi_write_jpg(fileName, image.width, image.height, channels, imgData, 90); // JPG quality: between 1 and 100 + else if (IsFileExtension(fileName, ".jpg") || + IsFileExtension(fileName, ".jpeg")) success = stbi_write_jpg(fileName, image.width, image.height, channels, imgData, 90); // JPG quality: between 1 and 100 #endif #if defined(SUPPORT_FILEFORMAT_QOI) else if (IsFileExtension(fileName, ".qoi")) From e5ee69a0f51e7dc6e3d9c99a185c05fb8e1addb2 Mon Sep 17 00:00:00 2001 From: Siddharth Roy <46083528+siddharthroy12@users.noreply.github.com> Date: Wed, 26 Jan 2022 17:25:34 +0530 Subject: [PATCH 489/570] Add DrawTextCodepoints (#2308) * Add DrawTextCodepoints * Fixed top comment --- src/raylib.h | 1 + src/rtext.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/src/raylib.h b/src/raylib.h index 6c6baa7b7..228983d54 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1336,6 +1336,7 @@ RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color co RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint); // Draw text using Font and pro parameters (rotation) RLAPI void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSize, Color tint); // Draw one character (codepoint) +RLAPI void DrawTextCodepoints(Font font, int *codepoints, int count, Vector2 position, float fontSize, float spacing, Color tint); // Draw multiple character (codepoint) // Text font info functions RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font diff --git a/src/rtext.c b/src/rtext.c index 523712a37..f07b8804a 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -1091,6 +1091,38 @@ void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float fontSiz DrawTexturePro(font.texture, srcRec, dstRec, (Vector2){ 0, 0 }, 0.0f, tint); } +// Draw multiple character (codepoints) +void DrawTextCodepoints(Font font, int *codepoints, int count, Vector2 position, float fontSize, float spacing, Color tint) +{ + int textOffsetY = 0; // Offset between lines (on line break '\n') + float textOffsetX = 0.0f; // Offset X to next character to draw + + float scaleFactor = fontSize/font.baseSize; // Character quad scaling factor + + for (int i = 0; i < count; i++) + { + int index = GetGlyphIndex(font, codepoints[i]); + + if (codepoints[i] == '\n') + { + // NOTE: Fixed line spacing of 1.5 line-height + // TODO: Support custom line spacing defined by user + textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor); + textOffsetX = 0.0f; + } + else + { + if ((codepoints[i] != ' ') && (codepoints[i] != '\t')) + { + DrawTextCodepoint(font, codepoints[i], (Vector2){ position.x + textOffsetX, position.y + textOffsetY }, fontSize, tint); + } + + if (font.glyphs[index].advanceX == 0) textOffsetX += ((float)font.recs[index].width*scaleFactor + spacing); + else textOffsetX += ((float)font.glyphs[index].advanceX*scaleFactor + spacing); + } + } +} + // Measure string width for default font int MeasureText(const char *text, int fontSize) { From 524bf57b74f443052a90d7a61534dab86a99cda7 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 26 Jan 2022 16:33:38 +0100 Subject: [PATCH 490/570] Update qoi.h --- src/external/qoi.h | 114 ++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/src/external/qoi.h b/src/external/qoi.h index 5e31076bf..988f9edcb 100644 --- a/src/external/qoi.h +++ b/src/external/qoi.h @@ -28,8 +28,8 @@ SOFTWARE. -- About -QOI encodes and decodes images in a lossless format. Compared to stb_image and -stb_image_write QOI offers 20x-50x faster encoding, 3x-4x faster decoding and +QOI encodes and decodes images in a lossless format. Compared to stb_image and +stb_image_write QOI offers 20x-50x faster encoding, 3x-4x faster decoding and 20% better compression. @@ -45,7 +45,7 @@ stb_image_write QOI offers 20x-50x faster encoding, 3x-4x faster decoding and // the input pixel data. qoi_write("image_new.qoi", rgba_pixels, &(qoi_desc){ .width = 1920, - .height = 1080, + .height = 1080, .channels = 4, .colorspace = QOI_SRGB }); @@ -74,7 +74,7 @@ QOI_NO_STDIO before including this library. This library uses malloc() and free(). To supply your own malloc implementation you can define QOI_MALLOC and QOI_FREE before including this library. -This library uses memset() to zero-initialize the index. To supply your own +This library uses memset() to zero-initialize the index. To supply your own implementation you can define QOI_ZEROARR before including this library. @@ -91,9 +91,9 @@ struct qoi_header_t { uint8_t colorspace; // 0 = sRGB with linear alpha, 1 = all channels linear }; -Images are encoded from top to bottom, left to right. The decoder and encoder -start with {r: 0, g: 0, b: 0, a: 255} as the previous pixel value. An image is -complete when all pixels specified by width * height have been covered. +Images are encoded row by row, left to right, top to bottom. The decoder and +encoder start with {r: 0, g: 0, b: 0, a: 255} as the previous pixel value. An +image is complete when all pixels specified by width * height have been covered. Pixels are encoded as - a run of the previous pixel @@ -101,20 +101,20 @@ Pixels are encoded as - a difference to the previous pixel value in r,g,b - full r,g,b or r,g,b,a values -The color channels are assumed to not be premultiplied with the alpha channel +The color channels are assumed to not be premultiplied with the alpha channel ("un-premultiplied alpha"). -A running array[64] (zero-initialized) of previously seen pixel values is +A running array[64] (zero-initialized) of previously seen pixel values is maintained by the encoder and decoder. Each pixel that is seen by the encoder and decoder is put into this array at the position formed by a hash function of the color value. In the encoder, if the pixel value at the index matches the -current pixel, this index position is written to the stream as QOI_OP_INDEX. +current pixel, this index position is written to the stream as QOI_OP_INDEX. The hash function for the index is: index_position = (r * 3 + g * 5 + b * 7 + a * 11) % 64 -Each chunk starts with a 2- or 8-bit tag, followed by a number of data bits. The -bit length of chunks is divisible by 8 - i.e. all chunks are byte aligned. All +Each chunk starts with a 2- or 8-bit tag, followed by a number of data bits. The +bit length of chunks is divisible by 8 - i.e. all chunks are byte aligned. All values encoded in these data bits have the most significant bit on the left. The 8-bit tags have precedence over the 2-bit tags. A decoder must check for the @@ -135,11 +135,11 @@ The possible chunks are: 2-bit tag b00 6-bit index into the color index array: 0..63 -A valid encoder must not issue 7 or more consecutive QOI_OP_INDEX chunks to the -index 0, to avoid confusion with the 8 byte end marker. +A valid encoder must not issue 2 or more consecutive QOI_OP_INDEX chunks to the +same index. QOI_OP_RUN should be used instead. -.- QOI_OP_DIFF -----------. +.- QOI_OP_DIFF -----------. | Byte[0] | | 7 6 5 4 3 2 1 0 | |-------+-----+-----+-----| @@ -150,14 +150,16 @@ index 0, to avoid confusion with the 8 byte end marker. 2-bit green channel difference from the previous pixel between -2..1 2-bit blue channel difference from the previous pixel between -2..1 -The difference to the current channel values are using a wraparound operation, +The difference to the current channel values are using a wraparound operation, so "1 - 2" will result in 255, while "255 + 1" will result in 0. -Values are stored as unsigned integers with a bias of 2. E.g. -2 is stored as +Values are stored as unsigned integers with a bias of 2. E.g. -2 is stored as 0 (b00). 1 is stored as 3 (b11). +The alpha value remains unchanged from the previous pixel. -.- QOI_OP_LUMA -------------------------------------. + +.- QOI_OP_LUMA -------------------------------------. | Byte[0] | Byte[1] | | 7 6 5 4 3 2 1 0 | 7 6 5 4 3 2 1 0 | |-------+-----------------+-------------+-----------| @@ -168,18 +170,20 @@ Values are stored as unsigned integers with a bias of 2. E.g. -2 is stored as 4-bit red channel difference minus green channel difference -8..7 4-bit blue channel difference minus green channel difference -8..7 -The green channel is used to indicate the general direction of change and is +The green channel is used to indicate the general direction of change and is encoded in 6 bits. The red and blue channels (dr and db) base their diffs off of the green channel difference and are encoded in 4 bits. I.e.: - dr_dg = (last_px.r - cur_px.r) - (last_px.g - cur_px.g) - db_dg = (last_px.b - cur_px.b) - (last_px.g - cur_px.g) + dr_dg = (cur_px.r - prev_px.r) - (cur_px.g - prev_px.g) + db_dg = (cur_px.b - prev_px.b) - (cur_px.g - prev_px.g) -The difference to the current channel values are using a wraparound operation, +The difference to the current channel values are using a wraparound operation, so "10 - 13" will result in 253, while "250 + 7" will result in 1. -Values are stored as unsigned integers with a bias of 32 for the green channel +Values are stored as unsigned integers with a bias of 32 for the green channel and a bias of 8 for the red and blue channel. +The alpha value remains unchanged from the previous pixel. + .- QOI_OP_RUN ------------. | Byte[0] | @@ -190,8 +194,8 @@ and a bias of 8 for the red and blue channel. 2-bit tag b11 6-bit run-length repeating the previous pixel: 1..62 -The run-length is stored with a bias of -1. Note that the run-lengths 63 and 64 -(b111110 and b111111) are illegal as they are occupied by the QOI_OP_RGB and +The run-length is stored with a bias of -1. Note that the run-lengths 63 and 64 +(b111110 and b111111) are illegal as they are occupied by the QOI_OP_RGB and QOI_OP_RGBA tags. @@ -206,6 +210,8 @@ QOI_OP_RGBA tags. 8-bit green channel value 8-bit blue channel value +The alpha value remains unchanged from the previous pixel. + .- QOI_OP_RGBA ---------------------------------------------------. | Byte[0] | Byte[1] | Byte[2] | Byte[3] | Byte[4] | @@ -232,17 +238,17 @@ Header - Public functions */ extern "C" { #endif -/* A pointer to a qoi_desc struct has to be supplied to all of qoi's functions. -It describes either the input format (for qoi_write and qoi_encode), or is +/* A pointer to a qoi_desc struct has to be supplied to all of qoi's functions. +It describes either the input format (for qoi_write and qoi_encode), or is filled with the description read from the file header (for qoi_read and qoi_decode). -The colorspace in this qoi_desc is an enum where +The colorspace in this qoi_desc is an enum where 0 = sRGB, i.e. gamma scaled RGB channels and a linear alpha channel 1 = all channels are linear -You may use the constants QOI_SRGB or QOI_LINEAR. The colorspace is purely +You may use the constants QOI_SRGB or QOI_LINEAR. The colorspace is purely informative. It will be saved to the file header, but does not affect -en-/decoding in any way. */ +how chunks are en-/decoded. */ #define QOI_SRGB 0 #define QOI_LINEAR 1 @@ -256,11 +262,11 @@ typedef struct { #ifndef QOI_NO_STDIO -/* Encode raw RGB or RGBA pixels into a QOI image and write it to the file -system. The qoi_desc struct must be filled with the image width, height, -number of channels (3 = RGB, 4 = RGBA) and the colorspace. +/* Encode raw RGB or RGBA pixels into a QOI image and write it to the file +system. The qoi_desc struct must be filled with the image width, height, +number of channels (3 = RGB, 4 = RGBA) and the colorspace. -The function returns 0 on failure (invalid parameters, or fopen or malloc +The function returns 0 on failure (invalid parameters, or fopen or malloc failed) or the number of bytes written on success. */ int qoi_write(const char *filename, const void *data, const qoi_desc *desc); @@ -271,7 +277,7 @@ number of channels from the file header is used. If channels is 3 or 4 the output format will be forced into this number of channels. The function either returns NULL on failure (invalid data, or malloc or fopen -failed) or a pointer to the decoded pixels. On success, the qoi_desc struct +failed) or a pointer to the decoded pixels. On success, the qoi_desc struct will be filled with the description from the file header. The returned pixel data should be free()d after use. */ @@ -283,8 +289,8 @@ void *qoi_read(const char *filename, qoi_desc *desc, int channels); /* Encode raw RGB or RGBA pixels into a QOI image in memory. -The function either returns NULL on failure (invalid parameters or malloc -failed) or a pointer to the encoded data on success. On success the out_len +The function either returns NULL on failure (invalid parameters or malloc +failed) or a pointer to the encoded data on success. On success the out_len is set to the size in bytes of the encoded data. The returned qoi data should be free()d after use. */ @@ -294,8 +300,8 @@ void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len); /* Decode a QOI image from memory. -The function either returns NULL on failure (invalid parameters or malloc -failed) or a pointer to the decoded pixels. On success, the qoi_desc struct +The function either returns NULL on failure (invalid parameters or malloc +failed) or a pointer to the decoded pixels. On success, the qoi_desc struct is filled with the description from the file header. The returned pixel data should be free()d after use. */ @@ -340,8 +346,8 @@ Implementation */ #define QOI_HEADER_SIZE 14 /* 2GB is the max file size that this implementation can safely handle. We guard -against anything larger than that, assuming the worst case with 5 bytes per -pixel, rounded down to a nice clean value. 400 million pixels ought to be +against anything larger than that, assuming the worst case with 5 bytes per +pixel, rounded down to a nice clean value. 400 million pixels ought to be enough for anybody. */ #define QOI_PIXELS_MAX ((unsigned int)400000000) @@ -352,14 +358,14 @@ typedef union { static const unsigned char qoi_padding[8] = {0,0,0,0,0,0,0,1}; -void qoi_write_32(unsigned char *bytes, int *p, unsigned int v) { +static void qoi_write_32(unsigned char *bytes, int *p, unsigned int v) { bytes[(*p)++] = (0xff000000 & v) >> 24; bytes[(*p)++] = (0x00ff0000 & v) >> 16; bytes[(*p)++] = (0x0000ff00 & v) >> 8; bytes[(*p)++] = (0x000000ff & v); } -unsigned int qoi_read_32(const unsigned char *bytes, int *p) { +static unsigned int qoi_read_32(const unsigned char *bytes, int *p) { unsigned int a = bytes[(*p)++]; unsigned int b = bytes[(*p)++]; unsigned int c = bytes[(*p)++]; @@ -385,8 +391,8 @@ void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len) { return NULL; } - max_size = - desc->width * desc->height * (desc->channels + 1) + + max_size = + desc->width * desc->height * (desc->channels + 1) + QOI_HEADER_SIZE + sizeof(qoi_padding); p = 0; @@ -412,7 +418,7 @@ void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len) { px_prev.rgba.b = 0; px_prev.rgba.a = 255; px = px_prev; - + px_len = desc->width * desc->height * desc->channels; px_end = px_len - desc->channels; channels = desc->channels; @@ -460,14 +466,14 @@ void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len) { if ( vr > -3 && vr < 2 && - vg > -3 && vg < 2 && + vg > -3 && vg < 2 && vb > -3 && vb < 2 ) { bytes[p++] = QOI_OP_DIFF | (vr + 2) << 4 | (vg + 2) << 2 | (vb + 2); } else if ( - vg_r > -9 && vg_r < 8 && - vg > -33 && vg < 32 && + vg_r > -9 && vg_r < 8 && + vg > -33 && vg < 32 && vg_b > -9 && vg_b < 8 ) { bytes[p++] = QOI_OP_LUMA | (vg + 32); @@ -526,7 +532,7 @@ void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels) { desc->colorspace = bytes[p++]; if ( - desc->width == 0 || desc->height == 0 || + desc->width == 0 || desc->height == 0 || desc->channels < 3 || desc->channels > 4 || desc->colorspace > 1 || header_magic != QOI_MAGIC || @@ -592,7 +598,7 @@ void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels) { index[QOI_COLOR_HASH(px) % 64] = px; } - if (channels == 4) { + if (channels == 4) { *(qoi_rgba_t*)(pixels + px_pos) = px; } else { @@ -621,11 +627,11 @@ int qoi_write(const char *filename, const void *data, const qoi_desc *desc) { if (!encoded) { fclose(f); return 0; - } - + } + fwrite(encoded, 1, size, f); fclose(f); - + QOI_FREE(encoded); return size; } From 0f00c41aad3a60f64481172bd11f8b4120963dc3 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 27 Jan 2022 14:07:05 +0100 Subject: [PATCH 491/570] ADDED: `GetFileSize()` --- src/raylib.h | 1 + src/rcore.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/raylib.h b/src/raylib.h index 228983d54..ab8892ccf 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1041,6 +1041,7 @@ RLAPI bool SaveFileText(const char *fileName, char *text); // Save text d RLAPI bool FileExists(const char *fileName); // Check if file exists RLAPI bool DirectoryExists(const char *dirPath); // Check if a directory path exists RLAPI bool IsFileExtension(const char *fileName, const char *ext); // Check file extension (including point: .png, .wav) +RLAPI int GetFileSize(const char *fileName); // Get file size in bytes RLAPI const char *GetFileExtension(const char *fileName); // Get pointer to extension for a filename string (includes dot: '.png') RLAPI const char *GetFileName(const char *filePath); // Get pointer to filename for a path string RLAPI const char *GetFileNameWithoutExt(const char *filePath); // Get filename string without extension (uses static string) diff --git a/src/rcore.c b/src/rcore.c index 70cc350bb..83b6a8844 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -2851,6 +2851,23 @@ bool DirectoryExists(const char *dirPath) return result; } +// Get file size in bytes +int GetFileSize(const char *fileName) +{ + int size = 0; + + FILE *file = fopen(fileName, "rb"); + + if (file != NULL) + { + fseek(file, 0L, SEEK_END); + size = (int)ftell(file); + fclose(file); + } + + return size; +} + // Get pointer to extension for a filename string (includes the dot: .png) const char *GetFileExtension(const char *fileName) { From d38fe92c3f50fe14f051b4822ae9d24dd59067f5 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 28 Jan 2022 00:23:28 +0100 Subject: [PATCH 492/570] RENAMED: `GetFileSize()` to `GetFileLength()` `GetFileSize()` conflicts with the infamous `windows.h` --- src/raylib.h | 2 +- src/rcore.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index ab8892ccf..6e6e2e2ac 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1041,7 +1041,7 @@ RLAPI bool SaveFileText(const char *fileName, char *text); // Save text d RLAPI bool FileExists(const char *fileName); // Check if file exists RLAPI bool DirectoryExists(const char *dirPath); // Check if a directory path exists RLAPI bool IsFileExtension(const char *fileName, const char *ext); // Check file extension (including point: .png, .wav) -RLAPI int GetFileSize(const char *fileName); // Get file size in bytes +RLAPI int GetFileLength(const char *fileName); // Get file length in bytes (NOTE: GetFileSize() conflicts with windows.h) RLAPI const char *GetFileExtension(const char *fileName); // Get pointer to extension for a filename string (includes dot: '.png') RLAPI const char *GetFileName(const char *filePath); // Get pointer to filename for a path string RLAPI const char *GetFileNameWithoutExt(const char *filePath); // Get filename string without extension (uses static string) diff --git a/src/rcore.c b/src/rcore.c index 83b6a8844..f0652d3bb 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -2851,8 +2851,9 @@ bool DirectoryExists(const char *dirPath) return result; } -// Get file size in bytes -int GetFileSize(const char *fileName) +// Get file length in bytes +// NOTE: GetFileSize() conflicts with windows.h +int GetFileLength(const char *fileName) { int size = 0; From 44d3cee5d1e779ba9b62394a351537c557f11276 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 28 Jan 2022 21:25:40 +0100 Subject: [PATCH 493/570] Minor tweak --- src/raylib.h | 2 +- src/rlgl.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 6e6e2e2ac..70384e281 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -839,7 +839,7 @@ typedef enum { BLEND_MULTIPLIED, // Blend textures multiplying colors BLEND_ADD_COLORS, // Blend textures adding colors (alternative) BLEND_SUBTRACT_COLORS, // Blend textures subtracting colors (alternative) - BLEND_CUSTOM // Belnd textures using custom src/dst factors (use rlSetBlendMode()) + BLEND_CUSTOM // Blend textures using custom src/dst factors (use rlSetBlendMode()) } BlendMode; // Gesture diff --git a/src/rlgl.h b/src/rlgl.h index 16f419021..fa096ca6b 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -1778,7 +1778,11 @@ void rlSetBlendMode(int mode) case RL_BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; case RL_BLEND_ADD_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; case RL_BLEND_SUBTRACT_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_SUBTRACT); break; - case RL_BLEND_CUSTOM: glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); break; + case RL_BLEND_CUSTOM: + { + // NOTE: Using GL blend src/dst factors and GL equation configured with rlSetBlendFactors() + glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); + } break; default: break; } From 6e9bb7e480960373247d5ec9eeb86f9566b31afa Mon Sep 17 00:00:00 2001 From: Macoy Madson Date: Sat, 29 Jan 2022 10:11:45 -0800 Subject: [PATCH 494/570] Add missing defines to CUSTOMIZE_BUILD block (#2318) This fixes compilation and linking errors when CUSTOMIZE_BUILD is ON. Any option wasn't actually applied if it wasn't in this list. I also added a message which makes it a bit easier to confirm you have successfully enabled an option. --- cmake/CompileDefinitions.cmake | 35 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/cmake/CompileDefinitions.cmake b/cmake/CompileDefinitions.cmake index 36062b309..7fbbef99e 100644 --- a/cmake/CompileDefinitions.cmake +++ b/cmake/CompileDefinitions.cmake @@ -4,26 +4,35 @@ target_compile_definitions("raylib" PUBLIC "${GRAPHICS}") function(define_if target variable) if (${${variable}}) + message(STATUS "${variable}=${${variable}}") target_compile_definitions(${target} PUBLIC "${variable}") endif () endfunction() if (${CUSTOMIZE_BUILD}) target_compile_definitions("raylib" PUBLIC EXTERNAL_CONFIG_FLAGS) + define_if("raylib" USE_AUDIO) + define_if("raylib" SUPPORT_MODULE_RSHAPES) + define_if("raylib" SUPPORT_MODULE_RTEXTURES) + define_if("raylib" SUPPORT_MODULE_RTEXT) + define_if("raylib" SUPPORT_MODULE_RMODELS) + define_if("raylib" SUPPORT_MODULE_RAUDIO) define_if("raylib" SUPPORT_CAMERA_SYSTEM) define_if("raylib" SUPPORT_GESTURES_SYSTEM) define_if("raylib" SUPPORT_MOUSE_GESTURES) define_if("raylib" SUPPORT_SSH_KEYBOARD_RPI) - define_if("raylib" SUPPORT_BUSY_WAIT_LOOP) - define_if("raylib" SUPPORT_EVENTS_WAITING) + define_if("raylib" SUPPORT_DEFAULT_FONT) define_if("raylib" SUPPORT_SCREEN_CAPTURE) define_if("raylib" SUPPORT_GIF_RECORDING) - define_if("raylib" SUPPORT_HIGH_DPI) - define_if("raylib" SUPPORT_COMPRESSION_API) + define_if("raylib" SUPPORT_BUSY_WAIT_LOOP) + define_if("raylib" SUPPORT_EVENTS_WAITING) + define_if("raylib" SUPPORT_WINMM_HIGHRES_TIMER) define_if("raylib" SUPPORT_DATA_STORAGE) - define_if("raylib" SUPPORT_VR_SIMULATOR) - define_if("raylib" SUPPORT_FONT_TEXTURE) + define_if("raylib" SUPPORT_COMPRESSION_API) define_if("raylib" SUPPORT_QUADS_DRAW_MODE) + define_if("raylib" SUPPORT_IMAGE_EXPORT) + define_if("raylib" SUPPORT_IMAGE_GENERATION) + define_if("raylib" SUPPORT_IMAGE_MANIPULATION) define_if("raylib" SUPPORT_FILEFORMAT_PNG) define_if("raylib" SUPPORT_FILEFORMAT_DDS) define_if("raylib" SUPPORT_FILEFORMAT_HDR) @@ -33,32 +42,28 @@ if (${CUSTOMIZE_BUILD}) define_if("raylib" SUPPORT_FILEFORMAT_TGA) define_if("raylib" SUPPORT_FILEFORMAT_JPG) define_if("raylib" SUPPORT_FILEFORMAT_GIF) + define_if("raylib" SUPPORT_FILEFORMAT_QOI) define_if("raylib" SUPPORT_FILEFORMAT_PSD) define_if("raylib" SUPPORT_FILEFORMAT_PKM) define_if("raylib" SUPPORT_FILEFORMAT_PVR) - define_if("raylib" ORT_IMAGE_EXPORT) - define_if("raylib" SUPPORT_IMAGE_MANIPULATION) - define_if("raylib" SUPPORT_IMAGE_GENERATION) - define_if("raylib" SUPPORT_DEFAULT_FONT) define_if("raylib" SUPPORT_FILEFORMAT_FNT) define_if("raylib" SUPPORT_FILEFORMAT_TTF) define_if("raylib" SUPPORT_TEXT_MANIPULATION) + define_if("raylib" SUPPORT_MESH_GENERATION) define_if("raylib" SUPPORT_FILEFORMAT_OBJ) define_if("raylib" SUPPORT_FILEFORMAT_MTL) define_if("raylib" SUPPORT_FILEFORMAT_IQM) define_if("raylib" SUPPORT_FILEFORMAT_GLTF) - define_if("raylib" SUPPORT_MESH_GENERATION) + define_if("raylib" SUPPORT_FILEFORMAT_VOX) define_if("raylib" SUPPORT_FILEFORMAT_WAV) define_if("raylib" SUPPORT_FILEFORMAT_OGG) define_if("raylib" SUPPORT_FILEFORMAT_XM) define_if("raylib" SUPPORT_FILEFORMAT_MOD) - define_if("raylib" SUPPORT_FILEFORMAT_FLAC) define_if("raylib" SUPPORT_FILEFORMAT_MP3) + define_if("raylib" SUPPORT_FILEFORMAT_FLAC) define_if("raylib" SUPPORT_STANDARD_FILEIO) define_if("raylib" SUPPORT_TRACELOG) - define_if("raylib" SUPPORT_COMPRESSION_API) - - + if (UNIX AND NOT APPLE) target_compile_definitions("raylib" PUBLIC "MAX_FILEPATH_LENGTH=4096") else () From 680cc72d436352f07b22807621aee5b26b13e60f Mon Sep 17 00:00:00 2001 From: Macoy Madson Date: Sat, 29 Jan 2022 10:12:13 -0800 Subject: [PATCH 495/570] Add missing defines to CUSTOMIZE_BUILD block (#2318) This fixes compilation and linking errors when CUSTOMIZE_BUILD is ON. Any option wasn't actually applied if it wasn't in this list. I also added a message which makes it a bit easier to confirm you have successfully enabled an option. From c54d9cd552316d51be08911ca252bbc8bcd57bf7 Mon Sep 17 00:00:00 2001 From: megagrump <31128870+megagrump@users.noreply.github.com> Date: Mon, 31 Jan 2022 09:39:21 +0100 Subject: [PATCH 496/570] simplify QuaternionInvert (#2324) --- src/raymath.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/raymath.h b/src/raymath.h index 8a54bbccc..51dc2abc1 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -282,7 +282,7 @@ RMAPI float Vector2Distance(Vector2 v1, Vector2 v2) RMAPI float Vector2Angle(Vector2 v1, Vector2 v2) { float result = atan2f(v2.y, v2.x) - atan2f(v1.y, v1.x); - + return result; } @@ -549,12 +549,12 @@ RMAPI float Vector3Distance(Vector3 v1, Vector3 v2) RMAPI float Vector3Angle(Vector3 v1, Vector3 v2) { float result = 0.0f; - + Vector3 cross = { v1.y*v2.z - v1.z*v2.y, v1.z*v2.x - v1.x*v2.z, v1.x*v2.y - v1.y*v2.x }; float len = sqrtf(cross.x*cross.x + cross.y*cross.y + cross.z*cross.z); float dot = (v1.x*v2.x + v1.y*v2.y + v1.z*v2.z); result = atan2f(len, dot); - + return result; } @@ -1490,8 +1490,7 @@ RMAPI Quaternion QuaternionInvert(Quaternion q) { Quaternion result = q; - float length = sqrtf(q.x*q.x + q.y*q.y + q.z*q.z + q.w*q.w); - float lengthSq = length*length; + float lengthSq = q.x*q.x + q.y*q.y + q.z*q.z + q.w*q.w; if (lengthSq != 0.0) { From a0895f1a3c5178049c0d538fc7bd1818e5721c32 Mon Sep 17 00:00:00 2001 From: Audi Nugraha Date: Thu, 3 Feb 2022 18:00:33 +0700 Subject: [PATCH 497/570] Fix Undefined Symbol `_ftelli64` (#2319) --- src/external/cgltf.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/external/cgltf.h b/src/external/cgltf.h index 565003801..796eb86c1 100644 --- a/src/external/cgltf.h +++ b/src/external/cgltf.h @@ -948,7 +948,11 @@ static cgltf_result cgltf_default_file_read(const struct cgltf_memory_options* m fseek(file, 0, SEEK_END); #ifdef _WIN32 - __int64 length = _ftelli64(file); + #ifdef __TINYC__ + __int64 length = ftell(file); + #else + __int64 length = _ftelli64(file); + #endif #else long length = ftell(file); #endif From c895bed5e6506180d2325efaad601901b94912e0 Mon Sep 17 00:00:00 2001 From: iskolbin Date: Thu, 3 Feb 2022 16:56:00 +0300 Subject: [PATCH 498/570] Added defines to parser (#2269) * added defines to parser * added value and description for defines in parser * parser: fixed lua defines output, fixed makefile for raygui, added LONG type for defines * parser defines: remove postfix for LONG/FLOAT, support for hexadecimal consts, convert hex ints to decimal for JSON output * removed defines from raylib_apis --- parser/Makefile | 3 +- parser/raylib_parser.c | 210 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 5 deletions(-) diff --git a/parser/Makefile b/parser/Makefile index b9197e206..9446e2826 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -20,8 +20,9 @@ parse: ./raylib_parser -i ../src/raymath.h -o raymath_api.$(EXTENSION) -f $(FORMAT) -d RMAPI ./raylib_parser -i ../src/extras/easings.h -o easings_api.$(EXTENSION) -f $(FORMAT) -d EASEDEF ./raylib_parser -i ../src/extras/physac.h -o physac_api.$(EXTENSION) -f $(FORMAT) -d PHYSACDEF - ./raylib_parser -i ../src/extras/raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIDEF + ./raylib_parser -i ../src/extras/raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIAPI ./raylib_parser -i ../src/extras/rmem.h -o rmem_api.$(EXTENSION) -f $(FORMAT) -d RMEMAPI + ./raylib_parser -i ../src/rlgl.h -o rlgl_api.$(EXTENSION) -f $(FORMAT) -d RLAPI clean: rm -f raylib_parser *.json *.txt *.xml *.lua diff --git a/parser/raylib_parser.c b/parser/raylib_parser.c index ed534299c..68c893f4e 100644 --- a/parser/raylib_parser.c +++ b/parser/raylib_parser.c @@ -2,12 +2,13 @@ raylib API parser - This parser scans raylib.h to get API information about structs, enums and functions. + This parser scans raylib.h to get API information about structs, enums, functions and defines. All data is divided into pieces, usually as strings. The following types are used for data: - struct FunctionInfo - struct StructInfo - struct EnumInfo + - struct DefInfo CONSTRAINTS: @@ -62,10 +63,12 @@ #include // Required for: malloc(), calloc(), realloc(), free(), atoi(), strtol() #include // Required for: printf(), fopen(), fseek(), ftell(), fread(), fclose() #include // Required for: bool +#include // Required for: isdigit() #define MAX_FUNCS_TO_PARSE 512 // Maximum number of functions to parse #define MAX_STRUCTS_TO_PARSE 64 // Maximum number of structures to parse #define MAX_ENUMS_TO_PARSE 64 // Maximum number of enums to parse +#define MAX_DEFINES_TO_PARSE 2048 // Maximum number of defines to parse #define MAX_LINE_LENGTH 512 // Maximum length of one line (including comments) #define MAX_STRUCT_LINE_LENGTH 2048 // Maximum length of one struct (multiple lines) @@ -108,6 +111,18 @@ typedef struct EnumInfo { char valueDesc[MAX_ENUM_VALUES][128]; // Value description } EnumInfo; +// Type of parsed define +typedef enum { UNKNOWN = 0, MACRO, GUARD, INT, LONG, FLOAT, DOUBLE, CHAR, STRING, COLOR } DefineType; + +// Define info data +typedef struct DefineInfo { + char name[64]; // Define name + DefineType type; // Define type + char value[256]; // Define value + char desc[128]; // Define description + bool isHex; // Define is hex number (for types INT, LONG) +} DefineInfo; + // Output format for parsed data typedef enum { DEFAULT = 0, JSON, XML, LUA } OutputFormat; @@ -117,9 +132,11 @@ typedef enum { DEFAULT = 0, JSON, XML, LUA } OutputFormat; static int funcCount = 0; static int structCount = 0; static int enumCount = 0; +static int defineCount = 0; static FunctionInfo *funcs = NULL; static StructInfo *structs = NULL; static EnumInfo *enums = NULL; +static DefineInfo *defines = NULL; static char apiDefine[32] = "RLAPI\0"; // Command line variables @@ -143,6 +160,8 @@ static char *EscapeBackslashes(char *text); // Replace '\' by "\ static void ExportParsedData(const char *fileName, int format); // Export parsed data in desired format +static const char *StrDefineType(DefineType type); // Get string of define type + //------------------------------------------------------------------------------------ // Program main entry point //------------------------------------------------------------------------------------ @@ -169,6 +188,9 @@ int main(int argc, char* argv[]) // Enums lines pointers, selected from buffer "lines" int *enumLines = (int *)malloc(MAX_ENUMS_TO_PARSE*sizeof(int)); + // Defines lines pointers, selected from buffer "lines" + int *defineLines = (int *)malloc(MAX_DEFINES_TO_PARSE*sizeof(int)); + // Prepare required lines for parsing //-------------------------------------------------------------------------------------------------- @@ -228,7 +250,22 @@ int main(int argc, char* argv[]) } } - // At this point we have all raylib structs, enums, functions lines data to start parsing + // Read const lines + for (int i = 0; i < linesCount; i++) + { + int j = 0; + while (lines[i][j] == ' ' || lines[i][j] == '\t') j++; // skip spaces and tabs in the begining + // Read define line + if (IsTextEqual(lines[i]+j, "#define ", 8)) + { + // Keep the line position in the array of lines, + // so, we can scan that position and following lines + defineLines[defineCount] = i; + defineCount++; + } + } + + // At this point we have all raylib structs, enums, functions, defines lines data to start parsing free(buffer); // Unload text buffer @@ -402,9 +439,94 @@ int main(int argc, char* argv[]) } } } - free(enumLines); + // Define info data + defines = (DefineInfo *)calloc(MAX_DEFINES_TO_PARSE, sizeof(DefineInfo)); + int defineIndex = 0; + + for (int i = 0; i < defineCount; i++) + { + char *linePtr = lines[defineLines[i]]; + int j = 0; + + while (linePtr[j] == ' ' || linePtr[j] == '\t') j++; // Skip spaces and tabs in the begining + j += 8; // Skip "#define " + while (linePtr[j] == ' ' || linePtr[j] == '\t') j++; // Skip spaces and tabs after "#define " + + // Extract name + int defineNameStart = j; + while (linePtr[j] != ' ' && linePtr[j] != '\t' && linePtr[j] != '\0') j++; + int defineNameEnd = j-1; + + // Skip duplicates + int nameLen = defineNameEnd - defineNameStart + 1; + bool isDuplicate = false; + for (int k = 0; k < defineIndex; k++) { + if (nameLen == TextLength(defines[k].name) && IsTextEqual(defines[k].name, linePtr + defineNameStart, nameLen)) { + isDuplicate = true; + break; + } + } + if (isDuplicate) continue; + + MemoryCopy(defines[defineIndex].name, linePtr + defineNameStart, nameLen); + + // Determine type + if (linePtr[defineNameEnd] == ')') defines[defineIndex].type = MACRO; + + while (linePtr[j] == ' ' || linePtr[j] == '\t') j++; // Skip spaces and tabs after name + + int defineValueStart = j; + if (linePtr[j] == '\0' || linePtr == "/") defines[defineIndex].type = GUARD; + if (linePtr[j] == '"') defines[defineIndex].type = STRING; + else if (linePtr[j] == '\'') defines[defineIndex].type = CHAR; + else if (IsTextEqual(linePtr+j, "CLITERAL(Color)", 15)) defines[defineIndex].type = COLOR; + else if (isdigit(linePtr[j])) { // Parsing numbers + bool isFloat = false, isNumber = true, isHex = false; + while (linePtr[j] != ' ' && linePtr[j] != '\t' && linePtr[j] != '\0') { + char ch = linePtr[j]; + if (ch == '.') isFloat = true; + if (ch == 'x') isHex = true; + if (!(isdigit(ch)||(ch >= 'a' && ch <= 'f')||(ch >= 'A' && ch <= 'F')||ch=='x'||ch=='L'||ch=='.'||ch=='+'||ch=='-')) isNumber = false; + j++; + } + if (isNumber) { + if (isFloat) { + defines[defineIndex].type = linePtr[j-1] == 'f' ? FLOAT : DOUBLE; + } else { + defines[defineIndex].type = linePtr[j-1] == 'L' ? LONG : INT; + defines[defineIndex].isHex = isHex; + } + } + } + + // Extracting value + while (linePtr[j] != '\\' && linePtr[j] != '\0' && !(linePtr[j] == '/' && linePtr[j+1] == '/')) j++; + int defineValueEnd = j-1; + while (linePtr[defineValueEnd] == ' ' || linePtr[defineValueEnd] == '\t') defineValueEnd--; // Remove trailing spaces and tabs + if (defines[defineIndex].type == LONG || defines[defineIndex].type == FLOAT) defineValueEnd--; // Remove number postfix + int valueLen = defineValueEnd - defineValueStart + 1; + if (valueLen > 255) valueLen = 255; + + if (valueLen > 0) MemoryCopy(defines[defineIndex].value, linePtr + defineValueStart, valueLen); + + // Extracting description + if (linePtr[j] == '/') { + int commentStart = j; + while (linePtr[j] != '\\' && linePtr[j] != '\0') j++; + int commentEnd = j-1; + int commentLen = commentEnd - commentStart + 1; + if (commentLen > 127) commentLen = 127; + + MemoryCopy(defines[defineIndex].desc, linePtr + commentStart, commentLen); + } + + defineIndex++; + } + defineCount = defineIndex; + free(defineLines); + // Functions info data funcs = (FunctionInfo *)calloc(MAX_FUNCS_TO_PARSE, sizeof(FunctionInfo)); @@ -486,6 +608,7 @@ int main(int argc, char* argv[]) // structs[] -> We have all the structs decomposed into pieces for further analysis // enums[] -> We have all the enums decomposed into pieces for further analysis // funcs[] -> We have all the functions decomposed into pieces for further analysis + // defines[] -> We have all the defines decomposed into pieces for further analysis // Process input file to output if (outFileName[0] == '\0') MemoryCopy(outFileName, "raylib_api.txt\0", 15); @@ -759,6 +882,25 @@ static char *EscapeBackslashes(char *text) return buffer; } +// Get string of define type +static const char *StrDefineType(DefineType type) +{ + switch (type) + { + case UNKNOWN: return "UNKNOWN"; + case GUARD: return "GUARD"; + case MACRO: return "MACRO"; + case INT: return "INT"; + case LONG: return "LONG"; + case FLOAT: return "FLOAT"; + case DOUBLE: return "DOUBLE"; + case CHAR: return "CHAR"; + case STRING: return "STRING"; + case COLOR: return "COLOR"; + } + return ""; +} + /* // Replace text string // REQUIRES: strlen(), strstr(), strncpy(), strcpy() -> TODO: Replace by custom implementations! @@ -836,7 +978,7 @@ static void ExportParsedData(const char *fileName, int format) { fprintf(outFile, "Enum %02i: %s (%i values)\n", i + 1, enums[i].name, enums[i].valueCount); fprintf(outFile, " Name: %s\n", enums[i].name); - fprintf(outFile, " Description: %s\n", enums[i].desc + 3); + fprintf(outFile, " Description: %s\n", enums[i].desc + 3); for (int e = 0; e < enums[i].valueCount; e++) fprintf(outFile, " Value[%s]: %i\n", enums[i].valueName[e], enums[i].valueInteger[e]); } @@ -851,6 +993,16 @@ static void ExportParsedData(const char *fileName, int format) for (int p = 0; p < funcs[i].paramCount; p++) fprintf(outFile, " Param[%i]: %s (type: %s)\n", p + 1, funcs[i].paramName[p], funcs[i].paramType[p]); if (funcs[i].paramCount == 0) fprintf(outFile, " No input parameters\n"); } + + fprintf(outFile, "\nDefines found: %i\n\n", defineCount); + for (int i = 0; i < defineCount; i++) + { + fprintf(outFile, "Define %03i: %s\n", i + 1, defines[i].name); + fprintf(outFile, " Name: %s\n", defines[i].name); + fprintf(outFile, " Type: %s\n", StrDefineType(defines[i].type)); + fprintf(outFile, " Value: %s\n", defines[i].value); + fprintf(outFile, " Description: %s\n", defines[i].desc + 3); + } } break; case LUA: { @@ -906,6 +1058,26 @@ static void ExportParsedData(const char *fileName, int format) } fprintf(outFile, " },\n"); + // Print defines info + fprintf(outFile, " defines = {\n"); + for (int i = 0; i < defineCount; i++) + { + fprintf(outFile, " {\n"); + fprintf(outFile, " name = \"%s\",\n", defines[i].name); + fprintf(outFile, " type = \"%s\",\n", StrDefineType(defines[i].type)); + if (defines[i].type == INT || defines[i].type == LONG || defines[i].type == FLOAT || defines[i].type == DOUBLE || defines[i].type == STRING) { + fprintf(outFile, " value = %s,\n", defines[i].value); + } else { + fprintf(outFile, " value = \"%s\",\n", defines[i].value); + } + fprintf(outFile, " description = \"%s\"\n", defines[i].desc + 3); + fprintf(outFile, " }"); + + if (i < defineCount - 1) fprintf(outFile, ",\n"); + else fprintf(outFile, "\n"); + } + fprintf(outFile, " },\n"); + // Print functions info fprintf(outFile, " functions = {\n"); for (int i = 0; i < funcCount; i++) @@ -989,6 +1161,28 @@ static void ExportParsedData(const char *fileName, int format) } fprintf(outFile, " ],\n"); + // Print defines info + fprintf(outFile, " \"defines\": [\n"); + for (int i = 0; i < defineCount; i++) + { + fprintf(outFile, " {\n"); + fprintf(outFile, " \"name\": \"%s\",\n", defines[i].name); + fprintf(outFile, " \"type\": \"%s\",\n", StrDefineType(defines[i].type)); + if (defines[i].isHex) { // INT or LONG + fprintf(outFile, " \"value\": %ld,\n", strtol(defines[i].value, NULL, 16)); + } else if (defines[i].type == INT || defines[i].type == LONG || defines[i].type == FLOAT || defines[i].type == DOUBLE || defines[i].type == STRING) { + fprintf(outFile, " \"value\": %s,\n", defines[i].value); + } else { + fprintf(outFile, " \"value\": \"%s\",\n", defines[i].value); + } + fprintf(outFile, " \"description\": \"%s\"\n", defines[i].desc + 3); + fprintf(outFile, " }"); + + if (i < defineCount - 1) fprintf(outFile, ",\n"); + else fprintf(outFile, "\n"); + } + fprintf(outFile, " ],\n"); + // Print functions info fprintf(outFile, " \"functions\": [\n"); for (int i = 0; i < funcCount; i++) @@ -1077,6 +1271,14 @@ static void ExportParsedData(const char *fileName, int format) } fprintf(outFile, " \n"); + // Print defines info + fprintf(outFile, " \n", defineCount); + for (int i = 0; i < defineCount; i++) + { + fprintf(outFile, " \n", defines[i].name, StrDefineType(defines[i].type), defines[i].value, defines[i].desc); + } + fprintf(outFile, " \n"); + // Print functions info fprintf(outFile, " \n", funcCount); for (int i = 0; i < funcCount; i++) From 1e436be51d4f8853c3494a0753eabe7628ac6d90 Mon Sep 17 00:00:00 2001 From: locriacyber <74560659+locriacyber@users.noreply.github.com> Date: Sat, 5 Feb 2022 13:33:05 +0100 Subject: [PATCH 499/570] Make audio examples compile with external glfw on Linux (#2329) --- cmake/LibraryConfigurations.cmake | 4 ++++ src/CMakeLists.txt | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake index b7874888f..9227aef0d 100644 --- a/cmake/LibraryConfigurations.cmake +++ b/cmake/LibraryConfigurations.cmake @@ -28,6 +28,10 @@ if (${PLATFORM} MATCHES "Desktop") endif () set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) + + if (USE_AUDIO) + set(LIBS_PRIVATE ${LIBS_PRIVATE} dl) + endif () endif () elseif (${PLATFORM} MATCHES "Web") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2877c9ac8..c96f4f560 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,6 +41,10 @@ set(raylib_sources # /cmake/GlfwImport.cmake handles the details around the inclusion of glfw include(GlfwImport) +# Sets additional platform options and link libraries for each platform +# also selects the proper graphics API and version for that platform +# Produces a variable LIBS_PRIVATE that will be used later +include(LibraryConfigurations) if (USE_AUDIO) MESSAGE(STATUS "Audio Backend: miniaudio") @@ -49,10 +53,6 @@ else () MESSAGE(STATUS "Audio Backend: None (-DUSE_AUDIO=OFF)") endif () -# Sets additional platform options and link libraries for each platform -# also selects the proper graphics API and version for that platform -# Produces a variable LIBS_PRIVATE that will be used later -include(LibraryConfigurations) add_library(raylib ${raylib_sources} ${raylib_public_headers}) From 96452637d979da3a37d0af79df32a83a935d6f85 Mon Sep 17 00:00:00 2001 From: Scribe of the Ziggurat <72305366+zigster64@users.noreply.github.com> Date: Wed, 9 Feb 2022 17:23:14 +1000 Subject: [PATCH 500/570] Add BSD support for zig builds (#2332) - Adds a new OS clause to build.zig for the BSDs - Tested on my FreeBSD box using https://github.com/Not-Nik/raylib-zig - All demos build and render just fine. Nice ! --- src/build.zig | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/build.zig b/src/build.zig index 915d33a83..61c0e6626 100644 --- a/src/build.zig +++ b/src/build.zig @@ -47,6 +47,19 @@ pub fn Pkg(srcdir: []const u8) type { raylib.linkSystemLibrary("m"); raylib.linkSystemLibrary("X11"); }, + .freebsd, .openbsd, .netbsd, .dragonfly => { + raylib.addCSourceFiles(&.{srcdir ++ "/rglfw.c"}, raylib_flags); + raylib.linkSystemLibrary("GL"); + raylib.linkSystemLibrary("rt"); + raylib.linkSystemLibrary("dl"); + raylib.linkSystemLibrary("m"); + raylib.linkSystemLibrary("X11"); + raylib.linkSystemLibrary("Xrandr"); + raylib.linkSystemLibrary("Xinerama"); + raylib.linkSystemLibrary("Xi"); + raylib.linkSystemLibrary("Xxf86vm"); + raylib.linkSystemLibrary("Xcursor"); + }, .macos => { // On macos rglfw.c include Objective-C files. const raylib_flags_extra_macos = &[_][]const u8{ From 30797d32010247257c38f7849ae8fd67193580cf Mon Sep 17 00:00:00 2001 From: gtrxAC <59177874+gtrxAC@users.noreply.github.com> Date: Thu, 10 Feb 2022 21:51:46 +0200 Subject: [PATCH 501/570] Update file names in build scripts (#2339) * JSON parser: Use array for function params (#2255) * Parser: follow C convention of type before name * Update file names in build scripts --- projects/scripts/build-linux.sh | 10 +++++----- projects/scripts/build-osx.sh | 10 +++++----- projects/scripts/build-rpi.sh | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) mode change 100644 => 100755 projects/scripts/build-linux.sh mode change 100644 => 100755 projects/scripts/build-osx.sh diff --git a/projects/scripts/build-linux.sh b/projects/scripts/build-linux.sh old mode 100644 new mode 100755 index 4f3871d03..ccae8d7ff --- a/projects/scripts/build-linux.sh +++ b/projects/scripts/build-linux.sh @@ -24,7 +24,7 @@ set -e while getopts ":hdusrcq" opt; do case $opt in h) - echo "Usage: ./linux-build.sh [-hdusrcqq]" + echo "Usage: ./build-linux.sh [-hdusrcqq]" echo " -h Show this information" echo " -d Faster builds that have debug symbols, and enable warnings" echo " -u Run upx* on the executable after compilation (before -r)" @@ -39,10 +39,10 @@ while getopts ":hdusrcq" opt; do echo " requires that you have upx installed and on your path, of course." echo "" echo "Examples:" - echo " Build a release build: ./linux-build.sh" - echo " Build a release build, full recompile: ./linux-build.sh -c" - echo " Build a debug build and run: ./linux-build.sh -d -r" - echo " Build in debug, run, don't print at all: ./linux-build.sh -drqq" + echo " Build a release build: ./build-linux.sh" + echo " Build a release build, full recompile: ./build-linux.sh -c" + echo " Build a debug build and run: ./build-linux.sh -d -r" + echo " Build in debug, run, don't print at all: ./build-linux.sh -drqq" exit 0 ;; d) diff --git a/projects/scripts/build-osx.sh b/projects/scripts/build-osx.sh old mode 100644 new mode 100755 index e7bf5cf92..e2ab834b1 --- a/projects/scripts/build-osx.sh +++ b/projects/scripts/build-osx.sh @@ -24,7 +24,7 @@ set -e while getopts ":hdusrcq" opt; do case $opt in h) - echo "Usage: ./osx-build.sh [-hdusrcqq]" + echo "Usage: ./build-osx.sh [-hdusrcqq]" echo " -h Show this information" echo " -d Faster builds that have debug symbols, and enable warnings" echo " -u Run upx* on the executable after compilation (before -r)" @@ -39,10 +39,10 @@ while getopts ":hdusrcq" opt; do echo " requires that you have upx installed and on your path, of course." echo "" echo "Examples:" - echo " Build a release build: ./osx-build.sh" - echo " Build a release build, full recompile: ./osx-build.sh -c" - echo " Build a debug build and run: ./osx-build.sh -d -r" - echo " Build in debug, run, don't print at all: ./osx-build.sh -drqq" + echo " Build a release build: ./build-osx.sh" + echo " Build a release build, full recompile: ./build-osx.sh -c" + echo " Build a debug build and run: ./build-osx.sh -d -r" + echo " Build in debug, run, don't print at all: ./build-osx.sh -drqq" exit 0 ;; d) diff --git a/projects/scripts/build-rpi.sh b/projects/scripts/build-rpi.sh index 7b4237f2f..646cf90c9 100755 --- a/projects/scripts/build-rpi.sh +++ b/projects/scripts/build-rpi.sh @@ -24,7 +24,7 @@ set -e while getopts ":hdusrcq" opt; do case $opt in h) - echo "Usage: ./linux-build.sh [-hdusrcqq]" + echo "Usage: ./build-rpi.sh [-hdusrcqq]" echo " -h Show this information" echo " -d Faster builds that have debug symbols, and enable warnings" echo " -u Run upx* on the executable after compilation (before -r)" @@ -39,10 +39,10 @@ while getopts ":hdusrcq" opt; do echo " requires that you have upx installed and on your path, of course." echo "" echo "Examples:" - echo " Build a release build: ./linux-build.sh" - echo " Build a release build, full recompile: ./linux-build.sh -c" - echo " Build a debug build and run: ./linux-build.sh -d -r" - echo " Build in debug, run, don't print at all: ./linux-build.sh -drqq" + echo " Build a release build: ./build-rpi.sh" + echo " Build a release build, full recompile: ./build-rpi.sh -c" + echo " Build a debug build and run: ./build-rpi.sh -d -r" + echo " Build in debug, run, don't print at all: ./build-rpi.sh -drqq" exit 0 ;; d) From 81cced4d83a388c387695a8a5477ff35e613e527 Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Thu, 10 Feb 2022 19:52:34 +0000 Subject: [PATCH 502/570] Fix make clean target failing when shell is not cmd (#2338) GNU make on Windows first tries to find sh.exe on the path, and will execute build rules using it if it is present. The make clean target uses the builtin cmd.exe command del, which won't work under sh.exe The reason this is not done for the entire Makefile is because it would break cross-compilation of raylib. --- src/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Makefile b/src/Makefile index ddac896cb..3048f98a4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -731,6 +731,12 @@ endif # Clean everything clean: ifeq ($(PLATFORM_OS),WINDOWS) + # Make always tries to run build rules under sh.exe by default + # So if sh.exe is present in the PATH on windows, the del commands will fail + # see README.W32 of GNU Make for more details + # It is not specified earlier in the Makefile, because then cross-compilation + # will also fail. + SHELL = cmd del *.o /s cd $(RAYLIB_RELEASE_PATH) del lib$(RAYLIB_LIB_NAME).a /s From ab47c6401e3a7da22a2e9e1f4a2a63144d51e13a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 17:37:12 +0100 Subject: [PATCH 503/570] Reviewed Makefile clean target to use CMD shell on Windows Tested on the following environments: - w64devkit.exe - Windows 10 cmd - Notepad++ NppExec console --- src/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 3048f98a4..c63326e10 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,7 +36,6 @@ # NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms # https://github.com/raysan5/raylib/wiki - .PHONY: all clean install uninstall # Define required environment variables @@ -106,6 +105,7 @@ ROOT = $(shell whoami) # By default we suppose we are working on Windows HOST_PLATFORM_OS ?= WINDOWS +PLATFORM_OS ?= WINDOWS # Determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -148,6 +148,12 @@ ifeq ($(PLATFORM),PLATFORM_DRM) endif endif +ifeq ($(PLATFORM_OS),WINDOWS) + # Make uses by default Sh shell, if a different shell is required, it must be specified + # On Windows we set CMD as default shell to allow calling del command on clean target + SHELL := cmd +endif + ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables EMSDK_PATH ?= C:/emsdk @@ -731,12 +737,6 @@ endif # Clean everything clean: ifeq ($(PLATFORM_OS),WINDOWS) - # Make always tries to run build rules under sh.exe by default - # So if sh.exe is present in the PATH on windows, the del commands will fail - # see README.W32 of GNU Make for more details - # It is not specified earlier in the Makefile, because then cross-compilation - # will also fail. - SHELL = cmd del *.o /s cd $(RAYLIB_RELEASE_PATH) del lib$(RAYLIB_LIB_NAME).a /s From ddba8478c53f32e00b89432b960d2c69392e4360 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 17:58:38 +0100 Subject: [PATCH 504/570] Revert "Reviewed Makefile clean target to use CMD shell on Windows" This reverts commit ab47c6401e3a7da22a2e9e1f4a2a63144d51e13a. --- src/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index c63326e10..3048f98a4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,6 +36,7 @@ # NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms # https://github.com/raysan5/raylib/wiki + .PHONY: all clean install uninstall # Define required environment variables @@ -105,7 +106,6 @@ ROOT = $(shell whoami) # By default we suppose we are working on Windows HOST_PLATFORM_OS ?= WINDOWS -PLATFORM_OS ?= WINDOWS # Determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -148,12 +148,6 @@ ifeq ($(PLATFORM),PLATFORM_DRM) endif endif -ifeq ($(PLATFORM_OS),WINDOWS) - # Make uses by default Sh shell, if a different shell is required, it must be specified - # On Windows we set CMD as default shell to allow calling del command on clean target - SHELL := cmd -endif - ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables EMSDK_PATH ?= C:/emsdk @@ -737,6 +731,12 @@ endif # Clean everything clean: ifeq ($(PLATFORM_OS),WINDOWS) + # Make always tries to run build rules under sh.exe by default + # So if sh.exe is present in the PATH on windows, the del commands will fail + # see README.W32 of GNU Make for more details + # It is not specified earlier in the Makefile, because then cross-compilation + # will also fail. + SHELL = cmd del *.o /s cd $(RAYLIB_RELEASE_PATH) del lib$(RAYLIB_LIB_NAME).a /s From dd15531e25b73f1b3d37196effd5ac7685d8026e Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Sat, 12 Feb 2022 16:59:48 +0000 Subject: [PATCH 505/570] Properly fix make clean under windows (#2341) * Properly fix make clean under sh.exe * Ensure make clean works properly under Windows if RAYLIB_RELEASE_PATH is modified --- src/Makefile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Makefile b/src/Makefile index 3048f98a4..f543b0b51 100644 --- a/src/Makefile +++ b/src/Makefile @@ -728,24 +728,24 @@ else @echo "Error: Root permissions needed for uninstallation. Try sudo make uninstall" endif +.PHONY: clean_LINUX clean_WINDOWS clean_ANDROID clean_BSD clean_OSX + # Clean everything -clean: -ifeq ($(PLATFORM_OS),WINDOWS) - # Make always tries to run build rules under sh.exe by default - # So if sh.exe is present in the PATH on windows, the del commands will fail - # see README.W32 of GNU Make for more details - # It is not specified earlier in the Makefile, because then cross-compilation - # will also fail. - SHELL = cmd - del *.o /s - cd $(RAYLIB_RELEASE_PATH) - del lib$(RAYLIB_LIB_NAME).a /s - del lib$(RAYLIB_LIB_NAME)dll.a /s - del $(RAYLIB_LIB_NAME).dll /s -else - rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* -endif -ifeq ($(PLATFORM),PLATFORM_ANDROID) - rm -rf $(ANDROID_TOOLCHAIN) $(NATIVE_APP_GLUE)/android_native_app_glue.o -endif +clean: clean_$(PLATFORM_OS) @echo "removed all generated files!" + +clean_LINUX clean_BSD clean_OSX: + rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* + +clean_ANDROID: + rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* + rm -rf $(ANDROID_TOOLCHAIN) $(NATIVE_APP_GLUE)/android_native_app_glue.o + +clean_WINDOWS: SHELL := cmd.exe + +clean_WINDOWS: + del *.o /s + cd $(RAYLIB_RELEASE_PATH) & \ + del lib$(RAYLIB_LIB_NAME).a /s & \ + del lib$(RAYLIB_LIB_NAME)dll.a /s & \ + del $(RAYLIB_LIB_NAME).dll /s From d0008ae8cda8e0a7dda68b18c9e4be12fff00ae6 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 18:06:21 +0100 Subject: [PATCH 506/570] REVIEWED: Issue when compiling for PLATFORM_WEB --- src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index f543b0b51..c29701a36 100644 --- a/src/Makefile +++ b/src/Makefile @@ -106,6 +106,7 @@ ROOT = $(shell whoami) # By default we suppose we are working on Windows HOST_PLATFORM_OS ?= WINDOWS +PLATFORM_OS ?= WINDOWS # Determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -741,8 +742,8 @@ clean_ANDROID: rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* rm -rf $(ANDROID_TOOLCHAIN) $(NATIVE_APP_GLUE)/android_native_app_glue.o +# Set specific target variable clean_WINDOWS: SHELL := cmd.exe - clean_WINDOWS: del *.o /s cd $(RAYLIB_RELEASE_PATH) & \ From 6ef6dbff2d86d8fbf11a138cafd17d13e791604e Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 19:08:31 +0100 Subject: [PATCH 507/570] REVIEWED: PLATFORM_OS for PLATFORM_WEB --- src/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Makefile b/src/Makefile index c29701a36..cb9bb88c6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -148,6 +148,16 @@ ifeq ($(PLATFORM),PLATFORM_DRM) PLATFORM_OS = LINUX endif endif +ifeq ($(PLATFORM),PLATFORM_WEB) + ifeq ($(OS),Windows_NT) + PLATFORM_OS = WINDOWS + else + UNAMEOS = $(shell uname) + ifeq ($(UNAMEOS),Linux) + PLATFORM_OS = LINUX + endif + endif +endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables From 2f3fc41c33d4d380cdfd251a7e9987758202c5ae Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 19:31:27 +0100 Subject: [PATCH 508/570] Allow setting a custom PLATFORM_SHELL --- src/Makefile | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index cb9bb88c6..279f39cd9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -114,6 +114,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) PLATFORM_OS = WINDOWS + ifndef PLATFORM_SHELL + PLATFORM_SHELL = cmd + endif else UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) @@ -134,6 +137,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(UNAMEOS),Darwin) PLATFORM_OS = OSX endif + ifndef PLATFORM_SHELL + PLATFORM_SHELL = cmd + endif endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -141,21 +147,33 @@ ifeq ($(PLATFORM),PLATFORM_RPI) ifeq ($(UNAMEOS),Linux) PLATFORM_OS = LINUX endif + ifndef PLATFORM_SHELL + PLATFORM_SHELL = cmd + endif endif ifeq ($(PLATFORM),PLATFORM_DRM) UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) PLATFORM_OS = LINUX endif + ifndef PLATFORM_SHELL + PLATFORM_SHELL = cmd + endif endif ifeq ($(PLATFORM),PLATFORM_WEB) ifeq ($(OS),Windows_NT) PLATFORM_OS = WINDOWS + ifndef PLATFORM_SHELL + PLATFORM_SHELL = cmd + endif else UNAMEOS = $(shell uname) ifeq ($(UNAMEOS),Linux) PLATFORM_OS = LINUX endif + ifndef PLATFORM_SHELL + PLATFORM_SHELL = sh + endif endif endif @@ -739,22 +757,21 @@ else @echo "Error: Root permissions needed for uninstallation. Try sudo make uninstall" endif -.PHONY: clean_LINUX clean_WINDOWS clean_ANDROID clean_BSD clean_OSX +.PHONY: clean_shell_cmd clean_shell_sh # Clean everything -clean: clean_$(PLATFORM_OS) +clean: clean_shell_$(PLATFORM_SHELL) @echo "removed all generated files!" -clean_LINUX clean_BSD clean_OSX: - rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* - -clean_ANDROID: +clean_shell_sh: rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* +ifeq ($(PLATFORM),PLATFORM_ANDROID) rm -rf $(ANDROID_TOOLCHAIN) $(NATIVE_APP_GLUE)/android_native_app_glue.o +endif # Set specific target variable -clean_WINDOWS: SHELL := cmd.exe -clean_WINDOWS: +clean_shell_cmd: SHELL=cmd +clean_shell_cmd: del *.o /s cd $(RAYLIB_RELEASE_PATH) & \ del lib$(RAYLIB_LIB_NAME).a /s & \ From 8c9a0221a4cbb60d14c62b21666547a01c253865 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 12 Feb 2022 19:38:14 +0100 Subject: [PATCH 509/570] Update Makefile --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 279f39cd9..20809be19 100644 --- a/src/Makefile +++ b/src/Makefile @@ -766,7 +766,7 @@ clean: clean_shell_$(PLATFORM_SHELL) clean_shell_sh: rm -fv *.o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).a $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).bc $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so* ifeq ($(PLATFORM),PLATFORM_ANDROID) - rm -rf $(ANDROID_TOOLCHAIN) $(NATIVE_APP_GLUE)/android_native_app_glue.o + rm -fv $(NATIVE_APP_GLUE)/android_native_app_glue.o endif # Set specific target variable From 9cf170e6e91670eade739c1cffefe8e1ea24980b Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 13 Feb 2022 10:47:09 +0100 Subject: [PATCH 510/570] Reviewed makefile to use right shell on right platform --- src/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index 20809be19..87d76a650 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,7 @@ # Define required environment variables #------------------------------------------------------------------------------------------------ # Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB -PLATFORM ?= PLATFORM_DESKTOP +PLATFORM ?= PLATFORM_DESKTOP # Define required raylib variables RAYLIB_VERSION = 4.0.0 @@ -138,7 +138,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) PLATFORM_OS = OSX endif ifndef PLATFORM_SHELL - PLATFORM_SHELL = cmd + PLATFORM_SHELL = sh endif endif endif @@ -148,7 +148,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) PLATFORM_OS = LINUX endif ifndef PLATFORM_SHELL - PLATFORM_SHELL = cmd + PLATFORM_SHELL = sh endif endif ifeq ($(PLATFORM),PLATFORM_DRM) @@ -157,7 +157,7 @@ ifeq ($(PLATFORM),PLATFORM_DRM) PLATFORM_OS = LINUX endif ifndef PLATFORM_SHELL - PLATFORM_SHELL = cmd + PLATFORM_SHELL = sh endif endif ifeq ($(PLATFORM),PLATFORM_WEB) @@ -297,7 +297,7 @@ endif #------------------------------------------------------------------------------------------------ # -O1 defines optimization level # -g include debug information on compilation -# -s strip unnecessary data from build +# -s strip unnecessary data from build --> linker # -Wall turns on most, but not all, compiler warnings # -std=c99 defines C language mode (standard C from 1999 revision) # -std=gnu99 defines C language mode (GNU C from 1999 revision) @@ -331,7 +331,7 @@ ifeq ($(RAYLIB_BUILD_MODE),RELEASE) CFLAGS += -Os endif ifeq ($(PLATFORM),PLATFORM_DESKTOP) - CFLAGS += -s -O1 + CFLAGS += -O1 endif ifeq ($(PLATFORM),PLATFORM_ANDROID) CFLAGS += -O2 From 4bc6e0d7de105820e2dbddb6e134539aa781ca86 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 13 Feb 2022 10:47:19 +0100 Subject: [PATCH 511/570] Update rtext.c --- src/rtext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtext.c b/src/rtext.c index f07b8804a..a62f0d834 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -960,7 +960,7 @@ bool ExportFontAsCode(Font font, const char *fileName) byteCount += sprintf(txtData + byteCount, " font.glyphs = fontGlyphs_%s;\n\n", fileNamePascal); #endif byteCount += sprintf(txtData + byteCount, " return font;\n"); - byteCount += sprintf(txtData + byteCount, "}\n\0"); + byteCount += sprintf(txtData + byteCount, "}\n"); UnloadImage(image); From f40eed5adf6a707250ac6c7783fe5eb097d29297 Mon Sep 17 00:00:00 2001 From: megagrump <31128870+megagrump@users.noreply.github.com> Date: Sun, 13 Feb 2022 18:42:24 +0100 Subject: [PATCH 512/570] add premultiplied alpha blend mode (#2342) --- src/raylib.h | 1 + src/rlgl.h | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 70384e281..315658917 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -839,6 +839,7 @@ typedef enum { BLEND_MULTIPLIED, // Blend textures multiplying colors BLEND_ADD_COLORS, // Blend textures adding colors (alternative) BLEND_SUBTRACT_COLORS, // Blend textures subtracting colors (alternative) + BLEND_ALPHA_PREMUL, // Blend premultiplied textures considering alpha BLEND_CUSTOM // Blend textures using custom src/dst factors (use rlSetBlendMode()) } BlendMode; diff --git a/src/rlgl.h b/src/rlgl.h index fa096ca6b..f3977e670 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -433,6 +433,7 @@ typedef enum { RL_BLEND_MULTIPLIED, // Blend textures multiplying colors RL_BLEND_ADD_COLORS, // Blend textures adding colors (alternative) RL_BLEND_SUBTRACT_COLORS, // Blend textures subtracting colors (alternative) + RL_BLEND_ALPHA_PREMUL, // Blend premultiplied textures considering alpha RL_BLEND_CUSTOM // Blend textures using custom src/dst factors (use rlSetBlendFactors()) } rlBlendMode; @@ -1778,10 +1779,11 @@ void rlSetBlendMode(int mode) case RL_BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; case RL_BLEND_ADD_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_ADD); break; case RL_BLEND_SUBTRACT_COLORS: glBlendFunc(GL_ONE, GL_ONE); glBlendEquation(GL_FUNC_SUBTRACT); break; - case RL_BLEND_CUSTOM: + case RL_BLEND_ALPHA_PREMUL: glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); break; + case RL_BLEND_CUSTOM: { // NOTE: Using GL blend src/dst factors and GL equation configured with rlSetBlendFactors() - glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); + glBlendFunc(RLGL.State.glBlendSrcFactor, RLGL.State.glBlendDstFactor); glBlendEquation(RLGL.State.glBlendEquation); } break; default: break; } @@ -3911,7 +3913,7 @@ void rlComputeShaderDispatch(unsigned int groupX, unsigned int groupY, unsigned unsigned int rlLoadShaderBuffer(unsigned long long size, const void *data, int usageHint) { unsigned int ssbo = 0; - + #if defined(GRAPHICS_API_OPENGL_43) glGenBuffers(1, &ssbo); glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo); @@ -3944,7 +3946,7 @@ void rlUpdateShaderBufferElements(unsigned int id, const void *data, unsigned lo unsigned long long rlGetShaderBufferSize(unsigned int id) { long long size = 0; - + #if defined(GRAPHICS_API_OPENGL_43) glBindBuffer(GL_SHADER_STORAGE_BUFFER, id); glGetInteger64v(GL_SHADER_STORAGE_BUFFER_SIZE, &size); From b54e9db7647ae6e5ed86a8a5d92dbd63157c89ac Mon Sep 17 00:00:00 2001 From: Jaedeok Kim Date: Mon, 14 Feb 2022 02:43:17 +0900 Subject: [PATCH 513/570] Optimize `Vector2Rotate()` function (#2340) --- src/raymath.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/raymath.h b/src/raymath.h index 51dc2abc1..00c134d89 100644 --- a/src/raymath.h +++ b/src/raymath.h @@ -189,7 +189,7 @@ RMAPI float Normalize(float value, float start, float end) // Remap input value within input range to output range RMAPI float Remap(float value, float inputStart, float inputEnd, float outputStart, float outputEnd) { - float result =(value - inputStart)/(inputEnd - inputStart)*(outputEnd - outputStart) + outputStart; + float result = (value - inputStart)/(inputEnd - inputStart)*(outputEnd - outputStart) + outputStart; return result; } @@ -378,8 +378,11 @@ RMAPI Vector2 Vector2Rotate(Vector2 v, float angle) { Vector2 result = { 0 }; - result.x = v.x*cosf(angle) - v.y*sinf(angle); - result.y = v.x*sinf(angle) + v.y*cosf(angle); + float cosres = cosf(angle); + float sinres = sinf(angle); + + result.x = v.x*cosres - v.y*sinres; + result.y = v.x*sinres + v.y*cosres; return result; } From 4815065c47da8e4cbab2600a247f34ed32d538f1 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Feb 2022 18:35:17 +0000 Subject: [PATCH 514/570] Update Raylib-cs bindings version (#2343) --- BINDINGS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BINDINGS.md b/BINDINGS.md index ac79a1fa9..4c72acbe6 100644 --- a/BINDINGS.md +++ b/BINDINGS.md @@ -7,7 +7,7 @@ Some people ported raylib to other languages in form of bindings or wrappers to | name | raylib version | language | license | repo | |:------------------:|:---------------:|:---------:|:----------:|-----------------------------------------------------------| | raylib | **4.0** | [C/C++](https://en.wikipedia.org/wiki/C_(programming_language)) | Zlib | https://github.com/raysan5/raylib | -| Raylib-cs | 3.7 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | Zlib | https://github.com/ChrisDill/Raylib-cs | +| Raylib-cs | **4.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | Zlib | https://github.com/ChrisDill/Raylib-cs | | Raylib-CsLo | **4.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 | https://github.com/NotNotTech/Raylib-CsLo | | raylib-boo | 3.7 | [Boo](http://boo-language.github.io/)| MIT | https://github.com/Rabios/raylib-boo | | bindbc-raylib3 | **4.0** | [D](https://dlang.org/) | BSL-1.0 | https://github.com/o3o/bindbc-raylib3 | From 4f2bfc54760cbcbf142417b0bb24ddebf9ee4221 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 15 Feb 2022 19:38:28 +0100 Subject: [PATCH 515/570] Reviewed bug on `FindNearestConnectorMode()` --- src/rcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rcore.c b/src/rcore.c index f0652d3bb..44d65c7b7 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -6580,7 +6580,7 @@ static int FindNearestConnectorMode(const drmModeConnector *connector, uint widt TRACELOG(LOG_TRACE, "DISPLAY: DRM mode: %d %ux%u@%u %s", i, mode->hdisplay, mode->vdisplay, mode->vrefresh, (mode->flags & DRM_MODE_FLAG_INTERLACE) ? "interlaced" : "progressive"); - if ((mode->hdisplay < width) || (mode->vdisplay < height) | (mode->vrefresh < fps)) + if ((mode->hdisplay < width) || (mode->vdisplay < height) || (mode->vrefresh < fps)) { TRACELOG(LOG_TRACE, "DISPLAY: DRM mode is too small"); continue; From 963de06d08f28784e03b6cfa994d545f9e0ef8b5 Mon Sep 17 00:00:00 2001 From: Antonis Geralis <43617260+planetis-m@users.noreply.github.com> Date: Thu, 17 Feb 2022 01:54:21 +0200 Subject: [PATCH 516/570] follow style guide (#2346) * follow style guide * Update rmodels.c --- src/raylib.h | 2 +- src/rmodels.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 315658917..9f4e7caab 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1456,7 +1456,7 @@ RLAPI void SetModelMeshMaterial(Model *model, int meshId, int materialId); RLAPI ModelAnimation *LoadModelAnimations(const char *fileName, unsigned int *animCount); // Load model animations from file RLAPI void UpdateModelAnimation(Model model, ModelAnimation anim, int frame); // Update model animation pose RLAPI void UnloadModelAnimation(ModelAnimation anim); // Unload animation data -RLAPI void UnloadModelAnimations(ModelAnimation* animations, unsigned int count); // Unload animation array data +RLAPI void UnloadModelAnimations(ModelAnimation *animations, unsigned int count); // Unload animation array data RLAPI bool IsModelAnimationValid(Model model, ModelAnimation anim); // Check model animation skeleton match // Collision detection functions diff --git a/src/rmodels.c b/src/rmodels.c index 601ce234d..c15c4c07b 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -1930,7 +1930,7 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame) } // Unload animation array data -void UnloadModelAnimations(ModelAnimation* animations, unsigned int count) +void UnloadModelAnimations(ModelAnimation *animations, unsigned int count) { for (unsigned int i = 0; i < count; i++) UnloadModelAnimation(animations[i]); RL_FREE(animations); @@ -4301,7 +4301,7 @@ static Model LoadIQM(const char *fileName) } // Load IQM animation data -static ModelAnimation* LoadModelAnimationsIQM(const char *fileName, unsigned int *animCount) +static ModelAnimation *LoadModelAnimationsIQM(const char *fileName, unsigned int *animCount) { #define IQM_MAGIC "INTERQUAKEMODEL" // IQM file magic number #define IQM_VERSION 2 // only IQM version 2 supported From d4382f4a52e7631bf02ff8073ed24b282596ce0a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Fri, 18 Feb 2022 20:30:46 +0100 Subject: [PATCH 517/570] Removed trailing spaces --- src/raudio.c | 4 +- src/rcore.c | 36 ++++++++-------- src/rmodels.c | 20 ++++----- src/rshapes.c | 20 ++++----- src/rtext.c | 6 +-- src/rtextures.c | 14 +++--- src/shell.html | 112 ++++++++++++++++++++++++------------------------ 7 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/raudio.c b/src/raudio.c index 5abb1d05c..2d41b2385 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -664,7 +664,7 @@ void SetAudioBufferPitch(AudioBuffer *buffer, float pitch) // Set pan for an audio buffer void SetAudioBufferPan(AudioBuffer *buffer, float pan) { - if (pan < 0.0f) pan = 0.0f; + if (pan < 0.0f) pan = 0.0f; else if (pan > 1.0f) pan = 1.0f; if (buffer != NULL) buffer->pan = pan; @@ -998,7 +998,7 @@ bool ExportWaveAsCode(Wave wave, const char *fileName) success = SaveFileText(fileName, txtData); RL_FREE(txtData); - + if (success != 0) TRACELOG(LOG_INFO, "FILEIO: [%s] Wave as code exported successfully", fileName); else TRACELOG(LOG_WARNING, "FILEIO: [%s] Failed to export wave as code", fileName); diff --git a/src/rcore.c b/src/rcore.c index 44d65c7b7..2b0164ee2 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -722,7 +722,7 @@ struct android_app *GetAndroidApp(void) void InitWindow(int width, int height, const char *title) { TRACELOG(LOG_INFO, "Initializing raylib %s", RAYLIB_VERSION); - + TRACELOG(LOG_INFO, "Supported raylib modules:"); TRACELOG(LOG_INFO, " > rcore:..... loaded (mandatory)"); TRACELOG(LOG_INFO, " > rlgl:...... loaded (mandatory)"); @@ -731,12 +731,12 @@ void InitWindow(int width, int height, const char *title) #else TRACELOG(LOG_INFO, " > rshapes:... not loaded (optional)"); #endif -#if defined(SUPPORT_MODULE_RTEXTURES) +#if defined(SUPPORT_MODULE_RTEXTURES) TRACELOG(LOG_INFO, " > rtextures:. loaded (optional)"); #else TRACELOG(LOG_INFO, " > rtextures:. not loaded (optional)"); -#endif -#if defined(SUPPORT_MODULE_RTEXT) +#endif +#if defined(SUPPORT_MODULE_RTEXT) TRACELOG(LOG_INFO, " > rtext:..... loaded (optional)"); #else TRACELOG(LOG_INFO, " > rtext:..... not loaded (optional)"); @@ -746,7 +746,7 @@ void InitWindow(int width, int height, const char *title) #else TRACELOG(LOG_INFO, " > rmodels:... not loaded (optional)"); #endif -#if defined(SUPPORT_MODULE_RAUDIO) +#if defined(SUPPORT_MODULE_RAUDIO) TRACELOG(LOG_INFO, " > raudio:.... loaded (optional)"); #else TRACELOG(LOG_INFO, " > raudio:.... not loaded (optional)"); @@ -890,7 +890,7 @@ void InitWindow(int width, int height, const char *title) //emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, 1, EmscriptenResizeCallback); // Trigger this once to get initial window sizing //EmscriptenResizeCallback(EMSCRIPTEN_EVENT_RESIZE, NULL, NULL); - + // Support keyboard events -> Not used, GLFW.JS takes care of that //emscripten_set_keypress_callback("#canvas", NULL, 1, EmscriptenKeyboardCallback); //emscripten_set_keydown_callback("#canvas", NULL, 1, EmscriptenKeyboardCallback); @@ -1276,7 +1276,7 @@ void ToggleFullscreen(void) int width, height; emscripten_get_canvas_element_size("#canvas", &width, &height); TRACELOG(LOG_WARNING, "Emscripten: Exit fullscreen: Canvas size: %i x %i", width, height); - + CORE.Window.fullscreen = false; // Toggle fullscreen flag CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE; } @@ -2750,7 +2750,7 @@ void TakeScreenshot(const char *fileName) char path[2048] = { 0 }; strcpy(path, TextFormat("%s/%s", CORE.Storage.basePath, fileName)); - + ExportImage(image, path); // WARNING: Module required: rtextures RL_FREE(imgData); @@ -2798,7 +2798,7 @@ bool FileExists(const char *fileName) // NOTE: Alternatively, stat() can be used instead of access() //#include - //struct stat statbuf; + //struct stat statbuf; //if (stat(filename, &statbuf) == 0) result = true; return result; @@ -2856,9 +2856,9 @@ bool DirectoryExists(const char *dirPath) int GetFileLength(const char *fileName) { int size = 0; - + FILE *file = fopen(fileName, "rb"); - + if (file != NULL) { fseek(file, 0L, SEEK_END); @@ -3093,7 +3093,7 @@ char **GetDirectoryFiles(const char *dirPath, int *fileCount) if (dir != NULL) // It's a directory { // Count files - while ((entity = readdir(dir)) != NULL) counter++; + while ((entity = readdir(dir)) != NULL) counter++; dirFileCount = counter; *fileCount = dirFileCount; @@ -3101,7 +3101,7 @@ char **GetDirectoryFiles(const char *dirPath, int *fileCount) // Memory allocation for dirFileCount dirFilesPath = (char **)RL_MALLOC(dirFileCount*sizeof(char *)); for (int i = 0; i < dirFileCount; i++) dirFilesPath[i] = (char *)RL_MALLOC(MAX_FILEPATH_LENGTH*sizeof(char)); - + // Reset our position in the directory to the beginning rewinddir(dir); @@ -4162,7 +4162,7 @@ static bool InitGraphicsDevice(int width, int height) glfwSwapInterval(1); TRACELOG(LOG_INFO, "DISPLAY: Trying to enable VSYNC"); } - + int fbWidth = CORE.Window.screen.width; int fbHeight = CORE.Window.screen.height; @@ -4187,7 +4187,7 @@ static bool InitGraphicsDevice(int width, int height) CORE.Window.render.height = fbHeight; CORE.Window.currentFbo.width = fbWidth; CORE.Window.currentFbo.height = fbHeight; - + TRACELOG(LOG_INFO, "DISPLAY: Device initialized successfully"); TRACELOG(LOG_INFO, " > Display size: %i x %i", CORE.Window.display.width, CORE.Window.display.height); TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height); @@ -4601,7 +4601,7 @@ static bool InitGraphicsDevice(int width, int height) CORE.Window.render.height = CORE.Window.screen.height; CORE.Window.currentFbo.width = CORE.Window.render.width; CORE.Window.currentFbo.height = CORE.Window.render.height; - + TRACELOG(LOG_INFO, "DISPLAY: Device initialized successfully"); TRACELOG(LOG_INFO, " > Display size: %i x %i", CORE.Window.display.width, CORE.Window.display.height); TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height); @@ -4940,7 +4940,7 @@ void PollInputEvents(void) // Register previous touch states for (int i = 0; i < MAX_TOUCH_POINTS; i++) CORE.Input.Touch.previousTouchState[i] = CORE.Input.Touch.currentTouchState[i]; - + // Reset touch positions // TODO: It resets on PLATFORM_WEB the mouse position and not filled again until a move-event, // so, if mouse is not moved it returns a (0, 0) position... this behaviour should be reviewed! @@ -5224,7 +5224,7 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i CORE.Input.Keyboard.keyPressedQueue[CORE.Input.Keyboard.keyPressedQueueCount] = key; CORE.Input.Keyboard.keyPressedQueueCount++; } - + // Check the exit key to set close window if ((key == CORE.Input.Keyboard.exitKey) && (action == GLFW_PRESS)) glfwSetWindowShouldClose(CORE.Window.handle, GLFW_TRUE); diff --git a/src/rmodels.c b/src/rmodels.c index c15c4c07b..223414cde 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -1692,7 +1692,7 @@ bool ExportMesh(Mesh mesh, const char *fileName) { for (int i = 0, v = 0; i < mesh.triangleCount; i++, v += 3) { - byteCount += sprintf(txtData + byteCount, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", + byteCount += sprintf(txtData + byteCount, "f %i/%i/%i %i/%i/%i %i/%i/%i\n", mesh.indices[v] + 1, mesh.indices[v] + 1, mesh.indices[v] + 1, mesh.indices[v + 1] + 1, mesh.indices[v + 1] + 1, mesh.indices[v + 1] + 1, mesh.indices[v + 2] + 1, mesh.indices[v + 2] + 1, mesh.indices[v + 2] + 1); @@ -4543,7 +4543,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *cgltfImage, const char *texPat cgltf_options options = { 0 }; cgltf_result result = cgltf_load_buffer_base64(&options, outSize, cgltfImage->uri + i + 1, &data); - + if (result == cgltf_result_success) { image = LoadImageFromMemory(".png", (unsigned char *)data, outSize); @@ -4571,12 +4571,12 @@ static Image LoadImageFromCgltfImage(cgltf_image *cgltfImage, const char *texPat // Check mime_type for image: (cgltfImage->mime_type == "image/png") // NOTE: Detected that some models define mime_type as "image\\/png" - if ((strcmp(cgltfImage->mime_type, "image\\/png") == 0) || + if ((strcmp(cgltfImage->mime_type, "image\\/png") == 0) || (strcmp(cgltfImage->mime_type, "image/png") == 0)) image = LoadImageFromMemory(".png", data, (int)cgltfImage->buffer_view->size); else if ((strcmp(cgltfImage->mime_type, "image\\/jpeg") == 0) || (strcmp(cgltfImage->mime_type, "image/jpeg") == 0)) image = LoadImageFromMemory(".jpg", data, (int)cgltfImage->buffer_view->size); else TRACELOG(LOG_WARNING, "MODEL: glTF image data MIME type not recognized", TextFormat("%s/%s", texPath, cgltfImage->uri)); - + RL_FREE(data); } @@ -4637,7 +4637,7 @@ static Model LoadGLTF(const char *fileName) cgltf_options options = { 0 }; cgltf_data *data = NULL; cgltf_result result = cgltf_parse(&options, fileData, dataSize, &data); - + if (result == cgltf_result_success) { if (data->file_type == cgltf_file_type_glb) TRACELOG(LOG_INFO, "MODEL: [%s] Model basic data (glb) loaded successfully", fileName); @@ -4665,7 +4665,7 @@ static Model LoadGLTF(const char *fileName) for (int i = 0; i < model.meshCount; i++) model.meshes[i].vboId = (unsigned int*)RL_CALLOC(MAX_MESH_VERTEX_BUFFERS, sizeof(unsigned int)); // NOTE: We keep an extra slot for default material, in case some mesh requires it - model.materialCount = (int)data->materials_count + 1; + model.materialCount = (int)data->materials_count + 1; model.materials = RL_CALLOC(model.materialCount, sizeof(Material)); model.materials[0] = LoadMaterialDefault(); // Load default material (index: 0) @@ -4708,8 +4708,8 @@ static Model LoadGLTF(const char *fileName) model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTextureFromImage(imMetallicRoughness); UnloadImage(imMetallicRoughness); } - - // Load metallic/roughness material properties + + // Load metallic/roughness material properties float roughness = data->materials[i].pbr_metallic_roughness.roughness_factor; model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].value = roughness; @@ -4757,7 +4757,7 @@ static Model LoadGLTF(const char *fileName) } } - // Other possible materials not supported by raylib pipeline: + // Other possible materials not supported by raylib pipeline: // has_clearcoat, has_transmission, has_volume, has_ior, has specular, has_sheen } @@ -4787,7 +4787,7 @@ static Model LoadGLTF(const char *fileName) if ((attribute->component_type == cgltf_component_type_r_32f) && (attribute->type == cgltf_type_vec3)) { - // Init raylib mesh vertices to copy glTF attribute data + // Init raylib mesh vertices to copy glTF attribute data model.meshes[meshIndex].vertexCount = (int)attribute->count; model.meshes[meshIndex].vertices = RL_MALLOC(attribute->count*3*sizeof(float)); diff --git a/src/rshapes.c b/src/rshapes.c index d93b4db6f..79631d622 100644 --- a/src/rshapes.c +++ b/src/rshapes.c @@ -6,12 +6,12 @@ * Shapes can be draw using 3 types of primitives: LINES, TRIANGLES and QUADS. * Some functions implement two drawing options: TRIANGLES and QUADS, by default TRIANGLES * are used but QUADS implementation can be selected with SUPPORT_QUADS_DRAW_MODE define -* -* Some functions define texture coordinates (rlTexCoord2f()) for the shapes and use a +* +* Some functions define texture coordinates (rlTexCoord2f()) for the shapes and use a * user-provided texture with SetShapesTexture(), the pourpouse of this implementation * is allowing to reduce draw calls when combined with a texture-atlas. * -* By default, raylib sets the default texture and rectangle at InitWindow()[rcore] to one +* By default, raylib sets the default texture and rectangle at InitWindow()[rcore] to one * white character of default font [rtext], this way, raylib text and shapes can be draw with * a single draw call and it also allows users to configure it the same way with their own fonts. * @@ -723,7 +723,7 @@ void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color color rlCheckRenderBatchLimit(4); rlSetTexture(texShapes.id); - + rlBegin(RL_QUADS); rlNormal3f(0.0f, 0.0f, 1.0f); @@ -742,13 +742,13 @@ void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color color rlVertex2f(topRight.x, topRight.y); rlEnd(); - + rlSetTexture(0); #else rlCheckRenderBatchLimit(6); rlBegin(RL_TRIANGLES); - + rlColor4ub(color.r, color.g, color.b, color.a); rlVertex2f(topLeft.x, topLeft.y); @@ -1609,7 +1609,7 @@ bool CheckCollisionPointRec(Vector2 point, Rectangle rec) bool CheckCollisionPointCircle(Vector2 point, Vector2 center, float radius) { bool collision = false; - + collision = CheckCollisionCircles(point, 0, center, radius); return collision; @@ -1681,7 +1681,7 @@ bool CheckCollisionCircleRec(Vector2 center, float radius, Rectangle rec) (dy - rec.height/2.0f)*(dy - rec.height/2.0f); collision = (cornerDistanceSq <= (radius*radius)); - + return collision; } @@ -1695,10 +1695,10 @@ bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, if (fabsf(div) >= FLT_EPSILON) { collision = true; - + float xi = ((startPos2.x - endPos2.x)*(startPos1.x*endPos1.y - startPos1.y*endPos1.x) - (startPos1.x - endPos1.x)*(startPos2.x*endPos2.y - startPos2.y*endPos2.x))/div; float yi = ((startPos2.y - endPos2.y)*(startPos1.x*endPos1.y - startPos1.y*endPos1.x) - (startPos1.y - endPos1.y)*(startPos2.x*endPos2.y - startPos2.y*endPos2.x))/div; - + if (((fabsf(startPos1.x - endPos1.x) > FLT_EPSILON) && (xi < fminf(startPos1.x, endPos1.x) || (xi > fmaxf(startPos1.x, endPos1.x)))) || ((fabsf(startPos2.x - endPos2.x) > FLT_EPSILON) && (xi < fminf(startPos2.x, endPos2.x) || (xi > fmaxf(startPos2.x, endPos2.x)))) || ((fabsf(startPos1.y - endPos1.y) > FLT_EPSILON) && (yi < fminf(startPos1.y, endPos1.y) || (yi > fmaxf(startPos1.y, endPos1.y)))) || diff --git a/src/rtext.c b/src/rtext.c index a62f0d834..0a8af79e1 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -825,7 +825,7 @@ void UnloadFont(Font font) bool ExportFontAsCode(Font font, const char *fileName) { bool success = false; - + #ifndef TEXT_BYTES_PER_LINE #define TEXT_BYTES_PER_LINE 20 #endif @@ -865,7 +865,7 @@ bool ExportFontAsCode(Font font, const char *fileName) Image image = LoadImageFromTexture(font.texture); if (image.format != PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA) TRACELOG(LOG_WARNING, "Font export as code: Font image format is not GRAY+ALPHA!"); int imageDataSize = GetPixelDataSize(image.width, image.height, image.format); - + // Image data is usually GRAYSCALE + ALPHA and can be reduced to GRAYSCALE //ImageFormat(&image, PIXELFORMAT_UNCOMPRESSED_GRAYSCALE); @@ -874,7 +874,7 @@ bool ExportFontAsCode(Font font, const char *fileName) // WARNING: Data is compressed using raylib CompressData() DEFLATE, // it requires to be decompressed with raylib DecompressData(), that requires // compiling raylib with SUPPORT_COMPRESSION_API config flag enabled - + // Compress font image data int compDataSize = 0; unsigned char *compData = CompressData(image.data, imageDataSize, &compDataSize); diff --git a/src/rtextures.c b/src/rtextures.c index 12732274f..c4cf1903e 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -133,7 +133,7 @@ #if defined(SUPPORT_FILEFORMAT_QOI) #define QOI_MALLOC RL_MALLOC #define QOI_FREE RL_FREE - + #define QOI_IMPLEMENTATION #include "external/qoi.h" #endif @@ -375,7 +375,7 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i } #endif #if defined(SUPPORT_FILEFORMAT_QOI) - else if (strcmp(fileType, ".qoi") == 0) + else if (strcmp(fileType, ".qoi") == 0) { qoi_desc desc = { 0 }; image.data = qoi_decode(fileData, dataSize, &desc, 4); @@ -500,7 +500,7 @@ bool ExportImage(Image image, const char *fileName) else if (IsFileExtension(fileName, ".tga")) success = stbi_write_tga(fileName, image.width, image.height, channels, imgData); #endif #if defined(SUPPORT_FILEFORMAT_JPG) - else if (IsFileExtension(fileName, ".jpg") || + else if (IsFileExtension(fileName, ".jpg") || IsFileExtension(fileName, ".jpeg")) success = stbi_write_jpg(fileName, image.width, image.height, channels, imgData, 90); // JPG quality: between 1 and 100 #endif #if defined(SUPPORT_FILEFORMAT_QOI) @@ -510,11 +510,11 @@ bool ExportImage(Image image, const char *fileName) if (image.format == PIXELFORMAT_UNCOMPRESSED_R8G8B8) channels = 3; else if (image.format == PIXELFORMAT_UNCOMPRESSED_R8G8B8A8) channels = 4; else TRACELOG(LOG_WARNING, "IMAGE: Image pixel format must be R8G8B8 or R8G8B8A8"); - + if ((channels == 3) || (channels == 4)) { qoi_desc desc = { 0 }; - desc.width = image.width; + desc.width = image.width; desc.height = image.height; desc.channels = channels; desc.colorspace = QOI_SRGB; @@ -2771,7 +2771,7 @@ void ImageDraw(Image *dst, Image src, Rectangle srcRec, Rectangle dstRec, Color // [x] Consider fast path: same src/dst format with no alpha -> direct line copy // [-] GetPixelColor(): Get Vector4 instead of Color, easier for ColorAlphaBlend() // [ ] Support f32bit channels drawing - + // TODO: Support PIXELFORMAT_UNCOMPRESSED_R32, PIXELFORMAT_UNCOMPRESSED_R32G32B32, PIXELFORMAT_UNCOMPRESSED_R32G32B32A32 Color colSrc, colDst, blend; @@ -2954,7 +2954,7 @@ TextureCubemap LoadTextureCubemap(Image image, int layout) ImageFormat(&faces, image.format); // NOTE: Image formating does not work with compressed textures - + for (int i = 0; i < 6; i++) ImageDraw(&faces, image, faceRecs[i], (Rectangle){ 0, (float)size*i, (float)size, (float)size }, WHITE); } diff --git a/src/shell.html b/src/shell.html index 333f6528f..3ab8c3a30 100644 --- a/src/shell.html +++ b/src/shell.html @@ -3,14 +3,14 @@ - + raylib web game - + - + @@ -26,30 +26,30 @@ - + - +

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

iKj03J5#Rd#@AKs+)caI7UhUm}?)b^a0r}H! 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 t>K(K8IM~l(2X;CZlRCk}LI9K^7 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