From 7fab03c0b4f079a6450f03d82ca17f2e18be3477 Mon Sep 17 00:00:00 2001 From: hanaxars <156359933+hanaxars@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:41:20 +0300 Subject: [PATCH 01/28] Fix warnings (#4264) Fix following gcc warnings when SVG enabled: rtextures.c: In function 'LoadImageSvg': rtextures.c:374:52: warning: pointer targets in passing argument 1 of 'nsvgParse' differ in signedness [-Wpointer-sign] 374 | struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f); | ^~~~~~~~ | | | unsigned char * In file included from rtextures.c:230: external/nanosvg.h:2952:28: note: expected 'char *' but argument is of type 'unsigned char *' 2952 | NSVGimage* nsvgParse(char* input, const char* units, float dpi) | ~~~~~~^~~~~ rtextures.c:407:43: warning: comparison of distinct pointer types lacks a cast [-Wcompare-distinct-pointer-types] 407 | if (isSvgStringValid && (fileData != fileNameOrString)) UnloadFileData(fileData); | ^~ rtextures.c: In function 'LoadImageFromMemory': rtextures.c:614:52: warning: passing argument 1 of 'nsvgParse' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 614 | struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f); | ^~~~~~~~ external/nanosvg.h:2952:28: note: expected 'char *' but argument is of type 'const unsigned char *' 2952 | NSVGimage* nsvgParse(char* input, const char* units, float dpi) | ~~~~~~^~~~~ --- src/rtextures.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rtextures.c b/src/rtextures.c index 5fa01c9df..f2faa1850 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -371,7 +371,7 @@ Image LoadImageSvg(const char *fileNameOrString, int width, int height) if (isSvgStringValid) { - struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f); + struct NSVGimage *svgImage = nsvgParse((char *)fileData, "px", 96.0f); unsigned char *img = RL_MALLOC(width*height*4); @@ -404,7 +404,7 @@ Image LoadImageSvg(const char *fileNameOrString, int width, int height) nsvgDeleteRasterizer(rast); } - if (isSvgStringValid && (fileData != fileNameOrString)) UnloadFileData(fileData); + if (isSvgStringValid && (fileData != (unsigned char *)fileNameOrString)) UnloadFileData(fileData); } #else TRACELOG(LOG_WARNING, "SVG image support not enabled, image can not be loaded"); @@ -611,7 +611,7 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i (fileData[2] == 'v') && (fileData[3] == 'g')) { - struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f); + struct NSVGimage *svgImage = nsvgParse((char *)fileData, "px", 96.0f); unsigned char *img = RL_MALLOC(svgImage->width*svgImage->height*4); // Rasterize From 039df36f4b73cfd685c143f47e71abf93270e709 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 20 Aug 2024 19:13:18 +0200 Subject: [PATCH 02/28] REVIEWED: Automation events mouse wheel #4263 --- examples/core/core_automation_events.c | 70 +++++++++++++------------- src/rcore.c | 7 +-- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/examples/core/core_automation_events.c b/examples/core/core_automation_events.c index 319b013ba..64ca51fda 100644 --- a/examples/core/core_automation_events.c +++ b/examples/core/core_automation_events.c @@ -88,7 +88,7 @@ int main(void) // Update //---------------------------------------------------------------------------------- float deltaTime = 0.015f;//GetFrameTime(); - + // Dropped files logic //---------------------------------------------------------------------------------- if (IsFileDropped()) @@ -157,11 +157,6 @@ int main(void) } else player.canJump = true; - camera.zoom += ((float)GetMouseWheelMove()*0.05f); - - if (camera.zoom > 3.0f) camera.zoom = 3.0f; - else if (camera.zoom < 0.25f) camera.zoom = 0.25f; - if (IsKeyPressed(KEY_R)) { // Reset game state @@ -176,12 +171,44 @@ int main(void) } //---------------------------------------------------------------------------------- + // Events playing + // NOTE: Logic must be before Camera update because it depends on mouse-wheel value, + // that can be set by the played event... but some other inputs could be affected + //---------------------------------------------------------------------------------- + if (eventPlaying) + { + // NOTE: Multiple events could be executed in a single frame + while (playFrameCounter == aelist.events[currentPlayFrame].frame) + { + PlayAutomationEvent(aelist.events[currentPlayFrame]); + currentPlayFrame++; + + if (currentPlayFrame == aelist.count) + { + eventPlaying = false; + currentPlayFrame = 0; + playFrameCounter = 0; + + TraceLog(LOG_INFO, "FINISH PLAYING!"); + break; + } + } + + playFrameCounter++; + } + //---------------------------------------------------------------------------------- + // Update camera //---------------------------------------------------------------------------------- camera.target = player.position; camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f }; float minX = 1000, minY = 1000, maxX = -1000, maxY = -1000; + // WARNING: On event replay, mouse-wheel internal value is set + camera.zoom += ((float)GetMouseWheelMove()*0.05f); + if (camera.zoom > 3.0f) camera.zoom = 3.0f; + else if (camera.zoom < 0.25f) camera.zoom = 0.25f; + for (int i = 0; i < MAX_ENVIRONMENT_ELEMENTS; i++) { EnvElement *element = &envElements[i]; @@ -200,8 +227,8 @@ int main(void) if (min.y > 0) camera.offset.y = screenHeight/2 - min.y; //---------------------------------------------------------------------------------- - // Toggle events recording - if (IsKeyPressed(KEY_S)) + // Events management + if (IsKeyPressed(KEY_S)) // Toggle events recording { if (!eventPlaying) { @@ -222,7 +249,7 @@ int main(void) } } } - else if (IsKeyPressed(KEY_A)) + else if (IsKeyPressed(KEY_A)) // Toggle events playing (WARNING: Starts next frame) { if (!eventRecording && (aelist.count > 0)) { @@ -241,32 +268,7 @@ int main(void) camera.zoom = 1.0f; } } - - if (eventPlaying) - { - // NOTE: Multiple events could be executed in a single frame - while (playFrameCounter == aelist.events[currentPlayFrame].frame) - { - TraceLog(LOG_INFO, "PLAYING: PlayFrameCount: %i | currentPlayFrame: %i | Event Frame: %i, param: %i", - playFrameCounter, currentPlayFrame, aelist.events[currentPlayFrame].frame, aelist.events[currentPlayFrame].params[0]); - - PlayAutomationEvent(aelist.events[currentPlayFrame]); - currentPlayFrame++; - if (currentPlayFrame == aelist.count) - { - eventPlaying = false; - currentPlayFrame = 0; - playFrameCounter = 0; - - TraceLog(LOG_INFO, "FINISH PLAYING!"); - break; - } - } - - playFrameCounter++; - } - if (eventRecording || eventPlaying) frameCounter++; else frameCounter = 0; //---------------------------------------------------------------------------------- diff --git a/src/rcore.c b/src/rcore.c index 5485ce8ce..e8041ea41 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -669,7 +669,6 @@ void InitWindow(int width, int height, const char *title) #endif #endif - CORE.Time.frameCounter = 0; CORE.Window.shouldClose = false; @@ -2707,8 +2706,8 @@ void PlayAutomationEvent(AutomationEvent event) } break; case INPUT_MOUSE_WHEEL_MOTION: // param[0]: x delta, param[1]: y delta { - CORE.Input.Mouse.currentWheelMove.x = (float)event.params[0]; break; - CORE.Input.Mouse.currentWheelMove.y = (float)event.params[1]; break; + CORE.Input.Mouse.currentWheelMove.x = (float)event.params[0]; + CORE.Input.Mouse.currentWheelMove.y = (float)event.params[1]; } break; case INPUT_TOUCH_UP: CORE.Input.Touch.currentTouchState[event.params[0]] = false; break; // param[0]: id case INPUT_TOUCH_DOWN: CORE.Input.Touch.currentTouchState[event.params[0]] = true; break; // param[0]: id @@ -2745,6 +2744,8 @@ void PlayAutomationEvent(AutomationEvent event) case ACTION_SETTARGETFPS: SetTargetFPS(event.params[0]); break; default: break; } + + TRACELOG(LOG_INFO, "AUTOMATION PLAY: Frame: %i | Event type: %i | Event parameters: %i, %i, %i", event.frame, event.type, event.params[0], event.params[1], event.params[2]); } #endif } From fa3f73d88174fb66d9b275e2970e4d201e6a9ecb Mon Sep 17 00:00:00 2001 From: Paperdomo101 <38697390+Paperdomo101@users.noreply.github.com> Date: Wed, 21 Aug 2024 20:07:52 +0800 Subject: [PATCH 03/28] [rshapes] Review DrawGradient color parameter names (#4270) void DrawCircleGradient(int centerX, int centerY, float radius, Color color1, Color color2); void DrawRectangleGradientV(int posX, int posY, int width, int height, Color color1, Color color2); void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2); void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4); Have been changed to: void DrawCircleGradient(int centerX, int centerY, float radius, Color inner, Color outer); void DrawRectangleGradientV(int posX, int posY, int width, int height, Color top, Color bottom); void DrawRectangleGradientH(int posX, int posY, int width, int height, Color left, Color right); void DrawRectangleGradientEx(Rectangle rec, Color topLeft, Color bottomLeft, Color topRight, Color bottomRight); --- src/raylib.h | 8 ++++---- src/rshapes.c | 30 +++++++++++++----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/raylib.h b/src/raylib.h index 1cf34f004..0759c259f 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1238,7 +1238,7 @@ RLAPI void DrawLineBezier(Vector2 startPos, Vector2 endPos, float thick, Color c 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 -RLAPI void DrawCircleGradient(int centerX, int centerY, float radius, Color color1, Color color2); // Draw a gradient-filled circle +RLAPI void DrawCircleGradient(int centerX, int centerY, float radius, Color inner, Color outer); // Draw a gradient-filled circle RLAPI void DrawCircleV(Vector2 center, float radius, Color color); // Draw a color-filled circle (Vector version) RLAPI void DrawCircleLines(int centerX, int centerY, float radius, Color color); // Draw circle outline RLAPI void DrawCircleLinesV(Vector2 center, float radius, Color color); // Draw circle outline (Vector version) @@ -1250,9 +1250,9 @@ RLAPI void DrawRectangle(int posX, int posY, int width, int height, Color color) 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 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 +RLAPI void DrawRectangleGradientV(int posX, int posY, int width, int height, Color top, Color bottom); // Draw a vertical-gradient-filled rectangle +RLAPI void DrawRectangleGradientH(int posX, int posY, int width, int height, Color left, Color right); // Draw a horizontal-gradient-filled rectangle +RLAPI void DrawRectangleGradientEx(Rectangle rec, Color topLeft, Color bottomLeft, Color topRight, Color bottomRight); // Draw a gradient-filled rectangle with custom vertex colors RLAPI void DrawRectangleLines(int posX, int posY, int width, int height, Color color); // Draw rectangle outline RLAPI void DrawRectangleLinesEx(Rectangle rec, float lineThick, Color color); // Draw rectangle outline with extended parameters RLAPI void DrawRectangleRounded(Rectangle rec, float roundness, int segments, Color color); // Draw rectangle with rounded edges diff --git a/src/rshapes.c b/src/rshapes.c index 676b2521a..66dfbf3b6 100644 --- a/src/rshapes.c +++ b/src/rshapes.c @@ -430,17 +430,16 @@ void DrawCircleSectorLines(Vector2 center, float radius, float startAngle, float } // Draw a gradient-filled circle -// NOTE: Gradient goes from center (color1) to border (color2) -void DrawCircleGradient(int centerX, int centerY, float radius, Color color1, Color color2) +void DrawCircleGradient(int centerX, int centerY, float radius, Color inner, Color outer) { rlBegin(RL_TRIANGLES); for (int i = 0; i < 360; i += 10) { - rlColor4ub(color1.r, color1.g, color1.b, color1.a); + rlColor4ub(inner.r, inner.g, inner.b, inner.a); rlVertex2f((float)centerX, (float)centerY); - rlColor4ub(color2.r, color2.g, color2.b, color2.a); + rlColor4ub(outer.r, outer.g, outer.b, outer.a); rlVertex2f((float)centerX + cosf(DEG2RAD*(i + 10))*radius, (float)centerY + sinf(DEG2RAD*(i + 10))*radius); - rlColor4ub(color2.r, color2.g, color2.b, color2.a); + rlColor4ub(outer.r, outer.g, outer.b, outer.a); rlVertex2f((float)centerX + cosf(DEG2RAD*i)*radius, (float)centerY + sinf(DEG2RAD*i)*radius); } rlEnd(); @@ -761,22 +760,19 @@ void DrawRectanglePro(Rectangle rec, Vector2 origin, float rotation, Color color } // Draw a vertical-gradient-filled rectangle -// NOTE: Gradient goes from bottom (color1) to top (color2) -void DrawRectangleGradientV(int posX, int posY, int width, int height, Color color1, Color color2) +void DrawRectangleGradientV(int posX, int posY, int width, int height, Color top, Color bottom) { - DrawRectangleGradientEx((Rectangle){ (float)posX, (float)posY, (float)width, (float)height }, color1, color2, color2, color1); + DrawRectangleGradientEx((Rectangle){ (float)posX, (float)posY, (float)width, (float)height }, top, bottom, bottom, top); } // Draw a horizontal-gradient-filled rectangle -// NOTE: Gradient goes from bottom (color1) to top (color2) -void DrawRectangleGradientH(int posX, int posY, int width, int height, Color color1, Color color2) +void DrawRectangleGradientH(int posX, int posY, int width, int height, Color left, Color right) { - DrawRectangleGradientEx((Rectangle){ (float)posX, (float)posY, (float)width, (float)height }, color1, color1, color2, color2); + DrawRectangleGradientEx((Rectangle){ (float)posX, (float)posY, (float)width, (float)height }, left, left, right, right); } // Draw a gradient-filled rectangle -// NOTE: Colors refer to corners, starting at top-lef corner and counter-clockwise -void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, Color col4) +void DrawRectangleGradientEx(Rectangle rec, Color topLeft, Color bottomLeft, Color topRight, Color bottomRight) { rlSetTexture(GetShapesTexture().id); Rectangle shapeRect = GetShapesTextureRectangle(); @@ -785,19 +781,19 @@ void DrawRectangleGradientEx(Rectangle rec, Color col1, Color col2, Color col3, rlNormal3f(0.0f, 0.0f, 1.0f); // NOTE: Default raylib font character 95 is a white square - rlColor4ub(col1.r, col1.g, col1.b, col1.a); + rlColor4ub(topLeft.r, topLeft.g, topLeft.b, topLeft.a); rlTexCoord2f(shapeRect.x/texShapes.width, shapeRect.y/texShapes.height); rlVertex2f(rec.x, rec.y); - rlColor4ub(col2.r, col2.g, col2.b, col2.a); + rlColor4ub(bottomLeft.r, bottomLeft.g, bottomLeft.b, bottomLeft.a); rlTexCoord2f(shapeRect.x/texShapes.width, (shapeRect.y + shapeRect.height)/texShapes.height); rlVertex2f(rec.x, rec.y + rec.height); - rlColor4ub(col3.r, col3.g, col3.b, col3.a); + rlColor4ub(topRight.r, topRight.g, topRight.b, topRight.a); rlTexCoord2f((shapeRect.x + shapeRect.width)/texShapes.width, (shapeRect.y + shapeRect.height)/texShapes.height); rlVertex2f(rec.x + rec.width, rec.y + rec.height); - rlColor4ub(col4.r, col4.g, col4.b, col4.a); + rlColor4ub(bottomRight.r, bottomRight.g, bottomRight.b, bottomRight.a); rlTexCoord2f((shapeRect.x + shapeRect.width)/texShapes.width, shapeRect.y/texShapes.height); rlVertex2f(rec.x + rec.width, rec.y); rlEnd(); From bae0af241ed8ecf0b8107d3d3c43fef297e038d3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 21 Aug 2024 12:08:09 +0000 Subject: [PATCH 04/28] Update raylib_api.* by CI --- parser/output/raylib_api.json | 20 ++++++++++---------- parser/output/raylib_api.lua | 20 ++++++++++---------- parser/output/raylib_api.txt | 20 ++++++++++---------- parser/output/raylib_api.xml | 20 ++++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json index f149d628f..c4ce91e87 100644 --- a/parser/output/raylib_api.json +++ b/parser/output/raylib_api.json @@ -5485,11 +5485,11 @@ }, { "type": "Color", - "name": "color1" + "name": "inner" }, { "type": "Color", - "name": "color2" + "name": "outer" } ] }, @@ -5785,11 +5785,11 @@ }, { "type": "Color", - "name": "color1" + "name": "top" }, { "type": "Color", - "name": "color2" + "name": "bottom" } ] }, @@ -5816,11 +5816,11 @@ }, { "type": "Color", - "name": "color1" + "name": "left" }, { "type": "Color", - "name": "color2" + "name": "right" } ] }, @@ -5835,19 +5835,19 @@ }, { "type": "Color", - "name": "col1" + "name": "topLeft" }, { "type": "Color", - "name": "col2" + "name": "bottomLeft" }, { "type": "Color", - "name": "col3" + "name": "topRight" }, { "type": "Color", - "name": "col4" + "name": "bottomRight" } ] }, diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua index 7c00fff33..3a9e2f04f 100644 --- a/parser/output/raylib_api.lua +++ b/parser/output/raylib_api.lua @@ -4697,8 +4697,8 @@ return { {type = "int", name = "centerX"}, {type = "int", name = "centerY"}, {type = "float", name = "radius"}, - {type = "Color", name = "color1"}, - {type = "Color", name = "color2"} + {type = "Color", name = "inner"}, + {type = "Color", name = "outer"} } }, { @@ -4835,8 +4835,8 @@ return { {type = "int", name = "posY"}, {type = "int", name = "width"}, {type = "int", name = "height"}, - {type = "Color", name = "color1"}, - {type = "Color", name = "color2"} + {type = "Color", name = "top"}, + {type = "Color", name = "bottom"} } }, { @@ -4848,8 +4848,8 @@ return { {type = "int", name = "posY"}, {type = "int", name = "width"}, {type = "int", name = "height"}, - {type = "Color", name = "color1"}, - {type = "Color", name = "color2"} + {type = "Color", name = "left"}, + {type = "Color", name = "right"} } }, { @@ -4858,10 +4858,10 @@ return { returnType = "void", params = { {type = "Rectangle", name = "rec"}, - {type = "Color", name = "col1"}, - {type = "Color", name = "col2"}, - {type = "Color", name = "col3"}, - {type = "Color", name = "col4"} + {type = "Color", name = "topLeft"}, + {type = "Color", name = "bottomLeft"}, + {type = "Color", name = "topRight"}, + {type = "Color", name = "bottomRight"} } }, { diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt index 73170c860..afa9b525d 100644 --- a/parser/output/raylib_api.txt +++ b/parser/output/raylib_api.txt @@ -2176,8 +2176,8 @@ Function 217: DrawCircleGradient() (5 input parameters) Param[1]: centerX (type: int) Param[2]: centerY (type: int) Param[3]: radius (type: float) - Param[4]: color1 (type: Color) - Param[5]: color2 (type: Color) + Param[4]: inner (type: Color) + Param[5]: outer (type: Color) Function 218: DrawCircleV() (3 input parameters) Name: DrawCircleV Return type: void @@ -2278,8 +2278,8 @@ Function 229: DrawRectangleGradientV() (6 input parameters) Param[2]: posY (type: int) Param[3]: width (type: int) Param[4]: height (type: int) - Param[5]: color1 (type: Color) - Param[6]: color2 (type: Color) + Param[5]: top (type: Color) + Param[6]: bottom (type: Color) Function 230: DrawRectangleGradientH() (6 input parameters) Name: DrawRectangleGradientH Return type: void @@ -2288,17 +2288,17 @@ Function 230: DrawRectangleGradientH() (6 input parameters) Param[2]: posY (type: int) Param[3]: width (type: int) Param[4]: height (type: int) - Param[5]: color1 (type: Color) - Param[6]: color2 (type: Color) + Param[5]: left (type: Color) + Param[6]: right (type: Color) Function 231: DrawRectangleGradientEx() (5 input parameters) Name: DrawRectangleGradientEx Return type: void Description: Draw a gradient-filled rectangle with custom vertex colors Param[1]: rec (type: Rectangle) - Param[2]: col1 (type: Color) - Param[3]: col2 (type: Color) - Param[4]: col3 (type: Color) - Param[5]: col4 (type: Color) + Param[2]: topLeft (type: Color) + Param[3]: bottomLeft (type: Color) + Param[4]: topRight (type: Color) + Param[5]: bottomRight (type: Color) Function 232: DrawRectangleLines() (5 input parameters) Name: DrawRectangleLines Return type: void diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml index 474bc0473..8a6560f48 100644 --- a/parser/output/raylib_api.xml +++ b/parser/output/raylib_api.xml @@ -1353,8 +1353,8 @@ - - + + @@ -1431,23 +1431,23 @@ - - + + - - + + - - - - + + + + From c8bee7c439d3a49d63ab0e67441fffb56ea4bf2a Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Wed, 21 Aug 2024 08:11:59 -0700 Subject: [PATCH 05/28] [rmodels] Add a warning when loading an OBJ with multiple materials. (#4271) * Update raylib_api.* by CI * Add a temp warning about material assignments during OBJ loading if the file has more than one material. To be replaced when the OBJ translation code is fixed. --------- Co-authored-by: github-actions[bot] --- src/rmodels.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rmodels.c b/src/rmodels.c index 36a7e254d..8afa3df57 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -4092,6 +4092,12 @@ static Model LoadOBJ(const char *fileName) model.materialCount = 1; TRACELOG(LOG_INFO, "MODEL: No materials provided, setting one default material for all meshes"); } + else if (model.materialCount > 1 && model.meshCount > 1) + { + // TEMP warning about multiple materials, to be removed when proper splitting code is implemented + // any obj with multiple materials will need to have it's materials assigned by the user in code to work at this time + TRACELOG(LOG_INFO, "MODEL: OBJ has multiple materials, manual material assignment will be required."); + } // Init model meshes and materials model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh)); From cc88e0b780a7cc265e60a2e0842e587dd9b1c293 Mon Sep 17 00:00:00 2001 From: listeria <56203103+ListeriaM@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:45:14 -0300 Subject: [PATCH 06/28] rtext: always multiply by sign in TextToFloat() (#4273) Co-authored-by: Listeria monocytogenes --- src/rtext.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rtext.c b/src/rtext.c index 755b15efd..8c1dc3c5e 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -1467,8 +1467,7 @@ float TextToFloat(const char *text) int i = 0; for (; ((text[i] >= '0') && (text[i] <= '9')); i++) value = value*10.0f + (float)(text[i] - '0'); - if (text[i++] != '.') value *= sign; - else + if (text[i++] == '.') { float divisor = 10.0f; for (; ((text[i] >= '0') && (text[i] <= '9')); i++) @@ -1478,7 +1477,7 @@ float TextToFloat(const char *text) } } - return value; + return value*sign; } #if defined(SUPPORT_TEXT_MANIPULATION) From 74350fa7cf89f7e04e532a4cb89ff036f98fe59c Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Fri, 23 Aug 2024 21:21:22 +0100 Subject: [PATCH 07/28] [build] CMake: Delete BuildOptions.cmake (#4277) This file seems to not do anything useful. From what I can tell the OSX_FATLIB option sets CMAKE_OSX_ARCHITECTURES to "x86_64;i386". This doesn't account for the arm that apple now has, as well as 32 bit support being completely removed, and I think it's entirely reasonable to expect users to pass the necessary architectures they want themselves. It's possible this could break some users who rely on this, but I sincerely doubt anyone does. The solution is trivial either way (put -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" on the command line yourself) The second part of BuildOptions.cmake claims to set PLATFORM to "Web" if the emscripten toolchain file is used (if (EMSCRIPTEN)), but it does not work correctly anyway. Currently, glfw searches for wayland and x11 libraries and fails likeso: CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:645 (message): The following required packages were not found: - wayland-client>=0.2.7 - wayland-cursor>=0.2.7 - wayland-egl>=0.2.7 - xkbcommon>=0.5.0 Call Stack (most recent call first): /usr/share/cmake/Modules/FindPkgConfig.cmake:873 (_pkg_check_modules_internal) src/external/glfw/src/CMakeLists.txt:163 (pkg_check_modules) Considering this code doesn't work as described, it's okay to delete it. I think a better check should be implemented, but that is for a different PR. --- CMakeLists.txt | 3 --- CMakeOptions.txt | 1 - cmake/BuildOptions.cmake | 18 ------------------ 3 files changed, 22 deletions(-) delete mode 100644 cmake/BuildOptions.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a5e3408c8..678d8e372 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,9 +36,6 @@ include(CompilerFlags) # Registers build options that are exposed to cmake include(CMakeOptions.txt) -# Enforces a few environment and compiler configurations -include(BuildOptions) - if (UNIX AND NOT APPLE) if (NOT GLFW_BUILD_WAYLAND AND NOT GLFW_BUILD_X11) MESSAGE(FATAL_ERROR "Cannot disable both Wayland and X11") diff --git a/CMakeOptions.txt b/CMakeOptions.txt index b063f02a1..ce9141e22 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -16,7 +16,6 @@ option(ENABLE_MSAN "Enable MemorySanitizer (MSan) for debugging (not recommended # Shared library is always PIC. Static library should be PIC too if linked into a shared library option(WITH_PIC "Compile static library as position-independent code" OFF) option(BUILD_SHARED_LIBS "Build raylib as a shared library" OFF) -option(MACOS_FATLIB "Build fat library for both i386 and x86_64 on macOS" OFF) cmake_dependent_option(USE_AUDIO "Build raylib with audio module" ON CUSTOMIZE_BUILD ON) enum_option(USE_EXTERNAL_GLFW "OFF;IF_POSSIBLE;ON" "Link raylib against system GLFW instead of embedded one") diff --git a/cmake/BuildOptions.cmake b/cmake/BuildOptions.cmake deleted file mode 100644 index 0fce64292..000000000 --- a/cmake/BuildOptions.cmake +++ /dev/null @@ -1,18 +0,0 @@ -if(${PLATFORM} MATCHES "Desktop" AND APPLE) - if(MACOS_FATLIB) - if (CMAKE_OSX_ARCHITECTURES) - message(FATAL_ERROR "User supplied -DCMAKE_OSX_ARCHITECTURES overrides -DMACOS_FATLIB=ON") - else() - set(CMAKE_OSX_ARCHITECTURES "x86_64;i386") - endif() - endif() -endif() - -# This helps support the case where emsdk toolchain file is used -# either by setting it with -DCMAKE_TOOLCHAIN_FILE=/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -# or by using "emcmake cmake -B build -S ." as described in https://emscripten.org/docs/compiling/Building-Projects.html -if(EMSCRIPTEN) - SET(PLATFORM Web CACHE STRING "Forcing PLATFORM_WEB because EMSCRIPTEN was detected") -endif() - -# vim: ft=cmake From 77172e34db5d27bb5413f9232215321b8cceac67 Mon Sep 17 00:00:00 2001 From: Bugsia <74007012+Bugsia@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:22:36 +0200 Subject: [PATCH 08/28] Fixing GenImagePerlinNoise() being stretched, if Image is not rectangular (#4276) --- src/rtextures.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rtextures.c b/src/rtextures.c index f2faa1850..867add38e 100644 --- a/src/rtextures.c +++ b/src/rtextures.c @@ -1112,6 +1112,7 @@ Image GenImagePerlinNoise(int width, int height, int offsetX, int offsetY, float { Color *pixels = (Color *)RL_MALLOC(width*height*sizeof(Color)); + float aspectRatio = (float)width / (float)height; for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) @@ -1119,6 +1120,10 @@ Image GenImagePerlinNoise(int width, int height, int offsetX, int offsetY, float float nx = (float)(x + offsetX)*(scale/(float)width); float ny = (float)(y + offsetY)*(scale/(float)height); + // Apply aspect ratio compensation to wider side + if (width > height) nx *= aspectRatio; + else ny /= aspectRatio; + // Basic perlin noise implementation (not used) //float p = (stb_perlin_noise3(nx, ny, 0.0f, 0, 0, 0); From ecf863969c2ca0cf903acb5bef0d403f611943b4 Mon Sep 17 00:00:00 2001 From: Peter0x44 Date: Fri, 23 Aug 2024 21:29:40 +0100 Subject: [PATCH 09/28] [build] CMake: Fix warnings in projects/CMake/CMakeLists.txt (#4278) Currently, when building, the cmake example in projects/CMake gives this warning, with CMake 3.30.2 CMake Warning (dev) at /usr/share/cmake/Modules/FetchContent.cmake:1953 (message): Calling FetchContent_Populate(raylib) is deprecated, call FetchContent_MakeAvailable(raylib) instead. Policy CMP0169 can be set to OLD to allow FetchContent_Populate(raylib) to be called directly for now, but the ability to call it with declared details will be removed completely in a future version. Call Stack (most recent call first): CMakeLists.txt:20 (FetchContent_Populate) This warning is for project developers. Use -Wno-dev to suppress it. Changing FetchContent_Populate to FetchContent_MakeAvailable didn't cause any issues I could observe when building. I'm not sure why it wasn't like that to begin with. --- projects/CMake/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 3b22964c5..a95d68a4f 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -17,9 +17,8 @@ if (NOT raylib_FOUND) # If there's none, fetch and build raylib FetchContent_GetProperties(raylib) if (NOT raylib_POPULATED) # Have we downloaded raylib yet? set(FETCHCONTENT_QUIET NO) - FetchContent_Populate(raylib) + FetchContent_MakeAvailable(raylib) set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) # don't build the supplied examples - add_subdirectory(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR}) endif() endif() From 3079c69725b3e4f07f6984dc2f67262bba48b153 Mon Sep 17 00:00:00 2001 From: Menno van der Graaf Date: Fri, 23 Aug 2024 22:32:20 +0200 Subject: [PATCH 10/28] Replace deprecated Android function ALooper_pollAll with ALooper_pollOnce (#4275) --- src/platforms/rcore_android.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/platforms/rcore_android.c b/src/platforms/rcore_android.c index 68ae979ee..7a2162025 100644 --- a/src/platforms/rcore_android.c +++ b/src/platforms/rcore_android.c @@ -281,14 +281,15 @@ void android_main(struct android_app *app) // Request to end the native activity ANativeActivity_finish(app->activity); - // Android ALooper_pollAll() variables + // Android ALooper_pollOnce() variables int pollResult = 0; int pollEvents = 0; // Waiting for application events before complete finishing while (!app->destroyRequested) { - while ((pollResult = ALooper_pollAll(0, NULL, &pollEvents, (void **)&platform.source)) >= 0) + // Poll all events until we reach return value TIMEOUT, meaning no events left to process + while ((pollResult = ALooper_pollOnce(0, NULL, &pollEvents, (void **)&platform.source)) > ALOOPER_POLL_TIMEOUT) { if (platform.source != NULL) platform.source->process(app, platform.source); } @@ -682,13 +683,13 @@ void PollInputEvents(void) CORE.Input.Keyboard.keyRepeatInFrame[i] = 0; } - // Android ALooper_pollAll() variables + // Android ALooper_pollOnce() variables int pollResult = 0; int pollEvents = 0; - // Poll Events (registered events) + // Poll Events (registered events) until we reach TIMEOUT which indicates there are no events left to poll // NOTE: Activity is paused if not enabled (platform.appEnabled) - while ((pollResult = ALooper_pollAll(platform.appEnabled? 0 : -1, NULL, &pollEvents, (void**)&platform.source)) >= 0) + while ((pollResult = ALooper_pollOnce(platform.appEnabled? 0 : -1, NULL, &pollEvents, (void**)&platform.source)) > ALOOPER_POLL_TIMEOUT) { // Process this event if (platform.source != NULL) platform.source->process(platform.app, platform.source); @@ -767,15 +768,15 @@ int InitPlatform(void) TRACELOG(LOG_INFO, "PLATFORM: ANDROID: Initialized successfully"); - // Android ALooper_pollAll() variables + // Android ALooper_pollOnce() variables int pollResult = 0; int pollEvents = 0; // Wait for window to be initialized (display and context) while (!CORE.Window.ready) { - // Process events loop - while ((pollResult = ALooper_pollAll(0, NULL, &pollEvents, (void**)&platform.source)) >= 0) + // Process events until we reach TIMEOUT, which indicates no more events queued. + while ((pollResult = ALooper_pollOnce(0, NULL, &pollEvents, (void**)&platform.source)) > ALOOPER_POLL_TIMEOUT) { // Process this event if (platform.source != NULL) platform.source->process(platform.app, platform.source); From b0c3013b51c5dbb03e584aad04fe00d89e121946 Mon Sep 17 00:00:00 2001 From: konstruktor227 Date: Fri, 23 Aug 2024 22:51:29 +0200 Subject: [PATCH 11/28] [raudio] Support 24-bit FLACs in `LoadMusicStreamFromMemory` (#4279) Force conversion to 16-bit, same as how it is done in `LoadMusicStream`. This fixes the problem where 24-bit FLACs play silence or broken sound. --- src/raudio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/raudio.c b/src/raudio.c index 21d1adae3..79d53b565 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1626,7 +1626,9 @@ Music LoadMusicStreamFromMemory(const char *fileType, const unsigned char *data, { music.ctxType = MUSIC_AUDIO_FLAC; music.ctxData = ctxFlac; - music.stream = LoadAudioStream(ctxFlac->sampleRate, ctxFlac->bitsPerSample, ctxFlac->channels); + int sampleSize = ctxFlac->bitsPerSample; + if (ctxFlac->bitsPerSample == 24) sampleSize = 16; // Forcing conversion to s16 on UpdateMusicStream() + music.stream = LoadAudioStream(ctxFlac->sampleRate, sampleSize, ctxFlac->channels); music.frameCount = (unsigned int)ctxFlac->totalPCMFrameCount; music.looping = true; // Looping enabled by default musicLoaded = true; From 7bde76ca2c649213546f412c28b7b05260338ad4 Mon Sep 17 00:00:00 2001 From: Reese Gallagher Date: Sat, 24 Aug 2024 12:42:38 -0400 Subject: [PATCH 12/28] [rmodels] More performant point cloud rendering with `DrawModelPoints()` (#4203) * Added the ability to draw a model as a point cloud * Added example to demonstrate drawing a model as a point cloud * polished the demo a bit * picture for example * adhere to conventions for example * update png to match aspect ratio * minor changes * address code convention comments * added point rendering to makefiles * added point rendering to readme and renumbered examples * comment formatting --------- Co-authored-by: Reese Gallagher Co-authored-by: Ray --- examples/Makefile | 1 + examples/Makefile.Web | 1 + examples/README.md | 50 +++--- examples/models/models_point_rendering.c | 171 +++++++++++++++++++++ examples/models/models_point_rendering.png | Bin 0 -> 130183 bytes src/raylib.h | 2 + src/rmodels.c | 24 +++ 7 files changed, 224 insertions(+), 25 deletions(-) create mode 100644 examples/models/models_point_rendering.c create mode 100644 examples/models/models_point_rendering.png diff --git a/examples/Makefile b/examples/Makefile index 93b05a0c7..904917f7c 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -582,6 +582,7 @@ MODELS = \ models/models_mesh_generation \ models/models_mesh_picking \ models/models_orthographic_projection \ + models/models_point_rendering \ models/models_rlgl_solar_system \ models/models_skybox \ models/models_waving_cubes \ diff --git a/examples/Makefile.Web b/examples/Makefile.Web index 46a8a98ea..7057da1c0 100644 --- a/examples/Makefile.Web +++ b/examples/Makefile.Web @@ -447,6 +447,7 @@ MODELS = \ models/models_mesh_generation \ models/models_mesh_picking \ models/models_orthographic_projection \ + models/models_point_rendering \ models/models_rlgl_solar_system \ models/models_skybox \ models/models_waving_cubes \ diff --git a/examples/README.md b/examples/README.md index 317f43c89..d573ff23e 100644 --- a/examples/README.md +++ b/examples/README.md @@ -147,11 +147,12 @@ Examples using raylib models functionality, including models loading/generation | 91 | [models_loading_vox](models/models_loading_vox.c) | models_loading_vox | ⭐️☆☆☆ | **4.0** | **4.0** | [Johann Nadalutti](https://github.com/procfxgen) | | 92 | [models_loading_m3d](models/models_loading_m3d.c) | models_loading_m3d | ⭐️☆☆☆ | **4.2** | **4.2** | [bzt](https://bztsrc.gitlab.io/model3d) | | 93 | [models_orthographic_projection](models/models_orthographic_projection.c) | models_orthographic_projection | ⭐️☆☆☆ | 2.0 | 3.7 | [Max Danielsson](https://github.com/autious) | -| 94 | [models_rlgl_solar_system](models/models_rlgl_solar_system.c) | models_rlgl_solar_system | ⭐️⭐️⭐️⭐️ | 2.5 | **4.0** | [Ray](https://github.com/raysan5) | -| 95 | [models_yaw_pitch_roll](models/models_yaw_pitch_roll.c) | models_yaw_pitch_roll | ⭐️⭐️☆☆ | 1.8 | **4.0** | [Berni](https://github.com/Berni8k) | -| 96 | [models_waving_cubes](models/models_waving_cubes.c) | models_waving_cubes | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [codecat](https://github.com/codecat) | -| 97 | [models_heightmap](models/models_heightmap.c) | models_heightmap | ⭐️☆☆☆ | 1.8 | 3.5 | [Ray](https://github.com/raysan5) | -| 98 | [models_skybox](models/models_skybox.c) | models_skybox | ⭐️⭐️☆☆ | 1.8 | **4.0** | [Ray](https://github.com/raysan5) | +| 94 | [models_point_rendering](models/models_point_rendering.c) | models_point_rendering | ⭐️⭐️☆☆ | 5.0 | 5.0 | [Reese Gallagher](https://github.com/satchelfrost) | +| 95 | [models_rlgl_solar_system](models/models_rlgl_solar_system.c) | models_rlgl_solar_system | ⭐️⭐️⭐️⭐️ | 2.5 | **4.0** | [Ray](https://github.com/raysan5) | +| 96 | [models_yaw_pitch_roll](models/models_yaw_pitch_roll.c) | models_yaw_pitch_roll | ⭐️⭐️☆☆ | 1.8 | **4.0** | [Berni](https://github.com/Berni8k) | +| 97 | [models_waving_cubes](models/models_waving_cubes.c) | models_waving_cubes | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [codecat](https://github.com/codecat) | +| 98 | [models_heightmap](models/models_heightmap.c) | models_heightmap | ⭐️☆☆☆ | 1.8 | 3.5 | [Ray](https://github.com/raysan5) | +| 99 | [models_skybox](models/models_skybox.c) | models_skybox | ⭐️⭐️☆☆ | 1.8 | **4.0** | [Ray](https://github.com/raysan5) | ### category: shaders @@ -159,26 +160,25 @@ Examples using raylib shaders functionality, including shaders loading, paramete | ## | example | image | difficulty
level | version
created | last version
updated | original
developer | |----|----------|--------|:-------------------:|:------------------:|:------------------:|:----------| -| 99 | [shaders_basic_lighting](shaders/shaders_basic_lighting.c) | shaders_basic_lighting | ⭐️⭐️⭐️⭐️ | 3.0 | **4.2** | [Chris Camacho](https://github.com/codifies) | -| 100 | [shaders_model_shader](shaders/shaders_model_shader.c) | shaders_model_shader | ⭐️⭐️☆☆ | 1.3 | 3.7 | [Ray](https://github.com/raysan5) | -| 101 | [shaders_shapes_textures](shaders/shaders_shapes_textures.c) | shaders_shapes_textures | ⭐️⭐️☆☆ | 1.7 | 3.7 | [Ray](https://github.com/raysan5) | -| 102 | [shaders_custom_uniform](shaders/shaders_custom_uniform.c) | shaders_custom_uniform | ⭐️⭐️☆☆ | 1.3 | **4.0** | [Ray](https://github.com/raysan5) | -| 103 | [shaders_postprocessing](shaders/shaders_postprocessing.c) | shaders_postprocessing | ⭐️⭐️⭐️☆ | 1.3 | **4.0** | [Ray](https://github.com/raysan5) | -| 104 | [shaders_palette_switch](shaders/shaders_palette_switch.c) | shaders_palette_switch | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [Marco Lizza](https://github.com/MarcoLizza) | -| 105 | [shaders_raymarching](shaders/shaders_raymarching.c) | shaders_raymarching | ⭐️⭐️⭐️⭐️ | 2.0 | **4.2** | [Ray](https://github.com/raysan5) | -| 106 | [shaders_texture_drawing](shaders/shaders_texture_drawing.c) | shaders_texture_drawing | ⭐️⭐️☆☆ | 2.0 | 3.7 | [Michał Ciesielski](https://github.com/) | -| 107 | [shaders_texture_outline](shaders/shaders_texture_outline.c) | shaders_texture_outline | ⭐️⭐️⭐️☆ | **4.0** | **4.0** | [Samuel Skiff](https://github.com/GoldenThumbs) | -| 108 | [shaders_texture_waves](shaders/shaders_texture_waves.c) | shaders_texture_waves | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Anata](https://github.com/anatagawa) | -| 109 | [shaders_julia_set](shaders/shaders_julia_set.c) | shaders_julia_set | ⭐️⭐️⭐️☆ | 2.5 | **4.0** | [eggmund](https://github.com/eggmund) | -| 110 | [shaders_eratosthenes](shaders/shaders_eratosthenes.c) | shaders_eratosthenes | ⭐️⭐️⭐️☆ | 2.5 | **4.0** | [ProfJski](https://github.com/ProfJski) | -| 111 | [shaders_fog](shaders/shaders_fog.c) | shaders_fog | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | -| 112 | [shaders_simple_mask](shaders/shaders_simple_mask.c) | shaders_simple_mask | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | -| 113 | [shaders_hot_reloading](shaders/shaders_hot_reloading.c) | shaders_hot_reloading | ⭐️⭐️⭐️☆ | 3.0 | 3.5 | [Ray](https://github.com/raysan5) | -| 114 | [shaders_mesh_instancing](shaders/shaders_mesh_instancing.c) | shaders_mesh_instancing | ⭐️⭐️⭐️⭐️ | 3.7 | **4.2** | [seanpringle](https://github.com/seanpringle) | -| 115 | [shaders_multi_sample2d](shaders/shaders_multi_sample2d.c) | shaders_multi_sample2d | ⭐️⭐️☆☆ | 3.5 | 3.5 | [Ray](https://github.com/raysan5) | -| 116 | [shaders_spotlight](shaders/shaders_spotlight.c) | shaders_spotlight | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | -| 117 | [shaders_deferred_render](shaders/shaders_deferred_render.c) | shaders_deferred_render | ⭐️⭐️⭐️⭐️ | 4.5 | 4.5 | [Justin Andreas Lacoste](https://github.com/27justin) | -| 118 | [shaders_vertex_displacement](shaders/shaders_vertex_displacement.c) | shaders_deferred_render | ⭐️☆☆☆ | 1.5 | 1.5 | [Alex ZH](https://github.com/ZzzhHe) | +| 100 | [shaders_basic_lighting](shaders/shaders_basic_lighting.c) | shaders_basic_lighting | ⭐️⭐️⭐️⭐️ | 3.0 | **4.2** | [Chris Camacho](https://github.com/codifies) | +| 101 | [shaders_model_shader](shaders/shaders_model_shader.c) | shaders_model_shader | ⭐️⭐️☆☆ | 1.3 | 3.7 | [Ray](https://github.com/raysan5) | +| 102 | [shaders_shapes_textures](shaders/shaders_shapes_textures.c) | shaders_shapes_textures | ⭐️⭐️☆☆ | 1.7 | 3.7 | [Ray](https://github.com/raysan5) | +| 103 | [shaders_custom_uniform](shaders/shaders_custom_uniform.c) | shaders_custom_uniform | ⭐️⭐️☆☆ | 1.3 | **4.0** | [Ray](https://github.com/raysan5) | +| 104 | [shaders_postprocessing](shaders/shaders_postprocessing.c) | shaders_postprocessing | ⭐️⭐️⭐️☆ | 1.3 | **4.0** | [Ray](https://github.com/raysan5) | +| 105 | [shaders_palette_switch](shaders/shaders_palette_switch.c) | shaders_palette_switch | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [Marco Lizza](https://github.com/MarcoLizza) | +| 106 | [shaders_raymarching](shaders/shaders_raymarching.c) | shaders_raymarching | ⭐️⭐️⭐️⭐️ | 2.0 | **4.2** | [Ray](https://github.com/raysan5) | +| 107 | [shaders_texture_drawing](shaders/shaders_texture_drawing.c) | shaders_texture_drawing | ⭐️⭐️☆☆ | 2.0 | 3.7 | [Michał Ciesielski](https://github.com/) | +| 108 | [shaders_texture_outline](shaders/shaders_texture_outline.c) | shaders_texture_outline | ⭐️⭐️⭐️☆ | **4.0** | **4.0** | [Samuel Skiff](https://github.com/GoldenThumbs) | +| 109 | [shaders_texture_waves](shaders/shaders_texture_waves.c) | shaders_texture_waves | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Anata](https://github.com/anatagawa) | +| 110 | [shaders_julia_set](shaders/shaders_julia_set.c) | shaders_julia_set | ⭐️⭐️⭐️☆ | 2.5 | **4.0** | [eggmund](https://github.com/eggmund) | +| 111 | [shaders_eratosthenes](shaders/shaders_eratosthenes.c) | shaders_eratosthenes | ⭐️⭐️⭐️☆ | 2.5 | **4.0** | [ProfJski](https://github.com/ProfJski) | +| 112 | [shaders_fog](shaders/shaders_fog.c) | shaders_fog | ⭐️⭐️⭐️☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | +| 113 | [shaders_simple_mask](shaders/shaders_simple_mask.c) | shaders_simple_mask | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | +| 114 | [shaders_hot_reloading](shaders/shaders_hot_reloading.c) | shaders_hot_reloading | ⭐️⭐️⭐️☆ | 3.0 | 3.5 | [Ray](https://github.com/raysan5) | +| 115 | [shaders_mesh_instancing](shaders/shaders_mesh_instancing.c) | shaders_mesh_instancing | ⭐️⭐️⭐️⭐️ | 3.7 | **4.2** | [seanpringle](https://github.com/seanpringle) | +| 116 | [shaders_multi_sample2d](shaders/shaders_multi_sample2d.c) | shaders_multi_sample2d | ⭐️⭐️☆☆ | 3.5 | 3.5 | [Ray](https://github.com/raysan5) | +| 117 | [shaders_spotlight](shaders/shaders_spotlight.c) | shaders_spotlight | ⭐️⭐️☆☆ | 2.5 | 3.7 | [Chris Camacho](https://github.com/codifies) | +| 118 | [shaders_deferred_render](shaders/shaders_deferred_render.c) | shaders_deferred_render | ⭐️⭐️⭐️⭐️ | 4.5 | 4.5 | [Justin Andreas Lacoste](https://github.com/27justin) | ### category: audio diff --git a/examples/models/models_point_rendering.c b/examples/models/models_point_rendering.c new file mode 100644 index 000000000..128a70f57 --- /dev/null +++ b/examples/models/models_point_rendering.c @@ -0,0 +1,171 @@ +/******************************************************************************************* +* +* raylib example - point rendering +* +* Example originally created with raylib 5.0, last time updated with raylib 5.0 +* +* Example contributed by Reese Gallagher (@satchelfrost) and reviewed by Ramon Santamaria (@raysan5) +* +* Example 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) 2024 Reese Gallagher (@satchelfrost) +* +********************************************************************************************/ + +#include "raylib.h" +#include // Required for: rand() +#include // Required for: cos(), sin() + +#define MAX_POINTS 10000000 // 10 million +#define MIN_POINTS 1000 // 1 thousand + +static float RandFloat(); + +//------------------------------------------------------------------------------------ +// Program main entry point +//------------------------------------------------------------------------------------ +int main() +{ + // Initialization + //-------------------------------------------------------------------------------------- + const int screenWidth = 800; + const int screenHeight = 450; + InitWindow(screenWidth, screenHeight, "raylib [models] example - point rendering"); + SetTargetFPS(60); + + Camera camera = { + .position = {3.0f, 3.0f, 3.0f}, + .target = {0.0f, 0.0f, 0.0f}, + .up = {0.0f, 1.0f, 0.0f}, + .fovy = 45.0f, + .projection = CAMERA_PERSPECTIVE, + }; + + Vector3 position = {0.0f, 0.0f, 0.0f}; + bool useDrawModelPoints = true; + bool numPointsChanged = false; + int numPoints = 1000; + Mesh mesh = GenPoints(numPoints); + Model model = LoadModelFromMesh(mesh); + //-------------------------------------------------------------------------------------- + + // Main game loop + while(!WindowShouldClose()) + { + // Update + //---------------------------------------------------------------------------------- + UpdateCamera(&camera, CAMERA_ORBITAL); + + if (IsKeyPressed(KEY_SPACE)) useDrawModelPoints = !useDrawModelPoints; + if (IsKeyPressed(KEY_UP)) + { + numPoints = (numPoints * 10 > MAX_POINTS) ? MAX_POINTS : numPoints * 10; + numPointsChanged = true; + TraceLog(LOG_INFO, "num points %d", numPoints); + } + if (IsKeyPressed(KEY_DOWN)) + { + numPoints = (numPoints / 10 < MIN_POINTS) ? MIN_POINTS : numPoints / 10; + numPointsChanged = true; + TraceLog(LOG_INFO, "num points %d", numPoints); + } + + // upload a different point cloud size + if (numPointsChanged) + { + UnloadModel(model); + mesh = GenPoints(numPoints); + model = LoadModelFromMesh(mesh); + numPointsChanged = false; + } + + // Draw + //---------------------------------------------------------------------------------- + BeginDrawing(); + ClearBackground(BLACK); + BeginMode3D(camera); + + // The new method only uploads the points once to the GPU + if (useDrawModelPoints) + { + DrawModelPoints(model, position, 1.0f, WHITE); + } + // The old method must continually draw the "points" (lines) + else + { + for (int i = 0; i < numPoints; i++) + { + Vector3 pos = { + .x = mesh.vertices[i * 3 + 0], + .y = mesh.vertices[i * 3 + 1], + .z = mesh.vertices[i * 3 + 2], + }; + Color color = { + .r = mesh.colors[i * 4 + 0], + .g = mesh.colors[i * 4 + 1], + .b = mesh.colors[i * 4 + 2], + .a = mesh.colors[i * 4 + 3], + }; + DrawPoint3D(pos, color); + } + } + + // Draw a unit sphere for reference + DrawSphereWires(position, 1.0f, 10, 10, YELLOW); + EndMode3D(); + + // Text formatting + Color color = WHITE; + int fps = GetFPS(); + if ((fps < 30) && (fps >= 15)) color = ORANGE; + else if (fps < 15) color = RED; + DrawText(TextFormat("%2i FPS", fps), 20, 20, 40, color); + DrawText(TextFormat("Point Count: %d", numPoints), 20, screenHeight - 50, 40, WHITE); + DrawText("Up - increase points", 20, 70, 20, WHITE); + DrawText("Down - decrease points", 20, 100, 20, WHITE); + DrawText("Space - drawing function", 20, 130, 20, WHITE); + if (useDrawModelPoints) DrawText("DrawModelPoints()", 20, 160, 20, GREEN); + else DrawText("DrawPoint3D()", 20, 160, 20, RED); + EndDrawing(); + //---------------------------------------------------------------------------------- + } + + // De-Initialization + //-------------------------------------------------------------------------------------- + UnloadModel(model); + CloseWindow(); + //-------------------------------------------------------------------------------------- + return 0; +} + +// Generate a spherical point cloud +Mesh GenPoints(int numPoints) +{ + Mesh mesh = { + .triangleCount = 1, + .vertexCount = numPoints, + .vertices = (float *)MemAlloc(numPoints * 3 * sizeof(float)), + .colors = (unsigned char*)MemAlloc(numPoints * 4 * sizeof(unsigned char)), + }; + + // https://en.wikipedia.org/wiki/Spherical_coordinate_system + for (int i = 0; i < numPoints; i++) + { + float theta = PI * rand() / RAND_MAX; + float phi = 2.0f * PI * rand() / RAND_MAX; + float r = 10.0f * rand() / RAND_MAX; + mesh.vertices[i * 3 + 0] = r * sin(theta) * cos(phi); + mesh.vertices[i * 3 + 1] = r * sin(theta) * sin(phi); + mesh.vertices[i * 3 + 2] = r * cos(theta); + Color color = ColorFromHSV(r * 360.0f, 1.0f, 1.0f); + mesh.colors[i * 4 + 0] = color.r; + mesh.colors[i * 4 + 1] = color.g; + mesh.colors[i * 4 + 2] = color.b; + mesh.colors[i * 4 + 3] = color.a; + } + + // Upload mesh data from CPU (RAM) to GPU (VRAM) memory + UploadMesh(&mesh, false); + return mesh; +} diff --git a/examples/models/models_point_rendering.png b/examples/models/models_point_rendering.png new file mode 100644 index 0000000000000000000000000000000000000000..a1fc718e4dd508ba6768abb6f7a0c02a1fabaf9f GIT binary patch literal 130183 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%0D_wHBg^j<|d*2-RL2s(cI%66v7 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 literal 0 HcmV?d00001 diff --git a/src/raylib.h b/src/raylib.h index 0759c259f..f51a444e1 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1545,6 +1545,8 @@ RLAPI void DrawModel(Model model, Vector3 position, float scale, Color tint); RLAPI void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model with extended parameters RLAPI void DrawModelWires(Model model, Vector3 position, float scale, Color tint); // Draw a model wires (with texture if set) RLAPI void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model wires (with texture if set) with extended parameters +RLAPI void DrawModelPoints(Model model, Vector3 position, float scale, Color tint); // Draw a model as points +RLAPI void DrawModelPointsEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model as points with extended parameters RLAPI void DrawBoundingBox(BoundingBox box, Color color); // Draw bounding box (wires) RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float scale, Color tint); // Draw a billboard texture RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle source, Vector3 position, Vector2 size, Color tint); // Draw a billboard texture defined by source diff --git a/src/rmodels.c b/src/rmodels.c index 8afa3df57..966a8665c 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -3631,6 +3631,30 @@ void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rlDisableWireMode(); } +// Draw a model points +void DrawModelPoints(Model model, Vector3 position, float scale, Color tint) +{ + rlEnablePointMode(); + rlDisableBackfaceCulling(); + + DrawModel(model, position, scale, tint); + + rlEnableBackfaceCulling(); + rlDisableWireMode(); +} + +// Draw a model points +void DrawModelPointsEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint) +{ + rlEnablePointMode(); + rlDisableBackfaceCulling(); + + DrawModelEx(model, position, rotationAxis, rotationAngle, scale, tint); + + rlEnableBackfaceCulling(); + rlDisableWireMode(); +} + // Draw a billboard void DrawBillboard(Camera camera, Texture2D texture, Vector3 position, float scale, Color tint) { From dfd8055270691429076283f407d4176929f56e80 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 24 Aug 2024 16:42:52 +0000 Subject: [PATCH 13/28] Update raylib_api.* by CI --- parser/output/raylib_api.json | 54 ++++++++ parser/output/raylib_api.lua | 24 ++++ parser/output/raylib_api.txt | 238 ++++++++++++++++++---------------- parser/output/raylib_api.xml | 16 ++- 4 files changed, 221 insertions(+), 111 deletions(-) diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json index c4ce91e87..dfe37e2fe 100644 --- a/parser/output/raylib_api.json +++ b/parser/output/raylib_api.json @@ -10366,6 +10366,60 @@ } ] }, + { + "name": "DrawModelPoints", + "description": "Draw a model as points", + "returnType": "void", + "params": [ + { + "type": "Model", + "name": "model" + }, + { + "type": "Vector3", + "name": "position" + }, + { + "type": "float", + "name": "scale" + }, + { + "type": "Color", + "name": "tint" + } + ] + }, + { + "name": "DrawModelPointsEx", + "description": "Draw a model as points with extended parameters", + "returnType": "void", + "params": [ + { + "type": "Model", + "name": "model" + }, + { + "type": "Vector3", + "name": "position" + }, + { + "type": "Vector3", + "name": "rotationAxis" + }, + { + "type": "float", + "name": "rotationAngle" + }, + { + "type": "Vector3", + "name": "scale" + }, + { + "type": "Color", + "name": "tint" + } + ] + }, { "name": "DrawBoundingBox", "description": "Draw bounding box (wires)", diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua index 3a9e2f04f..933b2c704 100644 --- a/parser/output/raylib_api.lua +++ b/parser/output/raylib_api.lua @@ -7213,6 +7213,30 @@ return { {type = "Color", name = "tint"} } }, + { + name = "DrawModelPoints", + description = "Draw a model as points", + returnType = "void", + params = { + {type = "Model", name = "model"}, + {type = "Vector3", name = "position"}, + {type = "float", name = "scale"}, + {type = "Color", name = "tint"} + } + }, + { + name = "DrawModelPointsEx", + description = "Draw a model as points with extended parameters", + returnType = "void", + params = { + {type = "Model", name = "model"}, + {type = "Vector3", name = "position"}, + {type = "Vector3", name = "rotationAxis"}, + {type = "float", name = "rotationAngle"}, + {type = "Vector3", name = "scale"}, + {type = "Color", name = "tint"} + } + }, { name = "DrawBoundingBox", description = "Draw bounding box (wires)", diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt index afa9b525d..94562d66a 100644 --- a/parser/output/raylib_api.txt +++ b/parser/output/raylib_api.txt @@ -984,7 +984,7 @@ Callback 006: AudioCallback() (2 input parameters) Param[1]: bufferData (type: void *) Param[2]: frames (type: unsigned int) -Functions found: 573 +Functions found: 575 Function 001: InitWindow() (3 input parameters) Name: InitWindow @@ -3955,13 +3955,31 @@ Function 464: DrawModelWiresEx() (6 input parameters) Param[4]: rotationAngle (type: float) Param[5]: scale (type: Vector3) Param[6]: tint (type: Color) -Function 465: DrawBoundingBox() (2 input parameters) +Function 465: DrawModelPoints() (4 input parameters) + Name: DrawModelPoints + Return type: void + Description: Draw a model as points + Param[1]: model (type: Model) + Param[2]: position (type: Vector3) + Param[3]: scale (type: float) + Param[4]: tint (type: Color) +Function 466: DrawModelPointsEx() (6 input parameters) + Name: DrawModelPointsEx + Return type: void + Description: Draw a model as points with extended parameters + Param[1]: model (type: Model) + Param[2]: position (type: Vector3) + Param[3]: rotationAxis (type: Vector3) + Param[4]: rotationAngle (type: float) + Param[5]: scale (type: Vector3) + Param[6]: tint (type: Color) +Function 467: DrawBoundingBox() (2 input parameters) Name: DrawBoundingBox Return type: void Description: Draw bounding box (wires) Param[1]: box (type: BoundingBox) Param[2]: color (type: Color) -Function 466: DrawBillboard() (5 input parameters) +Function 468: DrawBillboard() (5 input parameters) Name: DrawBillboard Return type: void Description: Draw a billboard texture @@ -3970,7 +3988,7 @@ Function 466: DrawBillboard() (5 input parameters) Param[3]: position (type: Vector3) Param[4]: scale (type: float) Param[5]: tint (type: Color) -Function 467: DrawBillboardRec() (6 input parameters) +Function 469: DrawBillboardRec() (6 input parameters) Name: DrawBillboardRec Return type: void Description: Draw a billboard texture defined by source @@ -3980,7 +3998,7 @@ Function 467: DrawBillboardRec() (6 input parameters) Param[4]: position (type: Vector3) Param[5]: size (type: Vector2) Param[6]: tint (type: Color) -Function 468: DrawBillboardPro() (9 input parameters) +Function 470: DrawBillboardPro() (9 input parameters) Name: DrawBillboardPro Return type: void Description: Draw a billboard texture defined by source and rotation @@ -3993,13 +4011,13 @@ Function 468: DrawBillboardPro() (9 input parameters) Param[7]: origin (type: Vector2) Param[8]: rotation (type: float) Param[9]: tint (type: Color) -Function 469: UploadMesh() (2 input parameters) +Function 471: UploadMesh() (2 input parameters) Name: UploadMesh Return type: void Description: Upload mesh vertex data in GPU and provide VAO/VBO ids Param[1]: mesh (type: Mesh *) Param[2]: dynamic (type: bool) -Function 470: UpdateMeshBuffer() (5 input parameters) +Function 472: UpdateMeshBuffer() (5 input parameters) Name: UpdateMeshBuffer Return type: void Description: Update mesh vertex data in GPU for a specific buffer index @@ -4008,19 +4026,19 @@ Function 470: UpdateMeshBuffer() (5 input parameters) Param[3]: data (type: const void *) Param[4]: dataSize (type: int) Param[5]: offset (type: int) -Function 471: UnloadMesh() (1 input parameters) +Function 473: UnloadMesh() (1 input parameters) Name: UnloadMesh Return type: void Description: Unload mesh data from CPU and GPU Param[1]: mesh (type: Mesh) -Function 472: DrawMesh() (3 input parameters) +Function 474: DrawMesh() (3 input parameters) Name: DrawMesh Return type: void Description: Draw a 3d mesh with material and transform Param[1]: mesh (type: Mesh) Param[2]: material (type: Material) Param[3]: transform (type: Matrix) -Function 473: DrawMeshInstanced() (4 input parameters) +Function 475: DrawMeshInstanced() (4 input parameters) Name: DrawMeshInstanced Return type: void Description: Draw multiple mesh instances with material and different transforms @@ -4028,35 +4046,35 @@ Function 473: DrawMeshInstanced() (4 input parameters) Param[2]: material (type: Material) Param[3]: transforms (type: const Matrix *) Param[4]: instances (type: int) -Function 474: GetMeshBoundingBox() (1 input parameters) +Function 476: GetMeshBoundingBox() (1 input parameters) Name: GetMeshBoundingBox Return type: BoundingBox Description: Compute mesh bounding box limits Param[1]: mesh (type: Mesh) -Function 475: GenMeshTangents() (1 input parameters) +Function 477: GenMeshTangents() (1 input parameters) Name: GenMeshTangents Return type: void Description: Compute mesh tangents Param[1]: mesh (type: Mesh *) -Function 476: ExportMesh() (2 input parameters) +Function 478: ExportMesh() (2 input parameters) Name: ExportMesh Return type: bool Description: Export mesh data to file, returns true on success Param[1]: mesh (type: Mesh) Param[2]: fileName (type: const char *) -Function 477: ExportMeshAsCode() (2 input parameters) +Function 479: ExportMeshAsCode() (2 input parameters) Name: ExportMeshAsCode Return type: bool Description: Export mesh as code file (.h) defining multiple arrays of vertex attributes Param[1]: mesh (type: Mesh) Param[2]: fileName (type: const char *) -Function 478: GenMeshPoly() (2 input parameters) +Function 480: GenMeshPoly() (2 input parameters) Name: GenMeshPoly Return type: Mesh Description: Generate polygonal mesh Param[1]: sides (type: int) Param[2]: radius (type: float) -Function 479: GenMeshPlane() (4 input parameters) +Function 481: GenMeshPlane() (4 input parameters) Name: GenMeshPlane Return type: Mesh Description: Generate plane mesh (with subdivisions) @@ -4064,42 +4082,42 @@ Function 479: GenMeshPlane() (4 input parameters) Param[2]: length (type: float) Param[3]: resX (type: int) Param[4]: resZ (type: int) -Function 480: GenMeshCube() (3 input parameters) +Function 482: GenMeshCube() (3 input parameters) Name: GenMeshCube Return type: Mesh Description: Generate cuboid mesh Param[1]: width (type: float) Param[2]: height (type: float) Param[3]: length (type: float) -Function 481: GenMeshSphere() (3 input parameters) +Function 483: GenMeshSphere() (3 input parameters) Name: GenMeshSphere Return type: Mesh Description: Generate sphere mesh (standard sphere) Param[1]: radius (type: float) Param[2]: rings (type: int) Param[3]: slices (type: int) -Function 482: GenMeshHemiSphere() (3 input parameters) +Function 484: GenMeshHemiSphere() (3 input parameters) Name: GenMeshHemiSphere Return type: Mesh Description: Generate half-sphere mesh (no bottom cap) Param[1]: radius (type: float) Param[2]: rings (type: int) Param[3]: slices (type: int) -Function 483: GenMeshCylinder() (3 input parameters) +Function 485: GenMeshCylinder() (3 input parameters) Name: GenMeshCylinder Return type: Mesh Description: Generate cylinder mesh Param[1]: radius (type: float) Param[2]: height (type: float) Param[3]: slices (type: int) -Function 484: GenMeshCone() (3 input parameters) +Function 486: GenMeshCone() (3 input parameters) Name: GenMeshCone Return type: Mesh Description: Generate cone/pyramid mesh Param[1]: radius (type: float) Param[2]: height (type: float) Param[3]: slices (type: int) -Function 485: GenMeshTorus() (4 input parameters) +Function 487: GenMeshTorus() (4 input parameters) Name: GenMeshTorus Return type: Mesh Description: Generate torus mesh @@ -4107,7 +4125,7 @@ Function 485: GenMeshTorus() (4 input parameters) Param[2]: size (type: float) Param[3]: radSeg (type: int) Param[4]: sides (type: int) -Function 486: GenMeshKnot() (4 input parameters) +Function 488: GenMeshKnot() (4 input parameters) Name: GenMeshKnot Return type: Mesh Description: Generate trefoil knot mesh @@ -4115,84 +4133,84 @@ Function 486: GenMeshKnot() (4 input parameters) Param[2]: size (type: float) Param[3]: radSeg (type: int) Param[4]: sides (type: int) -Function 487: GenMeshHeightmap() (2 input parameters) +Function 489: GenMeshHeightmap() (2 input parameters) Name: GenMeshHeightmap Return type: Mesh Description: Generate heightmap mesh from image data Param[1]: heightmap (type: Image) Param[2]: size (type: Vector3) -Function 488: GenMeshCubicmap() (2 input parameters) +Function 490: GenMeshCubicmap() (2 input parameters) Name: GenMeshCubicmap Return type: Mesh Description: Generate cubes-based map mesh from image data Param[1]: cubicmap (type: Image) Param[2]: cubeSize (type: Vector3) -Function 489: LoadMaterials() (2 input parameters) +Function 491: LoadMaterials() (2 input parameters) Name: LoadMaterials Return type: Material * Description: Load materials from model file Param[1]: fileName (type: const char *) Param[2]: materialCount (type: int *) -Function 490: LoadMaterialDefault() (0 input parameters) +Function 492: LoadMaterialDefault() (0 input parameters) Name: LoadMaterialDefault Return type: Material Description: Load default material (Supports: DIFFUSE, SPECULAR, NORMAL maps) No input parameters -Function 491: IsMaterialReady() (1 input parameters) +Function 493: IsMaterialReady() (1 input parameters) Name: IsMaterialReady Return type: bool Description: Check if a material is ready Param[1]: material (type: Material) -Function 492: UnloadMaterial() (1 input parameters) +Function 494: UnloadMaterial() (1 input parameters) Name: UnloadMaterial Return type: void Description: Unload material from GPU memory (VRAM) Param[1]: material (type: Material) -Function 493: SetMaterialTexture() (3 input parameters) +Function 495: SetMaterialTexture() (3 input parameters) Name: SetMaterialTexture Return type: void Description: Set texture for a material map type (MATERIAL_MAP_DIFFUSE, MATERIAL_MAP_SPECULAR...) Param[1]: material (type: Material *) Param[2]: mapType (type: int) Param[3]: texture (type: Texture2D) -Function 494: SetModelMeshMaterial() (3 input parameters) +Function 496: SetModelMeshMaterial() (3 input parameters) Name: SetModelMeshMaterial Return type: void Description: Set material for a mesh Param[1]: model (type: Model *) Param[2]: meshId (type: int) Param[3]: materialId (type: int) -Function 495: LoadModelAnimations() (2 input parameters) +Function 497: LoadModelAnimations() (2 input parameters) Name: LoadModelAnimations Return type: ModelAnimation * Description: Load model animations from file Param[1]: fileName (type: const char *) Param[2]: animCount (type: int *) -Function 496: UpdateModelAnimation() (3 input parameters) +Function 498: UpdateModelAnimation() (3 input parameters) Name: UpdateModelAnimation Return type: void Description: Update model animation pose Param[1]: model (type: Model) Param[2]: anim (type: ModelAnimation) Param[3]: frame (type: int) -Function 497: UnloadModelAnimation() (1 input parameters) +Function 499: UnloadModelAnimation() (1 input parameters) Name: UnloadModelAnimation Return type: void Description: Unload animation data Param[1]: anim (type: ModelAnimation) -Function 498: UnloadModelAnimations() (2 input parameters) +Function 500: UnloadModelAnimations() (2 input parameters) Name: UnloadModelAnimations Return type: void Description: Unload animation array data Param[1]: animations (type: ModelAnimation *) Param[2]: animCount (type: int) -Function 499: IsModelAnimationValid() (2 input parameters) +Function 501: IsModelAnimationValid() (2 input parameters) Name: IsModelAnimationValid Return type: bool Description: Check model animation skeleton match Param[1]: model (type: Model) Param[2]: anim (type: ModelAnimation) -Function 500: CheckCollisionSpheres() (4 input parameters) +Function 502: CheckCollisionSpheres() (4 input parameters) Name: CheckCollisionSpheres Return type: bool Description: Check collision between two spheres @@ -4200,40 +4218,40 @@ Function 500: CheckCollisionSpheres() (4 input parameters) Param[2]: radius1 (type: float) Param[3]: center2 (type: Vector3) Param[4]: radius2 (type: float) -Function 501: CheckCollisionBoxes() (2 input parameters) +Function 503: CheckCollisionBoxes() (2 input parameters) Name: CheckCollisionBoxes Return type: bool Description: Check collision between two bounding boxes Param[1]: box1 (type: BoundingBox) Param[2]: box2 (type: BoundingBox) -Function 502: CheckCollisionBoxSphere() (3 input parameters) +Function 504: CheckCollisionBoxSphere() (3 input parameters) Name: CheckCollisionBoxSphere Return type: bool Description: Check collision between box and sphere Param[1]: box (type: BoundingBox) Param[2]: center (type: Vector3) Param[3]: radius (type: float) -Function 503: GetRayCollisionSphere() (3 input parameters) +Function 505: GetRayCollisionSphere() (3 input parameters) Name: GetRayCollisionSphere Return type: RayCollision Description: Get collision info between ray and sphere Param[1]: ray (type: Ray) Param[2]: center (type: Vector3) Param[3]: radius (type: float) -Function 504: GetRayCollisionBox() (2 input parameters) +Function 506: GetRayCollisionBox() (2 input parameters) Name: GetRayCollisionBox Return type: RayCollision Description: Get collision info between ray and box Param[1]: ray (type: Ray) Param[2]: box (type: BoundingBox) -Function 505: GetRayCollisionMesh() (3 input parameters) +Function 507: GetRayCollisionMesh() (3 input parameters) Name: GetRayCollisionMesh Return type: RayCollision Description: Get collision info between ray and mesh Param[1]: ray (type: Ray) Param[2]: mesh (type: Mesh) Param[3]: transform (type: Matrix) -Function 506: GetRayCollisionTriangle() (4 input parameters) +Function 508: GetRayCollisionTriangle() (4 input parameters) Name: GetRayCollisionTriangle Return type: RayCollision Description: Get collision info between ray and triangle @@ -4241,7 +4259,7 @@ Function 506: GetRayCollisionTriangle() (4 input parameters) Param[2]: p1 (type: Vector3) Param[3]: p2 (type: Vector3) Param[4]: p3 (type: Vector3) -Function 507: GetRayCollisionQuad() (5 input parameters) +Function 509: GetRayCollisionQuad() (5 input parameters) Name: GetRayCollisionQuad Return type: RayCollision Description: Get collision info between ray and quad @@ -4250,158 +4268,158 @@ Function 507: GetRayCollisionQuad() (5 input parameters) Param[3]: p2 (type: Vector3) Param[4]: p3 (type: Vector3) Param[5]: p4 (type: Vector3) -Function 508: InitAudioDevice() (0 input parameters) +Function 510: InitAudioDevice() (0 input parameters) Name: InitAudioDevice Return type: void Description: Initialize audio device and context No input parameters -Function 509: CloseAudioDevice() (0 input parameters) +Function 511: CloseAudioDevice() (0 input parameters) Name: CloseAudioDevice Return type: void Description: Close the audio device and context No input parameters -Function 510: IsAudioDeviceReady() (0 input parameters) +Function 512: IsAudioDeviceReady() (0 input parameters) Name: IsAudioDeviceReady Return type: bool Description: Check if audio device has been initialized successfully No input parameters -Function 511: SetMasterVolume() (1 input parameters) +Function 513: SetMasterVolume() (1 input parameters) Name: SetMasterVolume Return type: void Description: Set master volume (listener) Param[1]: volume (type: float) -Function 512: GetMasterVolume() (0 input parameters) +Function 514: GetMasterVolume() (0 input parameters) Name: GetMasterVolume Return type: float Description: Get master volume (listener) No input parameters -Function 513: LoadWave() (1 input parameters) +Function 515: LoadWave() (1 input parameters) Name: LoadWave Return type: Wave Description: Load wave data from file Param[1]: fileName (type: const char *) -Function 514: LoadWaveFromMemory() (3 input parameters) +Function 516: LoadWaveFromMemory() (3 input parameters) Name: LoadWaveFromMemory Return type: Wave Description: Load wave from memory buffer, fileType refers to extension: i.e. '.wav' Param[1]: fileType (type: const char *) Param[2]: fileData (type: const unsigned char *) Param[3]: dataSize (type: int) -Function 515: IsWaveReady() (1 input parameters) +Function 517: IsWaveReady() (1 input parameters) Name: IsWaveReady Return type: bool Description: Checks if wave data is ready Param[1]: wave (type: Wave) -Function 516: LoadSound() (1 input parameters) +Function 518: LoadSound() (1 input parameters) Name: LoadSound Return type: Sound Description: Load sound from file Param[1]: fileName (type: const char *) -Function 517: LoadSoundFromWave() (1 input parameters) +Function 519: LoadSoundFromWave() (1 input parameters) Name: LoadSoundFromWave Return type: Sound Description: Load sound from wave data Param[1]: wave (type: Wave) -Function 518: LoadSoundAlias() (1 input parameters) +Function 520: LoadSoundAlias() (1 input parameters) Name: LoadSoundAlias Return type: Sound Description: Create a new sound that shares the same sample data as the source sound, does not own the sound data Param[1]: source (type: Sound) -Function 519: IsSoundReady() (1 input parameters) +Function 521: IsSoundReady() (1 input parameters) Name: IsSoundReady Return type: bool Description: Checks if a sound is ready Param[1]: sound (type: Sound) -Function 520: UpdateSound() (3 input parameters) +Function 522: UpdateSound() (3 input parameters) Name: UpdateSound Return type: void Description: Update sound buffer with new data Param[1]: sound (type: Sound) Param[2]: data (type: const void *) Param[3]: sampleCount (type: int) -Function 521: UnloadWave() (1 input parameters) +Function 523: UnloadWave() (1 input parameters) Name: UnloadWave Return type: void Description: Unload wave data Param[1]: wave (type: Wave) -Function 522: UnloadSound() (1 input parameters) +Function 524: UnloadSound() (1 input parameters) Name: UnloadSound Return type: void Description: Unload sound Param[1]: sound (type: Sound) -Function 523: UnloadSoundAlias() (1 input parameters) +Function 525: UnloadSoundAlias() (1 input parameters) Name: UnloadSoundAlias Return type: void Description: Unload a sound alias (does not deallocate sample data) Param[1]: alias (type: Sound) -Function 524: ExportWave() (2 input parameters) +Function 526: ExportWave() (2 input parameters) Name: ExportWave Return type: bool Description: Export wave data to file, returns true on success Param[1]: wave (type: Wave) Param[2]: fileName (type: const char *) -Function 525: ExportWaveAsCode() (2 input parameters) +Function 527: ExportWaveAsCode() (2 input parameters) Name: ExportWaveAsCode Return type: bool Description: Export wave sample data to code (.h), returns true on success Param[1]: wave (type: Wave) Param[2]: fileName (type: const char *) -Function 526: PlaySound() (1 input parameters) +Function 528: PlaySound() (1 input parameters) Name: PlaySound Return type: void Description: Play a sound Param[1]: sound (type: Sound) -Function 527: StopSound() (1 input parameters) +Function 529: StopSound() (1 input parameters) Name: StopSound Return type: void Description: Stop playing a sound Param[1]: sound (type: Sound) -Function 528: PauseSound() (1 input parameters) +Function 530: PauseSound() (1 input parameters) Name: PauseSound Return type: void Description: Pause a sound Param[1]: sound (type: Sound) -Function 529: ResumeSound() (1 input parameters) +Function 531: ResumeSound() (1 input parameters) Name: ResumeSound Return type: void Description: Resume a paused sound Param[1]: sound (type: Sound) -Function 530: IsSoundPlaying() (1 input parameters) +Function 532: IsSoundPlaying() (1 input parameters) Name: IsSoundPlaying Return type: bool Description: Check if a sound is currently playing Param[1]: sound (type: Sound) -Function 531: SetSoundVolume() (2 input parameters) +Function 533: SetSoundVolume() (2 input parameters) Name: SetSoundVolume Return type: void Description: Set volume for a sound (1.0 is max level) Param[1]: sound (type: Sound) Param[2]: volume (type: float) -Function 532: SetSoundPitch() (2 input parameters) +Function 534: SetSoundPitch() (2 input parameters) Name: SetSoundPitch Return type: void Description: Set pitch for a sound (1.0 is base level) Param[1]: sound (type: Sound) Param[2]: pitch (type: float) -Function 533: SetSoundPan() (2 input parameters) +Function 535: SetSoundPan() (2 input parameters) Name: SetSoundPan Return type: void Description: Set pan for a sound (0.5 is center) Param[1]: sound (type: Sound) Param[2]: pan (type: float) -Function 534: WaveCopy() (1 input parameters) +Function 536: WaveCopy() (1 input parameters) Name: WaveCopy Return type: Wave Description: Copy a wave to a new wave Param[1]: wave (type: Wave) -Function 535: WaveCrop() (3 input parameters) +Function 537: WaveCrop() (3 input parameters) Name: WaveCrop Return type: void Description: Crop a wave to defined frames range Param[1]: wave (type: Wave *) Param[2]: initFrame (type: int) Param[3]: finalFrame (type: int) -Function 536: WaveFormat() (4 input parameters) +Function 538: WaveFormat() (4 input parameters) Name: WaveFormat Return type: void Description: Convert wave data to desired format @@ -4409,203 +4427,203 @@ Function 536: WaveFormat() (4 input parameters) Param[2]: sampleRate (type: int) Param[3]: sampleSize (type: int) Param[4]: channels (type: int) -Function 537: LoadWaveSamples() (1 input parameters) +Function 539: LoadWaveSamples() (1 input parameters) Name: LoadWaveSamples Return type: float * Description: Load samples data from wave as a 32bit float data array Param[1]: wave (type: Wave) -Function 538: UnloadWaveSamples() (1 input parameters) +Function 540: UnloadWaveSamples() (1 input parameters) Name: UnloadWaveSamples Return type: void Description: Unload samples data loaded with LoadWaveSamples() Param[1]: samples (type: float *) -Function 539: LoadMusicStream() (1 input parameters) +Function 541: LoadMusicStream() (1 input parameters) Name: LoadMusicStream Return type: Music Description: Load music stream from file Param[1]: fileName (type: const char *) -Function 540: LoadMusicStreamFromMemory() (3 input parameters) +Function 542: LoadMusicStreamFromMemory() (3 input parameters) Name: LoadMusicStreamFromMemory Return type: Music Description: Load music stream from data Param[1]: fileType (type: const char *) Param[2]: data (type: const unsigned char *) Param[3]: dataSize (type: int) -Function 541: IsMusicReady() (1 input parameters) +Function 543: IsMusicReady() (1 input parameters) Name: IsMusicReady Return type: bool Description: Checks if a music stream is ready Param[1]: music (type: Music) -Function 542: UnloadMusicStream() (1 input parameters) +Function 544: UnloadMusicStream() (1 input parameters) Name: UnloadMusicStream Return type: void Description: Unload music stream Param[1]: music (type: Music) -Function 543: PlayMusicStream() (1 input parameters) +Function 545: PlayMusicStream() (1 input parameters) Name: PlayMusicStream Return type: void Description: Start music playing Param[1]: music (type: Music) -Function 544: IsMusicStreamPlaying() (1 input parameters) +Function 546: IsMusicStreamPlaying() (1 input parameters) Name: IsMusicStreamPlaying Return type: bool Description: Check if music is playing Param[1]: music (type: Music) -Function 545: UpdateMusicStream() (1 input parameters) +Function 547: UpdateMusicStream() (1 input parameters) Name: UpdateMusicStream Return type: void Description: Updates buffers for music streaming Param[1]: music (type: Music) -Function 546: StopMusicStream() (1 input parameters) +Function 548: StopMusicStream() (1 input parameters) Name: StopMusicStream Return type: void Description: Stop music playing Param[1]: music (type: Music) -Function 547: PauseMusicStream() (1 input parameters) +Function 549: PauseMusicStream() (1 input parameters) Name: PauseMusicStream Return type: void Description: Pause music playing Param[1]: music (type: Music) -Function 548: ResumeMusicStream() (1 input parameters) +Function 550: ResumeMusicStream() (1 input parameters) Name: ResumeMusicStream Return type: void Description: Resume playing paused music Param[1]: music (type: Music) -Function 549: SeekMusicStream() (2 input parameters) +Function 551: SeekMusicStream() (2 input parameters) Name: SeekMusicStream Return type: void Description: Seek music to a position (in seconds) Param[1]: music (type: Music) Param[2]: position (type: float) -Function 550: SetMusicVolume() (2 input parameters) +Function 552: SetMusicVolume() (2 input parameters) Name: SetMusicVolume Return type: void Description: Set volume for music (1.0 is max level) Param[1]: music (type: Music) Param[2]: volume (type: float) -Function 551: SetMusicPitch() (2 input parameters) +Function 553: SetMusicPitch() (2 input parameters) Name: SetMusicPitch Return type: void Description: Set pitch for a music (1.0 is base level) Param[1]: music (type: Music) Param[2]: pitch (type: float) -Function 552: SetMusicPan() (2 input parameters) +Function 554: SetMusicPan() (2 input parameters) Name: SetMusicPan Return type: void Description: Set pan for a music (0.5 is center) Param[1]: music (type: Music) Param[2]: pan (type: float) -Function 553: GetMusicTimeLength() (1 input parameters) +Function 555: GetMusicTimeLength() (1 input parameters) Name: GetMusicTimeLength Return type: float Description: Get music time length (in seconds) Param[1]: music (type: Music) -Function 554: GetMusicTimePlayed() (1 input parameters) +Function 556: GetMusicTimePlayed() (1 input parameters) Name: GetMusicTimePlayed Return type: float Description: Get current music time played (in seconds) Param[1]: music (type: Music) -Function 555: LoadAudioStream() (3 input parameters) +Function 557: LoadAudioStream() (3 input parameters) Name: LoadAudioStream Return type: AudioStream Description: Load audio stream (to stream raw audio pcm data) Param[1]: sampleRate (type: unsigned int) Param[2]: sampleSize (type: unsigned int) Param[3]: channels (type: unsigned int) -Function 556: IsAudioStreamReady() (1 input parameters) +Function 558: IsAudioStreamReady() (1 input parameters) Name: IsAudioStreamReady Return type: bool Description: Checks if an audio stream is ready Param[1]: stream (type: AudioStream) -Function 557: UnloadAudioStream() (1 input parameters) +Function 559: UnloadAudioStream() (1 input parameters) Name: UnloadAudioStream Return type: void Description: Unload audio stream and free memory Param[1]: stream (type: AudioStream) -Function 558: UpdateAudioStream() (3 input parameters) +Function 560: UpdateAudioStream() (3 input parameters) Name: UpdateAudioStream Return type: void Description: Update audio stream buffers with data Param[1]: stream (type: AudioStream) Param[2]: data (type: const void *) Param[3]: frameCount (type: int) -Function 559: IsAudioStreamProcessed() (1 input parameters) +Function 561: IsAudioStreamProcessed() (1 input parameters) Name: IsAudioStreamProcessed Return type: bool Description: Check if any audio stream buffers requires refill Param[1]: stream (type: AudioStream) -Function 560: PlayAudioStream() (1 input parameters) +Function 562: PlayAudioStream() (1 input parameters) Name: PlayAudioStream Return type: void Description: Play audio stream Param[1]: stream (type: AudioStream) -Function 561: PauseAudioStream() (1 input parameters) +Function 563: PauseAudioStream() (1 input parameters) Name: PauseAudioStream Return type: void Description: Pause audio stream Param[1]: stream (type: AudioStream) -Function 562: ResumeAudioStream() (1 input parameters) +Function 564: ResumeAudioStream() (1 input parameters) Name: ResumeAudioStream Return type: void Description: Resume audio stream Param[1]: stream (type: AudioStream) -Function 563: IsAudioStreamPlaying() (1 input parameters) +Function 565: IsAudioStreamPlaying() (1 input parameters) Name: IsAudioStreamPlaying Return type: bool Description: Check if audio stream is playing Param[1]: stream (type: AudioStream) -Function 564: StopAudioStream() (1 input parameters) +Function 566: StopAudioStream() (1 input parameters) Name: StopAudioStream Return type: void Description: Stop audio stream Param[1]: stream (type: AudioStream) -Function 565: SetAudioStreamVolume() (2 input parameters) +Function 567: SetAudioStreamVolume() (2 input parameters) Name: SetAudioStreamVolume Return type: void Description: Set volume for audio stream (1.0 is max level) Param[1]: stream (type: AudioStream) Param[2]: volume (type: float) -Function 566: SetAudioStreamPitch() (2 input parameters) +Function 568: SetAudioStreamPitch() (2 input parameters) Name: SetAudioStreamPitch Return type: void Description: Set pitch for audio stream (1.0 is base level) Param[1]: stream (type: AudioStream) Param[2]: pitch (type: float) -Function 567: SetAudioStreamPan() (2 input parameters) +Function 569: SetAudioStreamPan() (2 input parameters) Name: SetAudioStreamPan Return type: void Description: Set pan for audio stream (0.5 is centered) Param[1]: stream (type: AudioStream) Param[2]: pan (type: float) -Function 568: SetAudioStreamBufferSizeDefault() (1 input parameters) +Function 570: SetAudioStreamBufferSizeDefault() (1 input parameters) Name: SetAudioStreamBufferSizeDefault Return type: void Description: Default size for new audio streams Param[1]: size (type: int) -Function 569: SetAudioStreamCallback() (2 input parameters) +Function 571: SetAudioStreamCallback() (2 input parameters) Name: SetAudioStreamCallback Return type: void Description: Audio thread callback to request new data Param[1]: stream (type: AudioStream) Param[2]: callback (type: AudioCallback) -Function 570: AttachAudioStreamProcessor() (2 input parameters) +Function 572: AttachAudioStreamProcessor() (2 input parameters) Name: AttachAudioStreamProcessor Return type: void Description: Attach audio stream processor to stream, receives the samples as 'float' Param[1]: stream (type: AudioStream) Param[2]: processor (type: AudioCallback) -Function 571: DetachAudioStreamProcessor() (2 input parameters) +Function 573: DetachAudioStreamProcessor() (2 input parameters) Name: DetachAudioStreamProcessor Return type: void Description: Detach audio stream processor from stream Param[1]: stream (type: AudioStream) Param[2]: processor (type: AudioCallback) -Function 572: AttachAudioMixedProcessor() (1 input parameters) +Function 574: AttachAudioMixedProcessor() (1 input parameters) Name: AttachAudioMixedProcessor Return type: void Description: Attach audio stream processor to the entire audio pipeline, receives the samples as 'float' Param[1]: processor (type: AudioCallback) -Function 573: DetachAudioMixedProcessor() (1 input parameters) +Function 575: DetachAudioMixedProcessor() (1 input parameters) Name: DetachAudioMixedProcessor Return type: void Description: Detach audio stream processor from the entire audio pipeline diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml index 8a6560f48..02cfd02d0 100644 --- a/parser/output/raylib_api.xml +++ b/parser/output/raylib_api.xml @@ -670,7 +670,7 @@ - + @@ -2637,6 +2637,20 @@ + + + + + + + + + + + + + + From bc0bd98763bba496836c5cfc1418949256bc6f4d Mon Sep 17 00:00:00 2001 From: Colleague Riley Date: Sat, 24 Aug 2024 12:43:46 -0400 Subject: [PATCH 14/28] (rcore_desktop_rgfw.c) fix errors when compiling with mingw (#4282) * (rcore_desktop_rgfw.c) fix errors when compiling with mingw * define WideCharToMultiByte --- src/external/RGFW.h | 4 +++- src/platforms/rcore_desktop_rgfw.c | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/external/RGFW.h b/src/external/RGFW.h index 367a46fa6..35e782d4a 100644 --- a/src/external/RGFW.h +++ b/src/external/RGFW.h @@ -4999,7 +4999,9 @@ static const struct wl_callback_listener wl_surface_frame_listener = { #define WIN32_LEAN_AND_MEAN #define OEMRESOURCE #include - + + __declspec(dllimport) int __stdcall WideCharToMultiByte( UINT CodePage, DWORD dwFlags, const WCHAR* lpWideCharStr, int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte, LPCCH lpDefaultChar, LPBOOL lpUsedDefaultChar); + #include #include #include diff --git a/src/platforms/rcore_desktop_rgfw.c b/src/platforms/rcore_desktop_rgfw.c index afea0c2e6..64ab432e6 100644 --- a/src/platforms/rcore_desktop_rgfw.c +++ b/src/platforms/rcore_desktop_rgfw.c @@ -76,9 +76,7 @@ void CloseWindow(void); #define Size NSSIZE #endif -#if defined(_MSC_VER) __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int CodePage, unsigned long dwFlags, const char *lpMultiByteStr, int cbMultiByte, wchar_t *lpWideCharStr, int cchWideChar); -#endif #include "../external/RGFW.h" @@ -538,10 +536,8 @@ void *GetWindowHandle(void) { #ifdef RGFW_WEBASM return (void*)platform.window->src.ctx; -#elif !defined(RGFW_WINDOWS) - return (void *)platform.window->src.window; #else - return platform.window->src.hwnd; + return (void*)platform.window->src.window; #endif } From 414133dbe7b063566a338d9c4ef1c9eb0651dec4 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 24 Aug 2024 18:56:06 +0200 Subject: [PATCH 15/28] Update models_point_rendering.c --- examples/models/models_point_rendering.c | 107 +++++++++++++---------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/examples/models/models_point_rendering.c b/examples/models/models_point_rendering.c index 128a70f57..68d498453 100644 --- a/examples/models/models_point_rendering.c +++ b/examples/models/models_point_rendering.c @@ -14,13 +14,15 @@ ********************************************************************************************/ #include "raylib.h" -#include // Required for: rand() -#include // Required for: cos(), sin() -#define MAX_POINTS 10000000 // 10 million -#define MIN_POINTS 1000 // 1 thousand +#include // Required for: rand() +#include // Required for: cos(), sin() -static float RandFloat(); +#define MAX_POINTS 10000000 // 10 million +#define MIN_POINTS 1000 // 1 thousand + +// Generate mesh using points +Mesh GenMeshPoints(int numPoints); //------------------------------------------------------------------------------------ // Program main entry point @@ -31,23 +33,26 @@ int main() //-------------------------------------------------------------------------------------- const int screenWidth = 800; const int screenHeight = 450; + InitWindow(screenWidth, screenHeight, "raylib [models] example - point rendering"); - SetTargetFPS(60); Camera camera = { - .position = {3.0f, 3.0f, 3.0f}, - .target = {0.0f, 0.0f, 0.0f}, - .up = {0.0f, 1.0f, 0.0f}, + .position = { 3.0f, 3.0f, 3.0f }, + .target = { 0.0f, 0.0f, 0.0f }, + .up = { 0.0f, 1.0f, 0.0f }, .fovy = 45.0f, - .projection = CAMERA_PERSPECTIVE, + .projection = CAMERA_PERSPECTIVE }; - Vector3 position = {0.0f, 0.0f, 0.0f}; + Vector3 position = { 0.0f, 0.0f, 0.0f }; bool useDrawModelPoints = true; bool numPointsChanged = false; int numPoints = 1000; - Mesh mesh = GenPoints(numPoints); + + Mesh mesh = GenMeshPoints(numPoints); Model model = LoadModelFromMesh(mesh); + + //SetTargetFPS(60); //-------------------------------------------------------------------------------------- // Main game loop @@ -60,30 +65,30 @@ int main() if (IsKeyPressed(KEY_SPACE)) useDrawModelPoints = !useDrawModelPoints; if (IsKeyPressed(KEY_UP)) { - numPoints = (numPoints * 10 > MAX_POINTS) ? MAX_POINTS : numPoints * 10; + numPoints = (numPoints*10 > MAX_POINTS)? MAX_POINTS : numPoints*10; numPointsChanged = true; - TraceLog(LOG_INFO, "num points %d", numPoints); } if (IsKeyPressed(KEY_DOWN)) { - numPoints = (numPoints / 10 < MIN_POINTS) ? MIN_POINTS : numPoints / 10; + numPoints = (numPoints/10 < MIN_POINTS)? MIN_POINTS : numPoints/10; numPointsChanged = true; - TraceLog(LOG_INFO, "num points %d", numPoints); } - // upload a different point cloud size + // Upload a different point cloud size if (numPointsChanged) { UnloadModel(model); - mesh = GenPoints(numPoints); + mesh = GenMeshPoints(numPoints); model = LoadModelFromMesh(mesh); numPointsChanged = false; } + //---------------------------------------------------------------------------------- // Draw //---------------------------------------------------------------------------------- BeginDrawing(); ClearBackground(BLACK); + BeginMode3D(camera); // The new method only uploads the points once to the GPU @@ -91,42 +96,43 @@ int main() { DrawModelPoints(model, position, 1.0f, WHITE); } - // The old method must continually draw the "points" (lines) else { + // The old method must continually draw the "points" (lines) for (int i = 0; i < numPoints; i++) { Vector3 pos = { - .x = mesh.vertices[i * 3 + 0], - .y = mesh.vertices[i * 3 + 1], - .z = mesh.vertices[i * 3 + 2], + .x = mesh.vertices[i*3 + 0], + .y = mesh.vertices[i*3 + 1], + .z = mesh.vertices[i*3 + 2], }; Color color = { - .r = mesh.colors[i * 4 + 0], - .g = mesh.colors[i * 4 + 1], - .b = mesh.colors[i * 4 + 2], - .a = mesh.colors[i * 4 + 3], + .r = mesh.colors[i*4 + 0], + .g = mesh.colors[i*4 + 1], + .b = mesh.colors[i*4 + 2], + .a = mesh.colors[i*4 + 3], }; + DrawPoint3D(pos, color); } } // Draw a unit sphere for reference DrawSphereWires(position, 1.0f, 10, 10, YELLOW); + EndMode3D(); - // Text formatting - Color color = WHITE; - int fps = GetFPS(); - if ((fps < 30) && (fps >= 15)) color = ORANGE; - else if (fps < 15) color = RED; - DrawText(TextFormat("%2i FPS", fps), 20, 20, 40, color); + // Draw UI text DrawText(TextFormat("Point Count: %d", numPoints), 20, screenHeight - 50, 40, WHITE); DrawText("Up - increase points", 20, 70, 20, WHITE); DrawText("Down - decrease points", 20, 100, 20, WHITE); DrawText("Space - drawing function", 20, 130, 20, WHITE); - if (useDrawModelPoints) DrawText("DrawModelPoints()", 20, 160, 20, GREEN); - else DrawText("DrawPoint3D()", 20, 160, 20, RED); + + if (useDrawModelPoints) DrawText("Using: DrawModelPoints()", 20, 160, 20, GREEN); + else DrawText("Using: DrawPoint3D()", 20, 160, 20, RED); + + DrawFPS(10, 10); + EndDrawing(); //---------------------------------------------------------------------------------- } @@ -134,38 +140,43 @@ int main() // De-Initialization //-------------------------------------------------------------------------------------- UnloadModel(model); + CloseWindow(); //-------------------------------------------------------------------------------------- return 0; } // Generate a spherical point cloud -Mesh GenPoints(int numPoints) +Mesh GenMeshPoints(int numPoints) { Mesh mesh = { .triangleCount = 1, .vertexCount = numPoints, - .vertices = (float *)MemAlloc(numPoints * 3 * sizeof(float)), - .colors = (unsigned char*)MemAlloc(numPoints * 4 * sizeof(unsigned char)), + .vertices = (float *)MemAlloc(numPoints*3*sizeof(float)), + .colors = (unsigned char*)MemAlloc(numPoints*4*sizeof(unsigned char)), }; // https://en.wikipedia.org/wiki/Spherical_coordinate_system for (int i = 0; i < numPoints; i++) { - float theta = PI * rand() / RAND_MAX; - float phi = 2.0f * PI * rand() / RAND_MAX; - float r = 10.0f * rand() / RAND_MAX; - mesh.vertices[i * 3 + 0] = r * sin(theta) * cos(phi); - mesh.vertices[i * 3 + 1] = r * sin(theta) * sin(phi); - mesh.vertices[i * 3 + 2] = r * cos(theta); - Color color = ColorFromHSV(r * 360.0f, 1.0f, 1.0f); - mesh.colors[i * 4 + 0] = color.r; - mesh.colors[i * 4 + 1] = color.g; - mesh.colors[i * 4 + 2] = color.b; - mesh.colors[i * 4 + 3] = color.a; + float theta = PI*rand()/RAND_MAX; + float phi = 2.0f*PI*rand()/RAND_MAX; + float r = 10.0f*rand()/RAND_MAX; + + mesh.vertices[i*3 + 0] = r*sin(theta)*cos(phi); + mesh.vertices[i*3 + 1] = r*sin(theta)*sin(phi); + mesh.vertices[i*3 + 2] = r*cos(theta); + + Color color = ColorFromHSV(r*360.0f, 1.0f, 1.0f); + + mesh.colors[i*4 + 0] = color.r; + mesh.colors[i*4 + 1] = color.g; + mesh.colors[i*4 + 2] = color.b; + mesh.colors[i*4 + 3] = color.a; } // Upload mesh data from CPU (RAM) to GPU (VRAM) memory UploadMesh(&mesh, false); + return mesh; } From 78e86b6ea5824699f9fdaf708f532e5215ea9e7f Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 24 Aug 2024 18:58:43 +0200 Subject: [PATCH 16/28] Update rlgl.h --- src/rlgl.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rlgl.h b/src/rlgl.h index 5fb9497cd..2f8515ee2 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -665,7 +665,7 @@ RLAPI void rlDisableScissorTest(void); // Disable scissor test RLAPI void rlScissor(int x, int y, int width, int height); // Scissor test RLAPI void rlEnableWireMode(void); // Enable wire mode RLAPI void rlEnablePointMode(void); // Enable point mode -RLAPI void rlDisableWireMode(void); // Disable wire mode ( and point ) maybe rename +RLAPI void rlDisableWireMode(void); // Disable wire (and point) mode RLAPI void rlSetLineWidth(float width); // Set the line drawing width RLAPI float rlGetLineWidth(void); // Get the line drawing width RLAPI void rlEnableSmoothLines(void); // Enable line aliasing @@ -1948,6 +1948,7 @@ void rlEnableWireMode(void) #endif } +// Enable point mode void rlEnablePointMode(void) { #if defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_33) @@ -1956,6 +1957,7 @@ void rlEnablePointMode(void) glEnable(GL_PROGRAM_POINT_SIZE); #endif } + // Disable wire mode void rlDisableWireMode(void) { @@ -4236,6 +4238,8 @@ void rlSetUniform(int locIndex, const void *value, int uniformType, int count) 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"); + + // TODO: Support glUniform1uiv(), glUniform2uiv(), glUniform3uiv(), glUniform4uiv() } #endif } From 4c9282b09025677a90e5e54ffe142824560163b6 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 24 Aug 2024 18:59:24 +0200 Subject: [PATCH 17/28] ADDED: `isGpuReady` flag, allow font loading with no GPU acceleration --- src/rcore.c | 48 ++++++++++++++++++++++++++++-------------------- src/rtext.c | 32 ++++++++++++++++++-------------- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index e8041ea41..972d58600 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -360,10 +360,15 @@ typedef struct CoreData { //---------------------------------------------------------------------------------- RLAPI const char *raylib_version = RAYLIB_VERSION; // raylib version exported symbol, required for some bindings -CoreData CORE = { 0 }; // Global CORE state context +CoreData CORE = { 0 }; // Global CORE state context + +// Flag to note GPU acceleration is available, +// referenced from other modules to support GPU data loading +// NOTE: Useful to allow Texture, RenderTexture, Font.texture, Mesh.vaoId/vboId, Shader loading +bool isGpuReady = false; #if defined(SUPPORT_SCREEN_CAPTURE) -static int screenshotCounter = 0; // Screenshots counter +static int screenshotCounter = 0; // Screenshots counter #endif #if defined(SUPPORT_GIF_RECORDING) @@ -637,28 +642,31 @@ void InitWindow(int width, int height, const char *title) // Initialize rlgl default data (buffers and shaders) // NOTE: CORE.Window.currentFbo.width and CORE.Window.currentFbo.height not used, just stored as globals in rlgl rlglInit(CORE.Window.currentFbo.width, CORE.Window.currentFbo.height); + isGpuReady = true; // Flag to note GPU has been initialized successfully // Setup default viewport SetupViewport(CORE.Window.currentFbo.width, CORE.Window.currentFbo.height); -#if defined(SUPPORT_MODULE_RTEXT) && defined(SUPPORT_DEFAULT_FONT) - // Load default font - // WARNING: External function: Module required: rtext - LoadFontDefault(); - #if defined(SUPPORT_MODULE_RSHAPES) - // Set font white rectangle for shapes drawing, so shapes and text can be batched together - // WARNING: rshapes module is required, if not available, default internal white rectangle is used - Rectangle rec = GetFontDefault().recs[95]; - if (CORE.Window.flags & FLAG_MSAA_4X_HINT) - { - // NOTE: We try to maxime rec padding to avoid pixel bleeding on MSAA filtering - SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 2, rec.y + 2, 1, 1 }); - } - else - { - // NOTE: We set up a 1px padding on char rectangle to avoid pixel bleeding - SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 1, rec.y + 1, rec.width - 2, rec.height - 2 }); - } +#if defined(SUPPORT_MODULE_RTEXT) + #if defined(SUPPORT_DEFAULT_FONT) + // Load default font + // WARNING: External function: Module required: rtext + LoadFontDefault(); + #if defined(SUPPORT_MODULE_RSHAPES) + // Set font white rectangle for shapes drawing, so shapes and text can be batched together + // WARNING: rshapes module is required, if not available, default internal white rectangle is used + Rectangle rec = GetFontDefault().recs[95]; + if (CORE.Window.flags & FLAG_MSAA_4X_HINT) + { + // NOTE: We try to maxime rec padding to avoid pixel bleeding on MSAA filtering + SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 2, rec.y + 2, 1, 1 }); + } + else + { + // NOTE: We set up a 1px padding on char rectangle to avoid pixel bleeding + SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 1, rec.y + 1, rec.width - 2, rec.height - 2 }); + } + #endif #endif #else #if defined(SUPPORT_MODULE_RSHAPES) diff --git a/src/rtext.c b/src/rtext.c index 8c1dc3c5e..4f1be2cd7 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -124,6 +124,7 @@ //---------------------------------------------------------------------------------- // Global variables //---------------------------------------------------------------------------------- +extern bool isGpuReady; #if defined(SUPPORT_DEFAULT_FONT) // Default font provided by raylib // NOTE: Default font is loaded on InitWindow() and disposed on CloseWindow() [module: core] @@ -252,7 +253,7 @@ extern void LoadFontDefault(void) counter++; } - defaultFont.texture = LoadTextureFromImage(imFont); + if (isGpuReady) defaultFont.texture = LoadTextureFromImage(imFont); // Reconstruct charSet using charsWidth[], charsHeight, charsDivisor, glyphCount //------------------------------------------------------------------------------ @@ -308,7 +309,7 @@ extern void LoadFontDefault(void) extern void UnloadFontDefault(void) { for (int i = 0; i < defaultFont.glyphCount; i++) UnloadImage(defaultFont.glyphs[i].image); - UnloadTexture(defaultFont.texture); + if (isGpuReady) UnloadTexture(defaultFont.texture); RL_FREE(defaultFont.glyphs); RL_FREE(defaultFont.recs); } @@ -362,11 +363,14 @@ Font LoadFont(const char *fileName) UnloadImage(image); } - if (font.texture.id == 0) TRACELOG(LOG_WARNING, "FONT: [%s] Failed to load font texture -> Using default font", fileName); - else + if (isGpuReady) { - SetTextureFilter(font.texture, TEXTURE_FILTER_POINT); // By default, we set point filter (the best performance) - TRACELOG(LOG_INFO, "FONT: Data loaded successfully (%i pixel size | %i glyphs)", FONT_TTF_DEFAULT_SIZE, FONT_TTF_DEFAULT_NUMCHARS); + if (font.texture.id == 0) TRACELOG(LOG_WARNING, "FONT: [%s] Failed to load font texture -> Using default font", fileName); + else + { + SetTextureFilter(font.texture, TEXTURE_FILTER_POINT); // By default, we set point filter (the best performance) + TRACELOG(LOG_INFO, "FONT: Data loaded successfully (%i pixel size | %i glyphs)", FONT_TTF_DEFAULT_SIZE, FONT_TTF_DEFAULT_NUMCHARS); + } } return font; @@ -487,7 +491,7 @@ Font LoadFontFromImage(Image image, Color key, int firstChar) }; // Set font with all data parsed from image - font.texture = LoadTextureFromImage(fontClear); // Convert processed image to OpenGL texture + if (isGpuReady) font.texture = LoadTextureFromImage(fontClear); // Convert processed image to OpenGL texture font.glyphCount = index; font.glyphPadding = 0; @@ -556,7 +560,7 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int font.glyphPadding = FONT_TTF_DEFAULT_CHARS_PADDING; Image atlas = GenImageFontAtlas(font.glyphs, &font.recs, font.glyphCount, font.baseSize, font.glyphPadding, 0); - font.texture = LoadTextureFromImage(atlas); + if (isGpuReady) font.texture = LoadTextureFromImage(atlas); // Update glyphs[i].image to use alpha, required to be used on ImageDrawText() for (int i = 0; i < font.glyphCount; i++) @@ -580,7 +584,7 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int // Check if a font is ready bool IsFontReady(Font font) { - return ((font.texture.id > 0) && // Validate OpenGL id fot font texture atlas + return ((font.texture.id > 0) && // Validate OpenGL id for font texture atlas (font.baseSize > 0) && // Validate font size (font.glyphCount > 0) && // Validate font contains some glyph (font.recs != NULL) && // Validate font recs defining glyphs on texture atlas @@ -946,7 +950,7 @@ void UnloadFont(Font font) if (font.texture.id != GetFontDefault().texture.id) { UnloadFontData(font.glyphs, font.glyphCount); - UnloadTexture(font.texture); + if (isGpuReady) UnloadTexture(font.texture); RL_FREE(font.recs); TRACELOGD("FONT: Unloaded font data from RAM and VRAM"); @@ -1066,7 +1070,7 @@ bool ExportFontAsCode(Font font, const char *fileName) byteCount += sprintf(txtData + byteCount, " Image imFont = { fontImageData_%s, %i, %i, 1, %i };\n\n", styleName, image.width, image.height, image.format); #endif byteCount += sprintf(txtData + byteCount, " // Load texture from image\n"); - byteCount += sprintf(txtData + byteCount, " font.texture = LoadTextureFromImage(imFont);\n"); + byteCount += sprintf(txtData + byteCount, " if (isGpuReady) font.texture = LoadTextureFromImage(imFont);\n"); #if defined(SUPPORT_COMPRESSED_FONT_ATLAS) byteCount += sprintf(txtData + byteCount, " UnloadImage(imFont); // Uncompressed data can be unloaded from memory\n\n"); #endif @@ -1277,7 +1281,7 @@ Vector2 MeasureTextEx(Font font, const char *text, float fontSize, float spacing { Vector2 textSize = { 0 }; - if ((font.texture.id == 0) || (text == NULL)) return textSize; // Security check + if ((isGpuReady && (font.texture.id == 0)) || (text == NULL)) return textSize; // Security check int size = TextLength(text); // Get size in bytes of text int tempByteCounter = 0; // Used to count longer text line num chars @@ -2257,7 +2261,7 @@ static Font LoadBMFont(const char *fileName) RL_FREE(imFonts); - font.texture = LoadTextureFromImage(fullFont); + if (isGpuReady) font.texture = LoadTextureFromImage(fullFont); // Fill font characters info data font.baseSize = fontSize; @@ -2299,7 +2303,7 @@ static Font LoadBMFont(const char *fileName) UnloadImage(fullFont); UnloadFileText(fileText); - if (font.texture.id == 0) + if (isGpuReady && (font.texture.id == 0)) { UnloadFont(font); font = GetFontDefault(); From 0aba21f71c30f3375fa898f8c733089528617639 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sat, 24 Aug 2024 11:31:28 -0700 Subject: [PATCH 18/28] [RCORE] Update comments on fullscreen and boderless window to describe what they do (#4280) * Update raylib_api.* by CI * update fullscreen and borderless comments to better describe what they do. * Update raylib_api.* by CI --------- Co-authored-by: github-actions[bot] --- parser/output/raylib_api.json | 4 ++-- parser/output/raylib_api.lua | 4 ++-- parser/output/raylib_api.txt | 4 ++-- parser/output/raylib_api.xml | 4 ++-- src/raylib.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/parser/output/raylib_api.json b/parser/output/raylib_api.json index dfe37e2fe..03b19325a 100644 --- a/parser/output/raylib_api.json +++ b/parser/output/raylib_api.json @@ -3215,12 +3215,12 @@ }, { "name": "ToggleFullscreen", - "description": "Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP)", + "description": "Toggle window state: fullscreen/windowed [resizes monitor to match window resolution] (only PLATFORM_DESKTOP)", "returnType": "void" }, { "name": "ToggleBorderlessWindowed", - "description": "Toggle window state: borderless windowed (only PLATFORM_DESKTOP)", + "description": "Toggle window state: borderless windowed [resizes window to match monitor resolution] (only PLATFORM_DESKTOP)", "returnType": "void" }, { diff --git a/parser/output/raylib_api.lua b/parser/output/raylib_api.lua index 933b2c704..7d74c9a41 100644 --- a/parser/output/raylib_api.lua +++ b/parser/output/raylib_api.lua @@ -3158,12 +3158,12 @@ return { }, { name = "ToggleFullscreen", - description = "Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP)", + description = "Toggle window state: fullscreen/windowed [resizes monitor to match window resolution] (only PLATFORM_DESKTOP)", returnType = "void" }, { name = "ToggleBorderlessWindowed", - description = "Toggle window state: borderless windowed (only PLATFORM_DESKTOP)", + description = "Toggle window state: borderless windowed [resizes window to match monitor resolution] (only PLATFORM_DESKTOP)", returnType = "void" }, { diff --git a/parser/output/raylib_api.txt b/parser/output/raylib_api.txt index 94562d66a..fb30ebe5f 100644 --- a/parser/output/raylib_api.txt +++ b/parser/output/raylib_api.txt @@ -1056,12 +1056,12 @@ Function 013: ClearWindowState() (1 input parameters) Function 014: ToggleFullscreen() (0 input parameters) Name: ToggleFullscreen Return type: void - Description: Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP) + Description: Toggle window state: fullscreen/windowed [resizes monitor to match window resolution] (only PLATFORM_DESKTOP) No input parameters Function 015: ToggleBorderlessWindowed() (0 input parameters) Name: ToggleBorderlessWindowed Return type: void - Description: Toggle window state: borderless windowed (only PLATFORM_DESKTOP) + Description: Toggle window state: borderless windowed [resizes window to match monitor resolution] (only PLATFORM_DESKTOP) No input parameters Function 016: MaximizeWindow() (0 input parameters) Name: MaximizeWindow diff --git a/parser/output/raylib_api.xml b/parser/output/raylib_api.xml index 02cfd02d0..532b9e3b9 100644 --- a/parser/output/raylib_api.xml +++ b/parser/output/raylib_api.xml @@ -703,9 +703,9 @@ - + - + diff --git a/src/raylib.h b/src/raylib.h index f51a444e1..7e9af7ada 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -968,8 +968,8 @@ RLAPI bool IsWindowResized(void); // Check if wi RLAPI bool IsWindowState(unsigned int flag); // Check if one specific window flag is enabled RLAPI void SetWindowState(unsigned int flags); // Set window configuration state using flags (only PLATFORM_DESKTOP) RLAPI void ClearWindowState(unsigned int flags); // Clear window configuration state flags -RLAPI void ToggleFullscreen(void); // Toggle window state: fullscreen/windowed (only PLATFORM_DESKTOP) -RLAPI void ToggleBorderlessWindowed(void); // Toggle window state: borderless windowed (only PLATFORM_DESKTOP) +RLAPI void ToggleFullscreen(void); // Toggle window state: fullscreen/windowed [resizes monitor to match window resolution] (only PLATFORM_DESKTOP) +RLAPI void ToggleBorderlessWindowed(void); // Toggle window state: borderless windowed [resizes window to match monitor resolution] (only PLATFORM_DESKTOP) RLAPI void MaximizeWindow(void); // Set window state: maximized, if resizable (only PLATFORM_DESKTOP) RLAPI void MinimizeWindow(void); // Set window state: minimized, if resizable (only PLATFORM_DESKTOP) RLAPI void RestoreWindow(void); // Set window state: not minimized/maximized (only PLATFORM_DESKTOP) From 0c06a08e0738a5777d150b7b4562cd8595680271 Mon Sep 17 00:00:00 2001 From: Dave Green <34277803+SoloByte@users.noreply.github.com> Date: Sat, 24 Aug 2024 20:33:21 +0200 Subject: [PATCH 19/28] [rcore][desktop_glfw] Keeping CORE.Window.position properly in sync with glfw window position (#4190) * WindowPosCallback added. CORE.Window.position is now properly kept in sync with the glfw window position. * Update rcore_desktop_glfw.c Comments updated. * Setting CORE.Window.position correctly in InitPlatform() as well. This also fixes not centering the window correctly when the high dpi flag was enabled. * Fixes centering the window in the SetWindowMonitor() function. Here the render size has to be used again in case the high dpi flag is enabled. * Update Window Position Update Window Position right away in ToggleFullscreen() & ToggleBorderlessWindowed() functions --- src/platforms/rcore_desktop_glfw.c | 47 ++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/platforms/rcore_desktop_glfw.c b/src/platforms/rcore_desktop_glfw.c index d64bf60db..c6685846c 100644 --- a/src/platforms/rcore_desktop_glfw.c +++ b/src/platforms/rcore_desktop_glfw.c @@ -109,6 +109,7 @@ static void ErrorCallback(int error, const char *description); // Window callbacks events static void WindowSizeCallback(GLFWwindow *window, int width, int height); // GLFW3 WindowSize Callback, runs when window is resized +static void WindowPosCallback(GLFWwindow* window, int x, int y); // GLFW3 WindowPos Callback, runs when window is moved static void WindowIconifyCallback(GLFWwindow *window, int iconified); // GLFW3 WindowIconify Callback, runs when window is minimized/restored static void WindowMaximizeCallback(GLFWwindow* window, int maximized); // GLFW3 Window Maximize Callback, runs when window is maximized static void WindowFocusCallback(GLFWwindow *window, int focused); // GLFW3 WindowFocus Callback, runs when window get/lose focus @@ -147,8 +148,8 @@ void ToggleFullscreen(void) if (!CORE.Window.fullscreen) { // Store previous window position (in case we exit fullscreen) - glfwGetWindowPos(platform.handle, &CORE.Window.position.x, &CORE.Window.position.y); - + CORE.Window.previousPosition = CORE.Window.position; + int monitorCount = 0; int monitorIndex = GetCurrentMonitor(); GLFWmonitor **monitors = glfwGetMonitors(&monitorCount); @@ -179,7 +180,11 @@ void ToggleFullscreen(void) CORE.Window.fullscreen = false; CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE; - glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.position.x, CORE.Window.position.y, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); + glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); + + // we update the window position right away + CORE.Window.position.x = CORE.Window.previousPosition.x; + CORE.Window.position.y = CORE.Window.previousPosition.y; } // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) @@ -190,11 +195,11 @@ void ToggleFullscreen(void) // Toggle borderless windowed mode void ToggleBorderlessWindowed(void) { - // Leave fullscreen before attempting to set borderless windowed mode and get screen position from it + // Leave fullscreen before attempting to set borderless windowed mode bool wasOnFullscreen = false; if (CORE.Window.fullscreen) { - CORE.Window.previousPosition = CORE.Window.position; + // fullscreen already saves the previous position so it does not need to be set here again ToggleFullscreen(); wasOnFullscreen = true; } @@ -213,7 +218,7 @@ void ToggleBorderlessWindowed(void) { // Store screen position and size // NOTE: If it was on fullscreen, screen position was already stored, so skip setting it here - if (!wasOnFullscreen) glfwGetWindowPos(platform.handle, &CORE.Window.previousPosition.x, &CORE.Window.previousPosition.y); + if (!wasOnFullscreen) CORE.Window.previousPosition = CORE.Window.position; CORE.Window.previousScreen = CORE.Window.screen; // Set undecorated and topmost modes and flags @@ -255,6 +260,9 @@ void ToggleBorderlessWindowed(void) glfwFocusWindow(platform.handle); CORE.Window.flags &= ~FLAG_BORDERLESS_WINDOWED_MODE; + + CORE.Window.position.x = CORE.Window.previousPosition.x; + CORE.Window.position.y = CORE.Window.previousPosition.y; } } else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor"); @@ -592,6 +600,9 @@ void SetWindowTitle(const char *title) // Set window position on screen (windowed mode) void SetWindowPosition(int x, int y) { + // Update CORE.Window.position as well + CORE.Window.position.x = x; + CORE.Window.position.y = y; glfwSetWindowPos(platform.handle, x, y); } @@ -614,8 +625,9 @@ void SetWindowMonitor(int monitor) { TRACELOG(LOG_INFO, "GLFW: Selected monitor: [%i] %s", monitor, glfwGetMonitorName(monitors[monitor])); - const int screenWidth = CORE.Window.screen.width; - const int screenHeight = CORE.Window.screen.height; + // Here the render width has to be used again in case high dpi flag is enabled + const int screenWidth = CORE.Window.render.width; + const int screenHeight = CORE.Window.render.height; int monitorWorkareaX = 0; int monitorWorkareaY = 0; int monitorWorkareaWidth = 0; @@ -1568,12 +1580,17 @@ int InitPlatform(void) int monitorWidth = 0; int monitorHeight = 0; glfwGetMonitorWorkarea(monitor, &monitorX, &monitorY, &monitorWidth, &monitorHeight); - - int posX = monitorX + (monitorWidth - (int)CORE.Window.screen.width)/2; - int posY = monitorY + (monitorHeight - (int)CORE.Window.screen.height)/2; + + // Here CORE.Window.render.width/height should be used instead of CORE.Window.screen.width/height to center the window correctly when the high dpi flag is enabled. + int posX = monitorX + (monitorWidth - (int)CORE.Window.render.width)/2; + int posY = monitorY + (monitorHeight - (int)CORE.Window.render.height)/2; if (posX < monitorX) posX = monitorX; if (posY < monitorY) posY = monitorY; SetWindowPosition(posX, posY); + + // Update CORE.Window.position here so it is correct from the start + CORE.Window.position.x = posX; + CORE.Window.position.y = posY; } // Load OpenGL extensions @@ -1585,6 +1602,7 @@ int InitPlatform(void) //---------------------------------------------------------------------------- // Set window callback events glfwSetWindowSizeCallback(platform.handle, WindowSizeCallback); // NOTE: Resizing not allowed by default! + glfwSetWindowPosCallback(platform.handle, WindowPosCallback); glfwSetWindowMaximizeCallback(platform.handle, WindowMaximizeCallback); glfwSetWindowIconifyCallback(platform.handle, WindowIconifyCallback); glfwSetWindowFocusCallback(platform.handle, WindowFocusCallback); @@ -1681,7 +1699,12 @@ static void WindowSizeCallback(GLFWwindow *window, int width, int height) // NOTE: Postprocessing texture is not scaled to new size } - +static void WindowPosCallback(GLFWwindow* window, int x, int y) +{ + // Set current window position + CORE.Window.position.x = x; + CORE.Window.position.y = y; +} static void WindowContentScaleCallback(GLFWwindow *window, float scalex, float scaley) { CORE.Window.screenScale = MatrixScale(scalex, scaley, 1.0f); From d314afc451e4b0ed6fe69249dffccb65bd1e0582 Mon Sep 17 00:00:00 2001 From: Tchan0 <61758157+Tchan0@users.noreply.github.com> Date: Sat, 24 Aug 2024 20:35:49 +0200 Subject: [PATCH 20/28] rlgl.h: glint64 did not exist before OpenGL 3.2 (#4284) Compilation breaks on rlgl.h for early OpenGL versions. Glint64 did not exist on those versions (< OpenGL 3.2) --- src/rlgl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 2f8515ee2..3efed736a 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -4414,14 +4414,14 @@ void rlUpdateShaderBuffer(unsigned int id, const void *data, unsigned int dataSi // Get SSBO buffer size unsigned int rlGetShaderBufferSize(unsigned int id) { - GLint64 size = 0; - #if defined(GRAPHICS_API_OPENGL_43) + GLint64 size = 0; glBindBuffer(GL_SHADER_STORAGE_BUFFER, id); glGetBufferParameteri64v(GL_SHADER_STORAGE_BUFFER, GL_BUFFER_SIZE, &size); -#endif - return (size > 0)? (unsigned int)size : 0; +#else + return 0; +#endif } // Read SSBO buffer data (GPU->CPU) From 8dbf3712445c27e86bebf1b82e1de04cf1099a91 Mon Sep 17 00:00:00 2001 From: Tchan0 <61758157+Tchan0@users.noreply.github.com> Date: Sun, 25 Aug 2024 11:23:08 +0200 Subject: [PATCH 21/28] Examples makefiles: align /usr/local with /src Makefile (#4286) * align /usr/local with src Makefile Align /usr/local with the /src Makefile, where it can be overriden. * /usr/local: allow override align /usr/local with the /src Makefile, where it can be overriden --- examples/Makefile | 5 +++-- examples/Makefile.Web | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 904917f7c..bdbb6e351 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -70,8 +70,9 @@ RAYLIB_SRC_PATH ?= ../src # 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_LIB_PATH ?= /usr/local/lib +DESTDIR ?= /usr/local +RAYLIB_INCLUDE_PATH ?= $(DESTDIR)/include +RAYLIB_LIB_PATH ?= $(DESTDIR)/lib # Library type compilation: STATIC (.a) or SHARED (.so/.dll) RAYLIB_LIBTYPE ?= STATIC diff --git a/examples/Makefile.Web b/examples/Makefile.Web index 7057da1c0..bd48c2a4a 100644 --- a/examples/Makefile.Web +++ b/examples/Makefile.Web @@ -35,8 +35,9 @@ 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_LIB_PATH ?= /usr/local/lib +DESTDIR ?= /usr/local +RAYLIB_INCLUDE_PATH ?= $(DESTDIR)/include +RAYLIB_LIB_PATH ?= $(DESTDIR)/lib # Library type compilation: STATIC (.a) or SHARED (.so/.dll) RAYLIB_LIBTYPE ?= STATIC From dec7f12b148ea4383c166d42812e19e0c793bdb0 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 25 Aug 2024 12:51:55 +0200 Subject: [PATCH 22/28] Update raylib.h --- src/raylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raylib.h b/src/raylib.h index 7e9af7ada..30ba8bd2a 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1443,7 +1443,7 @@ 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 *codepoints, int codepointCount); // Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character set +RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *codepoints, int codepointCount); // Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character set, font size is provided in pixels height 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 *codepoints, int codepointCount); // Load font from memory buffer, fileType refers to extension: i.e. '.ttf' RLAPI bool IsFontReady(Font font); // Check if a font is ready From 157c7c21d451e022f8227ee5b756a99689a1d3a3 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 25 Aug 2024 12:52:27 +0200 Subject: [PATCH 23/28] ADDED: more uniform data type options #4137 --- src/rlgl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/rlgl.h b/src/rlgl.h index 3efed736a..34fabe45e 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -527,6 +527,10 @@ typedef enum { 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_UINT, // Shader uniform type: unsigned int + RL_SHADER_UNIFORM_UIVEC2, // Shader uniform type: uivec2 (2 unsigned int) + RL_SHADER_UNIFORM_UIVEC3, // Shader uniform type: uivec3 (3 unsigned int) + RL_SHADER_UNIFORM_UIVEC4, // Shader uniform type: uivec4 (4 unsigned int) RL_SHADER_UNIFORM_SAMPLER2D // Shader uniform type: sampler2d } rlShaderUniformDataType; @@ -4236,6 +4240,10 @@ void rlSetUniform(int locIndex, const void *value, int uniformType, int count) 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_UINT: glUniform1uiv(locIndex, count, (unsigned int *)value); break; + case RL_SHADER_UNIFORM_UIVEC2: glUniform2uiv(locIndex, count, (unsigned int *)value); break; + case RL_SHADER_UNIFORM_UIVEC3: glUniform3uiv(locIndex, count, (unsigned int *)value); break; + case RL_SHADER_UNIFORM_UIVEC4: glUniform4uiv(locIndex, count, (unsigned 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"); From 5604f6d8a34b94118a9f24e433eb06e771d8378c Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 25 Aug 2024 12:57:05 +0200 Subject: [PATCH 24/28] Update rlgl.h --- src/rlgl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rlgl.h b/src/rlgl.h index 34fabe45e..9b94d402c 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -4240,10 +4240,12 @@ void rlSetUniform(int locIndex, const void *value, int uniformType, int count) 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; + #if !defined(GRAPHICS_API_OPENGL_ES2) case RL_SHADER_UNIFORM_UINT: glUniform1uiv(locIndex, count, (unsigned int *)value); break; case RL_SHADER_UNIFORM_UIVEC2: glUniform2uiv(locIndex, count, (unsigned int *)value); break; case RL_SHADER_UNIFORM_UIVEC3: glUniform3uiv(locIndex, count, (unsigned int *)value); break; case RL_SHADER_UNIFORM_UIVEC4: glUniform4uiv(locIndex, count, (unsigned int *)value); break; + #endif 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"); From f5ef3578100ff06dc1ad3752076e5771de4717f9 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 25 Aug 2024 13:55:53 +0200 Subject: [PATCH 25/28] Update rtext.c --- src/rtext.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rtext.c b/src/rtext.c index 4f1be2cd7..34b6fcedb 100644 --- a/src/rtext.c +++ b/src/rtext.c @@ -677,6 +677,8 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz { stbtt_GetCodepointHMetrics(&fontInfo, ch, &chars[i].advanceX, NULL); chars[i].advanceX = (int)((float)chars[i].advanceX*scaleFactor); + + if (chh > fontSize) TRACELOG(LOG_WARNING, "FONT: Character [0x%08x] size is bigger than expected font size", ch); // Load characters images chars[i].image.width = chw; From 91a9888baa61e221cb6e68a5fd8fc005fffcbca8 Mon Sep 17 00:00:00 2001 From: Jeffery Myers Date: Sun, 25 Aug 2024 09:49:52 -0700 Subject: [PATCH 26/28] [rModels] Correctly split obj meshes by material (#4285) * Correctly split meshes from tinyobj by material so they can be represented by raylib correctly * PR Feedback --- src/rmodels.c | 304 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 206 insertions(+), 98 deletions(-) diff --git a/src/rmodels.c b/src/rmodels.c index 966a8665c..5fb512403 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -2016,6 +2016,8 @@ static void ProcessMaterialsOBJ(Material *materials, tinyobj_material_t *mats, i // NOTE: Uses default shader, which only supports MATERIAL_MAP_DIFFUSE materials[m] = LoadMaterialDefault(); + if (mats == NULL) continue; + // Get default texture, in case no texture is defined // NOTE: rlgl default texture is a 1x1 pixel UNCOMPRESSED_R8G8B8A8 materials[m].maps[MATERIAL_MAP_DIFFUSE].texture = (Texture2D){ rlGetTextureIdDefault(), 1, 1, 1, PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 }; @@ -4073,130 +4075,236 @@ static void BuildPoseFromParentJoints(BoneInfo *bones, int boneCount, Transform // - the mesh is automatically triangulated by tinyobj static Model LoadOBJ(const char *fileName) { + tinyobj_attrib_t objAttributes = { 0 }; + tinyobj_shape_t* objShapes = NULL; + unsigned int objShapeCount = 0; + + tinyobj_material_t* objMaterials = NULL; + unsigned int objMaterialCount = 0; + Model model = { 0 }; + model.transform = MatrixIdentity(); - tinyobj_attrib_t attrib = { 0 }; - tinyobj_shape_t *meshes = NULL; - unsigned int meshCount = 0; + char* fileText = LoadFileText(fileName); - tinyobj_material_t *materials = NULL; - unsigned int materialCount = 0; - - char *fileText = LoadFileText(fileName); - - if (fileText != NULL) + if (fileText == NULL) { - unsigned int dataSize = (unsigned int)strlen(fileText); + TRACELOG(LOG_ERROR, "MODEL Unable to read obj file %s", fileName); + return model; + } - char currentDir[1024] = { 0 }; - strcpy(currentDir, GetWorkingDirectory()); // Save current working directory - const char *workingDir = GetDirectoryPath(fileName); // Switch to OBJ directory for material path correctness - if (CHDIR(workingDir) != 0) + char currentDir[1024] = { 0 }; + strcpy(currentDir, GetWorkingDirectory()); // Save current working directory + const char* workingDir = GetDirectoryPath(fileName); // Switch to OBJ directory for material path correctness + if (CHDIR(workingDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", workingDir); + } + + unsigned int dataSize = (unsigned int)strlen(fileText); + + unsigned int flags = TINYOBJ_FLAG_TRIANGULATE; + int ret = tinyobj_parse_obj(&objAttributes, &objShapes, &objShapeCount, &objMaterials, &objMaterialCount, fileText, dataSize, flags); + + if (ret != TINYOBJ_SUCCESS) + { + TRACELOG(LOG_ERROR, "MODEL Unable to read obj data %s", fileName); + return model; + } + + UnloadFileText(fileText); + + unsigned int faceVertIndex = 0; + unsigned int nextShape = 1; + int lastMaterial = -1; + unsigned int meshIndex = 0; + + // count meshes + unsigned int nextShapeEnd = objAttributes.num_face_num_verts; + + // see how many verts till the next shape + + if (objShapeCount > 1) nextShapeEnd = objShapes[nextShape].face_offset; + + // walk all the faces + for (unsigned int faceId = 0; faceId < objAttributes.num_faces; faceId++) + { + if (faceVertIndex >= nextShapeEnd) { - TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", workingDir); + // try to find the last vert in the next shape + nextShape++; + if (nextShape < objShapeCount) nextShapeEnd = objShapes[nextShape].face_offset; + else nextShapeEnd = objAttributes.num_face_num_verts; // this is actually the total number of face verts in the file, not faces + meshIndex++; + } + else if (lastMaterial != -1 && objAttributes.material_ids[faceId] != lastMaterial) + { + meshIndex++;// if this is a new material, we need to allocate a new mesh } - unsigned int flags = TINYOBJ_FLAG_TRIANGULATE; - int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, fileText, dataSize, flags); + lastMaterial = objAttributes.material_ids[faceId]; + faceVertIndex += objAttributes.face_num_verts[faceId]; + } - 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); + // allocate the base meshes and materials + model.meshCount = meshIndex + 1; + model.meshes = (Mesh*)MemAlloc(sizeof(Mesh) * model.meshCount); - // WARNING: We are not splitting meshes by materials (previous implementation) - // Depending on the provided OBJ that was not the best option and it just crashed - // so, implementation was simplified to prioritize parsed meshes - model.meshCount = meshCount; + if (objMaterialCount > 0) + { + model.materialCount = objMaterialCount; + model.materials = (Material*)MemAlloc(sizeof(Material) * objMaterialCount); + } + else // we must allocate at least one material + { + model.materialCount = 1; + model.materials = (Material*)MemAlloc(sizeof(Material) * 1); + } - // Set number of materials available - // NOTE: There could be more materials available than meshes but it will be resolved at - // model.meshMaterial, just assigning the right material to corresponding mesh - model.materialCount = materialCount; - if (model.materialCount == 0) + model.meshMaterial = (int*)MemAlloc(sizeof(int) * model.meshCount); + + // see how many verts are in each mesh + unsigned int* localMeshVertexCounts = (unsigned int*)MemAlloc(sizeof(unsigned int) * model.meshCount); + + faceVertIndex = 0; + nextShapeEnd = objAttributes.num_face_num_verts; + lastMaterial = -1; + meshIndex = 0; + unsigned int localMeshVertexCount = 0; + + nextShape = 1; + if (objShapeCount > 1) + nextShapeEnd = objShapes[nextShape].face_offset; + + // walk all the faces + for (unsigned int faceId = 0; faceId < objAttributes.num_faces; faceId++) + { + bool newMesh = false; // do we need a new mesh? + if (faceVertIndex >= nextShapeEnd) { - model.materialCount = 1; - TRACELOG(LOG_INFO, "MODEL: No materials provided, setting one default material for all meshes"); + // try to find the last vert in the next shape + nextShape++; + if (nextShape < objShapeCount) nextShapeEnd = objShapes[nextShape].face_offset; + else nextShapeEnd = objAttributes.num_face_num_verts; // this is actually the total number of face verts in the file, not faces + + newMesh = true; } - else if (model.materialCount > 1 && model.meshCount > 1) + else if (lastMaterial != -1 && objAttributes.material_ids[faceId] != lastMaterial) { - // TEMP warning about multiple materials, to be removed when proper splitting code is implemented - // any obj with multiple materials will need to have it's materials assigned by the user in code to work at this time - TRACELOG(LOG_INFO, "MODEL: OBJ has multiple materials, manual material assignment will be required."); + newMesh = true; } - // Init model meshes and materials - model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh)); - model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); // Material index assigned to each mesh - model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material)); + lastMaterial = objAttributes.material_ids[faceId]; - // Process each provided mesh - for (int i = 0; i < model.meshCount; i++) + if (newMesh) { - // WARNING: We need to calculate the mesh triangles manually using meshes[i].face_offset - // because in case of triangulated quads, meshes[i].length actually report quads, - // despite the triangulation that is efectively considered on attrib.num_faces - unsigned int tris = 0; - if (i == model.meshCount - 1) tris = attrib.num_faces - meshes[i].face_offset; - else tris = meshes[i + 1].face_offset; + localMeshVertexCounts[meshIndex] = localMeshVertexCount; - model.meshes[i].vertexCount = tris*3; - model.meshes[i].triangleCount = tris; // Face count (triangulated) - model.meshes[i].vertices = (float *)RL_CALLOC(model.meshes[i].vertexCount*3, sizeof(float)); - model.meshes[i].texcoords = (float *)RL_CALLOC(model.meshes[i].vertexCount*2, sizeof(float)); - model.meshes[i].normals = (float *)RL_CALLOC(model.meshes[i].vertexCount*3, sizeof(float)); - model.meshMaterial[i] = 0; // By default, assign material 0 to each mesh - - // Process all mesh faces - for (unsigned int face = 0, f = meshes[i].face_offset, v = 0, vt = 0, vn = 0; face < tris; face++, f++, v += 3, vt += 3, vn += 3) - { - // Get indices for the face - tinyobj_vertex_index_t idx0 = attrib.faces[f*3 + 0]; - tinyobj_vertex_index_t idx1 = attrib.faces[f*3 + 1]; - tinyobj_vertex_index_t idx2 = attrib.faces[f*3 + 2]; - - // Fill vertices buffer (float) using vertex index of the face - for (int n = 0; n < 3; n++) { model.meshes[i].vertices[v*3 + n] = attrib.vertices[idx0.v_idx*3 + n]; } - for (int n = 0; n < 3; n++) { model.meshes[i].vertices[(v + 1)*3 + n] = attrib.vertices[idx1.v_idx*3 + n]; } - for (int n = 0; n < 3; n++) { model.meshes[i].vertices[(v + 2)*3 + n] = attrib.vertices[idx2.v_idx*3 + n]; } - - if (attrib.num_texcoords > 0) - { - // Fill texcoords buffer (float) using vertex index of the face - // NOTE: Y-coordinate must be flipped upside-down - model.meshes[i].texcoords[vt*2 + 0] = attrib.texcoords[idx0.vt_idx*2 + 0]; - model.meshes[i].texcoords[vt*2 + 1] = 1.0f - attrib.texcoords[idx0.vt_idx*2 + 1]; - - model.meshes[i].texcoords[(vt + 1)*2 + 0] = attrib.texcoords[idx1.vt_idx*2 + 0]; - model.meshes[i].texcoords[(vt + 1)*2 + 1] = 1.0f - attrib.texcoords[idx1.vt_idx*2 + 1]; - - model.meshes[i].texcoords[(vt + 2)*2 + 0] = attrib.texcoords[idx2.vt_idx*2 + 0]; - model.meshes[i].texcoords[(vt + 2)*2 + 1] = 1.0f - attrib.texcoords[idx2.vt_idx*2 + 1]; - } - - if (attrib.num_normals > 0) - { - // Fill normals buffer (float) using vertex index of the face - for (int n = 0; n < 3; n++) { model.meshes[i].normals[vn*3 + n] = attrib.normals[idx0.vn_idx*3 + n]; } - for (int n = 0; n < 3; n++) { model.meshes[i].normals[(vn + 1)*3 + n] = attrib.normals[idx1.vn_idx*3 + n]; } - for (int n = 0; n < 3; n++) { model.meshes[i].normals[(vn + 2)*3 + n] = attrib.normals[idx2.vn_idx*3 + n]; } - } - } + localMeshVertexCount = 0; + meshIndex++; } - // Init model materials - if (materialCount > 0) ProcessMaterialsOBJ(model.materials, materials, materialCount); - else model.materials[0] = LoadMaterialDefault(); // Set default material for the mesh + faceVertIndex += objAttributes.face_num_verts[faceId]; + localMeshVertexCount += objAttributes.face_num_verts[faceId]; + } + localMeshVertexCounts[meshIndex] = localMeshVertexCount; - tinyobj_attrib_free(&attrib); - tinyobj_shapes_free(meshes, model.meshCount); - tinyobj_materials_free(materials, materialCount); + for (int i = 0; i < model.meshCount; i++) + { + // allocate the buffers for each mesh + unsigned int vertexCount = localMeshVertexCounts[i]; - UnloadFileText(fileText); + model.meshes[i].vertexCount = vertexCount; + model.meshes[i].triangleCount = vertexCount / 3; - // Restore current working directory - if (CHDIR(currentDir) != 0) + model.meshes[i].vertices = (float*)MemAlloc(sizeof(float) * vertexCount * 3); + model.meshes[i].normals = (float*)MemAlloc(sizeof(float) * vertexCount * 3); + model.meshes[i].texcoords = (float*)MemAlloc(sizeof(float) * vertexCount * 2); + model.meshes[i].colors = (unsigned char*)MemAlloc(sizeof(unsigned char) * vertexCount * 4); + } + + MemFree(localMeshVertexCounts); + localMeshVertexCounts = NULL; + + // fill meshes + faceVertIndex = 0; + + nextShapeEnd = objAttributes.num_face_num_verts; + + // see how many verts till the next shape + nextShape = 1; + if (objShapeCount > 1) nextShapeEnd = objShapes[nextShape].face_offset; + lastMaterial = -1; + meshIndex = 0; + localMeshVertexCount = 0; + + // walk all the faces + for (unsigned int faceId = 0; faceId < objAttributes.num_faces; faceId++) + { + bool newMesh = false; // do we need a new mesh? + if (faceVertIndex >= nextShapeEnd) { - TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", currentDir); + // try to find the last vert in the next shape + nextShape++; + if (nextShape < objShapeCount) nextShapeEnd = objShapes[nextShape].face_offset; + else nextShapeEnd = objAttributes.num_face_num_verts; // this is actually the total number of face verts in the file, not faces + newMesh = true; } + // if this is a new material, we need to allocate a new mesh + if (lastMaterial != -1 && objAttributes.material_ids[faceId] != lastMaterial) newMesh = true; + lastMaterial = objAttributes.material_ids[faceId];; + + if (newMesh) + { + localMeshVertexCount = 0; + meshIndex++; + } + + int matId = 0; + if (lastMaterial >= 0 && lastMaterial < (int)objMaterialCount) + matId = lastMaterial; + + model.meshMaterial[meshIndex] = matId; + + for (int f = 0; f < objAttributes.face_num_verts[faceId]; f++) + { + int vertIndex = objAttributes.faces[faceVertIndex].v_idx; + int normalIndex = objAttributes.faces[faceVertIndex].vn_idx; + int texcordIndex = objAttributes.faces[faceVertIndex].vt_idx; + + for (int i = 0; i < 3; i++) + model.meshes[meshIndex].vertices[localMeshVertexCount * 3 + i] = objAttributes.vertices[vertIndex * 3 + i]; + + for (int i = 0; i < 3; i++) + model.meshes[meshIndex].normals[localMeshVertexCount * 3 + i] = objAttributes.normals[normalIndex * 3 + i]; + + for (int i = 0; i < 2; i++) + model.meshes[meshIndex].texcoords[localMeshVertexCount * 2 + i] = objAttributes.texcoords[texcordIndex * 2 + i]; + + model.meshes[meshIndex].texcoords[localMeshVertexCount * 2 + 1] = 1.0f - model.meshes[meshIndex].texcoords[localMeshVertexCount * 2 + 1]; + + for (int i = 0; i < 4; i++) + model.meshes[meshIndex].colors[localMeshVertexCount * 4 + i] = 255; + + faceVertIndex++; + localMeshVertexCount++; + } + } + + if (objMaterialCount > 0) ProcessMaterialsOBJ(model.materials, objMaterials, objMaterialCount); + else model.materials[0] = LoadMaterialDefault(); // Set default material for the mesh + + tinyobj_attrib_free(&objAttributes); + tinyobj_shapes_free(objShapes, objShapeCount); + tinyobj_materials_free(objMaterials, objMaterialCount); + + for (int i = 0; i < model.meshCount; i++) + UploadMesh(model.meshes + i, true); + + // Restore current working directory + if (CHDIR(currentDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", currentDir); } return model; From 8ea5db3ec43d1fa702b29df9066307d0d337b229 Mon Sep 17 00:00:00 2001 From: Hesham Abourgheba Date: Sun, 25 Aug 2024 19:51:08 +0300 Subject: [PATCH 27/28] fix(rcore/android): Allow main() to return it its caller on configuration changes. (#4288) --- src/platforms/rcore_android.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/platforms/rcore_android.c b/src/platforms/rcore_android.c index 7a2162025..55706c591 100644 --- a/src/platforms/rcore_android.c +++ b/src/platforms/rcore_android.c @@ -694,11 +694,12 @@ void PollInputEvents(void) // Process this event if (platform.source != NULL) platform.source->process(platform.app, platform.source); - // NOTE: Never close window, native activity is controlled by the system! + // NOTE: Allow closing the window in case a configuration change happened. + // The android_main function should be allowed to return to its caller in order for the + // Android OS to relaunch the activity. if (platform.app->destroyRequested != 0) { - //CORE.Window.shouldClose = true; - //ANativeActivity_finish(platform.app->activity); + CORE.Window.shouldClose = true; } } } @@ -781,7 +782,7 @@ int InitPlatform(void) // Process this event if (platform.source != NULL) platform.source->process(platform.app, platform.source); - // NOTE: Never close window, native activity is controlled by the system! + // NOTE: It's highly likely destroyRequested will never be non-zero at the start of the activity lifecycle. //if (platform.app->destroyRequested != 0) CORE.Window.shouldClose = true; } } @@ -812,6 +813,12 @@ void ClosePlatform(void) eglTerminate(platform.device); platform.device = EGL_NO_DISPLAY; } + + // NOTE: Reset global state in case the activity is being relaunched. + if (platform.app->destroyRequested != 0) { + CORE = (CoreData){0}; + platform = (PlatformData){0}; + } } // Initialize display device and framebuffer From 5f49ec3d6448502d798d4d404e08e354ec48012a Mon Sep 17 00:00:00 2001 From: hanaxars <156359933+hanaxars@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:35:35 +0300 Subject: [PATCH 28/28] Fix missing equal sign (#4294) I just noticed there is a missing equal sign. This PR fixes this. --- src/platforms/rcore_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platforms/rcore_drm.c b/src/platforms/rcore_drm.c index 291fd93c7..43dc19c71 100644 --- a/src/platforms/rcore_drm.c +++ b/src/platforms/rcore_drm.c @@ -206,7 +206,7 @@ static const short linuxToRaylibMap[KEYMAP_SIZE] = { [BTN_TL] = GAMEPAD_BUTTON_LEFT_TRIGGER_1, [BTN_TL2] = GAMEPAD_BUTTON_LEFT_TRIGGER_2, [BTN_TR] = GAMEPAD_BUTTON_RIGHT_TRIGGER_1, - [BTN_TR2] GAMEPAD_BUTTON_RIGHT_TRIGGER_2, + [BTN_TR2] = GAMEPAD_BUTTON_RIGHT_TRIGGER_2, [BTN_SELECT] = GAMEPAD_BUTTON_MIDDLE_LEFT, [BTN_MODE] = GAMEPAD_BUTTON_MIDDLE, [BTN_START] = GAMEPAD_BUTTON_MIDDLE_RIGHT,