From 92f68ac6be5b85b85ebab64841c8322405e08d51 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Mon, 24 Dec 2018 14:09:51 +0100 Subject: Review DrawPolyEx() Also reviewed rlCheckBufferLimit() --- src/raylib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 430e66db..023d35c7 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -470,7 +470,7 @@ typedef enum { KEY_X = 88, KEY_Y = 89, KEY_Z = 90, - + // Function keys KEY_SPACE = 32, KEY_ESCAPE = 256, @@ -517,7 +517,7 @@ typedef enum { KEY_BACKSLASH = 92, KEY_RIGHT_BRACKET = 93, KEY_GRAVE = 96, - + // Keypad keys KEY_KP_0 = 320, KEY_KP_1 = 321, -- cgit v1.2.3 From 96207a8a026a629fcc3026efab96cf18e1302618 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 25 Dec 2018 15:17:42 +0100 Subject: REVIEWED: LoadFontEx() Changed parameters order for consistency with LoadFontData() and other functions when an array is passed by parameter and array size is the following parameter. --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 023d35c7..d4b5bd20 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1095,7 +1095,7 @@ RLAPI void DrawTextureNPatch(Texture2D texture, NPatchInfo nPatchInfo, Rectangle // 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 charsCount, int *fontChars); // Load font from file with extended parameters +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 CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use RLAPI Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info -- cgit v1.2.3 From 9a8320c52bf179633c33f16d4f0adbf57f820b1b Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 26 Dec 2018 10:51:13 +0100 Subject: REVIEWED: DrawRectanglePro() --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index d4b5bd20..baac5a8c 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -986,7 +986,7 @@ RLAPI void DrawCircleLines(int centerX, int centerY, float radius, Color color); RLAPI void DrawRectangle(int posX, int posY, int width, int height, Color color); // Draw a color-filled rectangle RLAPI void DrawRectangleV(Vector2 position, Vector2 size, Color color); // Draw a color-filled rectangle (Vector version) RLAPI void DrawRectangleRec(Rectangle rec, Color color); // Draw a color-filled rectangle -RLAPI void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color colors[4]); // Draw a color-filled rectangle with pro parameters +RLAPI void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color color); // Draw a color-filled rectangle with pro parameters RLAPI void DrawRectangleGradientV(int posX, int posY, int width, int height, Color color1, Color color2);// Draw a vertical-gradient-filled rectangle RLAPI void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2);// Draw a horizontal-gradient-filled rectangle RLAPI void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); // Draw a gradient-filled rectangle with custom vertex colors -- cgit v1.2.3 From 01338b0a14f053d281970a32595bc531e8c70885 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 26 Dec 2018 13:26:34 +0100 Subject: WARNING: BREAKING CHANGE Added a bunch of useful text management functions. Consequently, some already available functions like `FormatText()` and `SubText()` has been renamed for consistency. Created temporal fallbacks for old names. raylib version bumped to 2.3. --- src/raylib.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index baac5a8c..3cad19fb 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -135,6 +135,11 @@ #define MAGENTA CLITERAL{ 255, 0, 255, 255 } // Magenta #define RAYWHITE CLITERAL{ 245, 245, 245, 255 } // My own White (raylib logo) +// Temporal hack to avoid breaking old codebases using +// deprecated raylib implementation of these functions +#define FormatText TextFormat +#define SubText TextSubText + //---------------------------------------------------------------------------------- // Structures Definition //---------------------------------------------------------------------------------- @@ -1111,11 +1116,22 @@ RLAPI int MeasureText(const char *text, int fontSize); RLAPI Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing); // Measure string size for Font RLAPI int GetGlyphIndex(Font font, int character); // Get index position for a unicode character on font -// Text string edition functions -RLAPI const char *FormatText(const char *text, ...); // Formatting of text with variables to 'embed' -RLAPI const char *SubText(const char *text, int position, int length); // Get a piece of a text string -RLAPI char **SplitText(char *text, char delimiter, int *strCount); // Split text string into multiple strings (memory should be freed manually!) -RLAPI bool IsEqualText(const char *text1, const char *text2); // Check if two text string are equal +// Text strings management functions +// NOTE: Some strings allocate memory internally for returned strings, just be careful! +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) +RLAPI const char *TextSubtext(const char *text, int position, int length); // Get a piece of a text string +RLAPI const char *TextReplace(char *text, const char *replace, const char *by); // Replace text string (memory should be freed!) +RLAPI const char *TextInsert(const char *text, const char *insert, int position); // Insert text in a position (memory should be freed!) +RLAPI const char *TextJoin(const char **textList, int count, const char *delimiter); // Join text strings with delimiter +RLAPI char **TextSplit(const char *text, char delimiter, int *count); // Split text into multiple strings (memory should be freed!) +RLAPI void TextSplitEx(const char *text, char delimiter, int *count, const char **ptrs, int *lengths); // Get pointers to substrings separated by delimiter +RLAPI void TextAppend(char *text, const char *append, int *position); // Append text at specific position and move cursor! +RLAPI int TextFindIndex(const char *text, const char *find); // Find first text occurrence within a string +RLAPI const char *TextToUpper(const char *text); // Get upper case version of provided string +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 //------------------------------------------------------------------------------------ // Basic 3d Shapes Drawing Functions (Module: models) -- cgit v1.2.3 From 91a7b0e5ef7fbb3f58ebbf93e62512e96a5caf57 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 26 Dec 2018 13:57:10 +0100 Subject: Corrected typo --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 3cad19fb..a51c957f 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -138,7 +138,7 @@ // Temporal hack to avoid breaking old codebases using // deprecated raylib implementation of these functions #define FormatText TextFormat -#define SubText TextSubText +#define SubText TextSubtext //---------------------------------------------------------------------------------- // Structures Definition -- cgit v1.2.3 From 414c3ee1f97c2c939d68b1b99a72feec1e29112a Mon Sep 17 00:00:00 2001 From: raysan5 Date: Wed, 26 Dec 2018 23:44:16 +0100 Subject: ADDED: DrawTextureQuad() Useful for tiling and offset parameters definition. --- src/raylib.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index a51c957f..8535f8d5 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1090,8 +1090,9 @@ RLAPI void DrawTexture(Texture2D texture, int posX, int posY, Color tint); RLAPI void DrawTextureV(Texture2D texture, Vector2 position, Color tint); // Draw a Texture2D with position defined as Vector2 RLAPI void DrawTextureEx(Texture2D texture, Vector2 position, float rotation, float scale, Color tint); // Draw a Texture2D with extended parameters RLAPI void DrawTextureRec(Texture2D texture, Rectangle sourceRec, Vector2 position, Color tint); // Draw a part of a texture defined by a rectangle -RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, 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 destRec, Vector2 origin, float rotation, Color tint); // Draws a texture (or part of it) that stretches or shrinks nicely. +RLAPI void DrawTextureQuad(Texture2D texture, Vector2 tiling, Vector2 offset, Rectangle quad, Color tint); // Draw texture quad with tiling and offset parameters +RLAPI void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, 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 destRec, Vector2 origin, float rotation, Color tint); // Draws a texture (or part of it) that stretches or shrinks nicely //------------------------------------------------------------------------------------ // Font Loading and Text Drawing Functions (Module: text) @@ -1120,7 +1121,7 @@ RLAPI int GetGlyphIndex(Font font, int character); // NOTE: Some strings allocate memory internally for returned strings, just be careful! 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) +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 const char *TextReplace(char *text, const char *replace, const char *by); // Replace text string (memory should be freed!) RLAPI const char *TextInsert(const char *text, const char *insert, int position); // Insert text in a position (memory should be freed!) -- cgit v1.2.3 From 0619571149f1fde5500dec4b64a94541ef0981f2 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 29 Dec 2018 14:44:28 +0100 Subject: ADDED: DrawTextRec() and example --- src/raylib.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 8535f8d5..0e9e0155 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1110,7 +1110,8 @@ RLAPI void UnloadFont(Font font); // Text drawing functions RLAPI void DrawFPS(int posX, int posY); // Shows 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 DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits // Text misc. functions RLAPI int MeasureText(const char *text, int fontSize); // Measure string width for default font -- cgit v1.2.3 From 893329886451706033d8af4901cf7c251903a136 Mon Sep 17 00:00:00 2001 From: ChrisDill Date: Wed, 2 Jan 2019 10:14:55 +0000 Subject: Added SetMouseOffset - Changed mouseScale to Vector2. - Added SetMouseOffset to change XY of mouseScale. --- src/raylib.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 0e9e0155..9deb8f42 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -942,6 +942,7 @@ RLAPI int GetMouseY(void); // Returns mouse p RLAPI Vector2 GetMousePosition(void); // Returns mouse position XY RLAPI void SetMousePosition(Vector2 position); // Set mouse position XY RLAPI void SetMouseScale(float scale); // Set mouse scaling +RLAPI void SetMouseOffset(Vector2 scale); // Set mouse scaling XY RLAPI int GetMouseWheelMove(void); // Returns mouse wheel movement Y // Input-related functions: touch -- cgit v1.2.3 From f9c43dc379165927e847981ec9e14eb5d3b14534 Mon Sep 17 00:00:00 2001 From: ChrisDill Date: Wed, 2 Jan 2019 19:09:34 +0000 Subject: Mouse functions changed - SetMouseScale changed to take in a Vector2. - Added mouseOffset global which is used in mouse read functions. --- src/raylib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 9deb8f42..2fef4fc8 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -941,8 +941,8 @@ RLAPI int GetMouseX(void); // Returns mouse p RLAPI int GetMouseY(void); // Returns mouse position Y RLAPI Vector2 GetMousePosition(void); // Returns mouse position XY RLAPI void SetMousePosition(Vector2 position); // Set mouse position XY -RLAPI void SetMouseScale(float scale); // Set mouse scaling -RLAPI void SetMouseOffset(Vector2 scale); // Set mouse scaling XY +RLAPI void SetMouseScale(Vector2 scale); // Set mouse scaling +RLAPI void SetMouseOffset(Vector2 scale); // Set mouse offset RLAPI int GetMouseWheelMove(void); // Returns mouse wheel movement Y // Input-related functions: touch -- cgit v1.2.3 From d427f17210170b4ae0f185208db504264056d3c1 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 3 Jan 2019 13:53:20 +0100 Subject: REVIEWED some functions parameters Decided to allow user to provide values directly instead of requiring a Vector2 struct, probably more confortable to use. - SetMousePosition() - SetMouseOffset() - SetMouseScale() --- src/raylib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 2fef4fc8..c6156c10 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -940,9 +940,9 @@ RLAPI bool IsMouseButtonUp(int button); // Detect if a mou RLAPI int GetMouseX(void); // Returns mouse position X RLAPI int GetMouseY(void); // Returns mouse position Y RLAPI Vector2 GetMousePosition(void); // Returns mouse position XY -RLAPI void SetMousePosition(Vector2 position); // Set mouse position XY -RLAPI void SetMouseScale(Vector2 scale); // Set mouse scaling -RLAPI void SetMouseOffset(Vector2 scale); // Set mouse offset +RLAPI void SetMousePosition(int x, int y); // Set mouse position XY +RLAPI void SetMouseOffset(int offsetX, int offsetY); // Set mouse offset +RLAPI void SetMouseScale(float scaleX, float scaleY); // Set mouse scaling RLAPI int GetMouseWheelMove(void); // Returns mouse wheel movement Y // Input-related functions: touch -- cgit v1.2.3 From 644eddda11acefe38329cd8fea5b25c1a63ef778 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 3 Jan 2019 13:55:59 +0100 Subject: REMOVED: ShowLogo() Same functionality could be achieved using FLAGS... but also considering removing raylib logo animation... --- src/raylib.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index c6156c10..e422e6bc 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -878,7 +878,6 @@ RLAPI Color GetColor(int hexValue); // Returns a C RLAPI Color Fade(Color color, float alpha); // Color fade-in or fade-out, alpha goes from 0.0f to 1.0f // Misc. functions -RLAPI void ShowLogo(void); // Activate raylib logo at startup (can be done with flags) RLAPI void SetConfigFlags(unsigned char flags); // Setup window configuration flags (view FLAGS) RLAPI void SetTraceLog(unsigned char types); // Enable trace log message types (bit flags based) RLAPI void SetTraceLogCallback(TraceLogCallback callback); // Set a trace log callback to enable custom logging bypassing raylib's one -- cgit v1.2.3 From 5c614f69755623e346105d17c71697005bd2900c Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 5 Jan 2019 19:24:42 +0100 Subject: Some code tweaks --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index e422e6bc..6d4b08d0 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1241,7 +1241,7 @@ RLAPI Matrix GetMatrixModelview(); // Get RLAPI Texture2D GenTextureCubemap(Shader shader, Texture2D skyHDR, int size); // Generate cubemap texture from HDR texture RLAPI Texture2D GenTextureIrradiance(Shader shader, Texture2D cubemap, int size); // Generate irradiance texture using cubemap data RLAPI Texture2D GenTexturePrefilter(Shader shader, Texture2D cubemap, int size); // Generate prefilter texture using cubemap data -RLAPI Texture2D GenTextureBRDF(Shader shader, Texture2D cubemap, int size); // Generate BRDF texture using cubemap data +RLAPI Texture2D GenTextureBRDF(Shader shader, int size); // Generate BRDF texture using cubemap data // Shading begin/end functions RLAPI void BeginShaderMode(Shader shader); // Begin custom shader drawing -- cgit v1.2.3 From 73597332b6fb1fb934c703c32f287bde1f5b3292 Mon Sep 17 00:00:00 2001 From: Marco Lizza Date: Wed, 9 Jan 2019 16:18:00 +0100 Subject: Adding uniform array support for shaders. --- src/raylib.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 430e66db..6c47ae37 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1213,6 +1213,8 @@ RLAPI Texture2D GetTextureDefault(void); // Get RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location RLAPI void SetShaderValue(Shader shader, int uniformLoc, const float *value, int size); // Set shader uniform value (float) RLAPI void SetShaderValuei(Shader shader, int uniformLoc, const int *value, int size); // Set shader uniform value (int) +RLAPI void SetShaderValueArray(Shader shader, int uniformLoc, const float *value, int size, int count); // Set shader uniform value (array of float/vec2/vec3/vec4) +RLAPI void SetShaderValueArrayi(Shader shader, int uniformLoc, const int *value, int size, int count); // Set shader uniform value (array of int/ivec2/ivec3/ivec4) RLAPI void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat); // Set shader uniform value (matrix 4x4) RLAPI void SetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix) RLAPI void SetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix) -- cgit v1.2.3 From 55f8dbc755c2e31d2112e71439fef0d31e8090a6 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 10 Jan 2019 11:25:26 +0100 Subject: WARNING: Redesigned SetShaderValue() --- src/raylib.h | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 275a3b63..5e18ae00 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -676,6 +676,23 @@ typedef enum { #define LOC_MAP_DIFFUSE LOC_MAP_ALBEDO #define LOC_MAP_SPECULAR LOC_MAP_METALNESS +// Shader uniform data types +typedef enum { + UNIFORM_BOOL = 0, + UNIFORM_INT, + UNIFORM_UNIT, + UNIFORM_FLOAT, + UNIFORM_IVEC2, + UNIFORM_IVEC3, + UNIFORM_IVEC4, + UNIFORM_UVEC2, + UNIFORM_UVEC3, + UNIFORM_UVEC4, + UNIFORM_VEC2, + UNIFORM_VEC3, + UNIFORM_VEC4, +} ShaderUniformDataType; + // Material map type typedef enum { MAP_ALBEDO = 0, // MAP_DIFFUSE @@ -1229,10 +1246,8 @@ RLAPI Texture2D GetTextureDefault(void); // Get // Shader configuration functions RLAPI int GetShaderLocation(Shader shader, const char *uniformName); // Get shader uniform location -RLAPI void SetShaderValue(Shader shader, int uniformLoc, const float *value, int size); // Set shader uniform value (float) -RLAPI void SetShaderValuei(Shader shader, int uniformLoc, const int *value, int size); // Set shader uniform value (int) -RLAPI void SetShaderValueArray(Shader shader, int uniformLoc, const float *value, int size, int count); // Set shader uniform value (array of float/vec2/vec3/vec4) -RLAPI void SetShaderValueArrayi(Shader shader, int uniformLoc, const int *value, int size, int count); // Set shader uniform value (array of int/ivec2/ivec3/ivec4) +RLAPI void SetShaderValue(Shader shader, int uniformLoc, const void *value, int uniformType); // Set shader uniform value +RLAPI void SetShaderValueV(Shader shader, int uniformLoc, const void *value, int uniformType, int count); // Set shader uniform value vector RLAPI void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat); // Set shader uniform value (matrix 4x4) RLAPI void SetMatrixProjection(Matrix proj); // Set a custom projection matrix (replaces internal projection matrix) RLAPI void SetMatrixModelview(Matrix view); // Set a custom modelview matrix (replaces internal modelview matrix) -- cgit v1.2.3 From 64fd131ed584d063e4f1ee63050d19ca8413a32a Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 10 Jan 2019 12:28:23 +0100 Subject: Some improvements on SetShaderValue() - Unsigned int not supported on OpenGL ES 2.0 -> Removed - Reorganized enum -> Removed BOOL (not uniformType) - Support sample2D uniform type --- src/raylib.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/raylib.h') diff --git a/src/raylib.h b/src/raylib.h index 5e18ae00..ed863649 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -678,19 +678,15 @@ typedef enum { // Shader uniform data types typedef enum { - UNIFORM_BOOL = 0, + UNIFORM_FLOAT = 0, + UNIFORM_VEC2, + UNIFORM_VEC3, + UNIFORM_VEC4, UNIFORM_INT, - UNIFORM_UNIT, - UNIFORM_FLOAT, UNIFORM_IVEC2, UNIFORM_IVEC3, UNIFORM_IVEC4, - UNIFORM_UVEC2, - UNIFORM_UVEC3, - UNIFORM_UVEC4, - UNIFORM_VEC2, - UNIFORM_VEC3, - UNIFORM_VEC4, + UNIFORM_SAMPLER2D } ShaderUniformDataType; // Material map type -- cgit v1.2.3