mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-27 13:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing spaces

Browse Source
This commit is contained in:
Ray
2025-09-14 18:07:58 +02:00
parent 96fb4851ce
commit ed8f1a22d1
8 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/core/core_input_gestures_testbed.c
View File

@@ -39,7 +39,7 @@ int main(void)
const int screenHeight = 450; const int screenHeight = 450;
InitWindow(screenWidth, screenHeight, "raylib [core] example - input gestures testbed"); InitWindow(screenWidth, screenHeight, "raylib [core] example - input gestures testbed");
Vector2 messagePosition = { 160, 7 }; Vector2 messagePosition = { 160, 7 };
// Last gesture variables definitions // Last gesture variables definitions
@@ -53,12 +53,12 @@ int main(void)
int gestureLogIndex = GESTURE_LOG_SIZE; int gestureLogIndex = GESTURE_LOG_SIZE;
int previousGesture = 0; int previousGesture = 0;
// Log mode values: // Log mode values:
// - 0 shows repeated events // - 0 shows repeated events
// - 1 hides repeated events // - 1 hides repeated events
// - 2 shows repeated events but hide hold events // - 2 shows repeated events but hide hold events
// - 3 hides repeated events and hide hold events // - 3 hides repeated events and hide hold events
int logMode = 1; int logMode = 1;
Color gestureColor = { 0, 0, 0, 255 }; Color gestureColor = { 0, 0, 0, 255 };
Rectangle logButton1 = { 53, 7, 48, 26 }; Rectangle logButton1 = { 53, 7, 48, 26 };
@@ -88,7 +88,7 @@ int main(void)
const int touchCount = GetTouchPointCount(); const int touchCount = GetTouchPointCount();
// Handle last gesture // Handle last gesture
if ((currentGesture != 0) && (currentGesture != 4) && (currentGesture != previousGesture)) if ((currentGesture != 0) && (currentGesture != 4) && (currentGesture != previousGesture))
lastGesture = currentGesture; // Filter the meaningful gestures (1, 2, 8 to 512) for the display lastGesture = currentGesture; // Filter the meaningful gestures (1, 2, 8 to 512) for the display
// Handle gesture log // Handle gesture log
@@ -155,7 +155,7 @@ int main(void)
float currentAngleRadians = ((currentAngleDegrees + 90.0f)*PI/180); // Convert the current angle to Radians float currentAngleRadians = ((currentAngleDegrees + 90.0f)*PI/180); // Convert the current angle to Radians
// Calculate the final vector for display // Calculate the final vector for display
finalVector = (Vector2){ (angleLength*sinf(currentAngleRadians)) + protractorPosition.x, finalVector = (Vector2){ (angleLength*sinf(currentAngleRadians)) + protractorPosition.x,
(angleLength*cosf(currentAngleRadians)) + protractorPosition.y }; (angleLength*cosf(currentAngleRadians)) + protractorPosition.y };
// Handle touch and mouse pointer points // Handle touch and mouse pointer points

6
src/platforms/rcore_desktop_glfw.c
View File

@@ -83,14 +83,14 @@
// Works as long as the current file consistently references any X11 Font as X11Font // Works as long as the current file consistently references any X11 Font as X11Font
// Since it is never referenced (as of writing), this does not pose an issue // Since it is never referenced (as of writing), this does not pose an issue
#endif #endif
#if defined(_GLFW_WAYLAND) #if defined(_GLFW_WAYLAND)
#define GLFW_EXPOSE_NATIVE_WAYLAND #define GLFW_EXPOSE_NATIVE_WAYLAND
#endif #endif
#include "GLFW/glfw3native.h" // Include native header only once, regardless of how many backends are defined #include "GLFW/glfw3native.h" // Include native header only once, regardless of how many backends are defined
// Required for: glfwGetX11Window() and glfwGetWaylandWindow() // Required for: glfwGetX11Window() and glfwGetWaylandWindow()
#if defined(_GLFW_X11) // Clean up X11-specific hacks #if defined(_GLFW_X11) // Clean up X11-specific hacks
#undef Font // Revert hack and allow normal raylib Font usage #undef Font // Revert hack and allow normal raylib Font usage
#endif #endif

4
src/platforms/rcore_web.c
View File

@@ -1495,8 +1495,8 @@ static void KeyCallback(GLFWwindow *window, int key, int scancode, int action, i
// WARNING: GLFW could return GLFW_REPEAT, we need to consider it as 1 // WARNING: GLFW could return GLFW_REPEAT, we need to consider it as 1
// to work properly with our implementation (IsKeyDown/IsKeyUp checks) // to work properly with our implementation (IsKeyDown/IsKeyUp checks)
if (action == GLFW_RELEASE) CORE.Input.Keyboard.currentKeyState[key] = 0; if (action == GLFW_RELEASE) CORE.Input.Keyboard.currentKeyState[key] = 0;
else if(action == GLFW_PRESS) CORE.Input.Keyboard.currentKeyState[key] = 1; else if (action == GLFW_PRESS) CORE.Input.Keyboard.currentKeyState[key] = 1;
else if(action == GLFW_REPEAT) CORE.Input.Keyboard.keyRepeatInFrame[key] = 1; else if (action == GLFW_REPEAT) CORE.Input.Keyboard.keyRepeatInFrame[key] = 1;
// Check if there is space available in the key queue // Check if there is space available in the key queue
if ((CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE) && (action == GLFW_PRESS)) if ((CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE) && (action == GLFW_PRESS))

8
src/rcore.c
View File

@@ -2565,14 +2565,14 @@ unsigned char *DecompressData(const unsigned char *compData, int compDataSize, i
unsigned char *data0 = (unsigned char *)RL_CALLOC(MAX_DECOMPRESSION_SIZE*1024*1024, 1); unsigned char *data0 = (unsigned char *)RL_CALLOC(MAX_DECOMPRESSION_SIZE*1024*1024, 1);
int size = sinflate(data0, MAX_DECOMPRESSION_SIZE*1024*1024, compData, compDataSize); int size = sinflate(data0, MAX_DECOMPRESSION_SIZE*1024*1024, compData, compDataSize);
// WARNING: RL_REALLOC can make (and leave) data copies in memory, // WARNING: RL_REALLOC can make (and leave) data copies in memory,
// that can be a security concern in case of compression of sensitive data // that can be a security concern in case of compression of sensitive data
// So, we use a second buffer to copy data manually, wiping original buffer memory // So, we use a second buffer to copy data manually, wiping original buffer memory
data = (unsigned char *)RL_CALLOC(size, 1); data = (unsigned char *)RL_CALLOC(size, 1);
memcpy(data, data0, size); memcpy(data, data0, size);
memset(data0, 0, MAX_DECOMPRESSION_SIZE*1024*1024); // Wipe memory, is memset() safe? memset(data0, 0, MAX_DECOMPRESSION_SIZE*1024*1024); // Wipe memory, is memset() safe?
RL_FREE(data0); RL_FREE(data0);
TRACELOG(LOG_INFO, "SYSTEM: Decompress data: Comp. size: %i -> Original size: %i", compDataSize, size); TRACELOG(LOG_INFO, "SYSTEM: Decompress data: Comp. size: %i -> Original size: %i", compDataSize, size);
*dataSize = size; *dataSize = size;
@@ -2689,7 +2689,7 @@ unsigned char *DecodeDataBase64(const char *text, int *outputSize)
TRACELOG(LOG_WARNING, "BASE64: Decoding error: Output data size is too small"); TRACELOG(LOG_WARNING, "BASE64: Decoding error: Output data size is too small");
break; break;
} }
decodedData[outputCount + 0] = (octetPack >> 16) & 0xff; decodedData[outputCount + 0] = (octetPack >> 16) & 0xff;
decodedData[outputCount + 1] = (octetPack >> 8) & 0xff; decodedData[outputCount + 1] = (octetPack >> 8) & 0xff;
decodedData[outputCount + 2] = octetPack & 0xff; decodedData[outputCount + 2] = octetPack & 0xff;
@@ -3018,7 +3018,7 @@ AutomationEventList LoadAutomationEventList(const char *fileName)
char *result = fgets(buffer, 256, raeFile); char *result = fgets(buffer, 256, raeFile);
if (result != buffer) TRACELOG(LOG_WARNING, "AUTOMATION: [%s] Issue reading line to buffer", fileName); if (result != buffer) TRACELOG(LOG_WARNING, "AUTOMATION: [%s] Issue reading line to buffer", fileName);
while (!feof(raeFile)) while (!feof(raeFile))
{ {
switch (buffer[0]) switch (buffer[0])

8
src/rmodels.c
View File

@@ -1432,7 +1432,7 @@ void DrawMesh(Mesh mesh, Material material, Matrix transform)
else rlEnableStatePointer(GL_VERTEX_ARRAY, mesh.vertices); else rlEnableStatePointer(GL_VERTEX_ARRAY, mesh.vertices);
rlEnableStatePointer(GL_TEXTURE_COORD_ARRAY, mesh.texcoords); rlEnableStatePointer(GL_TEXTURE_COORD_ARRAY, mesh.texcoords);
if (mesh.animNormals) rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.animNormals); if (mesh.animNormals) rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.animNormals);
else rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.normals); else rlEnableStatePointer(GL_NORMAL_ARRAY, mesh.normals);
@@ -5536,7 +5536,7 @@ static Model LoadGLTF(const char *fileName)
cgltf_accessor *attribute = mesh->primitives[p].attributes[j].data; cgltf_accessor *attribute = mesh->primitives[p].attributes[j].data;
// WARNING: SPECS: POSITION accessor MUST have its min and max properties defined // WARNING: SPECS: POSITION accessor MUST have its min and max properties defined
if (model.meshes[meshIndex].vertices != NULL) TRACELOG(LOG_WARNING, "MODEL: [%s] Vertices attribute data already loaded", fileName); if (model.meshes[meshIndex].vertices != NULL) TRACELOG(LOG_WARNING, "MODEL: [%s] Vertices attribute data already loaded", fileName);
else else
{ {
@@ -5882,7 +5882,7 @@ static Model LoadGLTF(const char *fileName)
}; };
MatrixDecompose(worldMatrix, &(model.bindPose[i].translation), &(model.bindPose[i].rotation), &(model.bindPose[i].scale)); MatrixDecompose(worldMatrix, &(model.bindPose[i].translation), &(model.bindPose[i].rotation), &(model.bindPose[i].scale));
} }
if (data->skins_count > 1) TRACELOG(LOG_WARNING, "MODEL: [%s] can only load one skin (armature) per model, but gltf skins_count == %i", fileName, data->skins_count); if (data->skins_count > 1) TRACELOG(LOG_WARNING, "MODEL: [%s] can only load one skin (armature) per model, but gltf skins_count == %i", fileName, data->skins_count);
} }
@@ -6578,7 +6578,7 @@ static Model LoadM3D(const char *fileName)
if (k + 1 >= model.meshCount) if (k + 1 >= model.meshCount)
{ {
model.meshCount++; model.meshCount++;
// Create a second buffer for mesh re-allocation // Create a second buffer for mesh re-allocation
Mesh *tempMeshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh)); Mesh *tempMeshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh));
memcpy(tempMeshes, model.meshes, (model.meshCount - 1)*sizeof(Mesh)); memcpy(tempMeshes, model.meshes, (model.meshCount - 1)*sizeof(Mesh));

4
src/rtext.c
View File

@@ -760,7 +760,7 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz
// NOTE: For optimum results, bitmap font should be generated at base pixel size // NOTE: For optimum results, bitmap font should be generated at base pixel size
for (int p = 0; p < cpWidth*cpHeight; p++) for (int p = 0; p < cpWidth*cpHeight; p++)
{ {
if (((unsigned char *)glyphs[k].image.data)[p] < FONT_BITMAP_ALPHA_THRESHOLD) if (((unsigned char *)glyphs[k].image.data)[p] < FONT_BITMAP_ALPHA_THRESHOLD)
((unsigned char *)glyphs[k].image.data)[p] = 0; ((unsigned char *)glyphs[k].image.data)[p] = 0;
else ((unsigned char *)glyphs[k].image.data)[p] = 255; else ((unsigned char *)glyphs[k].image.data)[p] = 255;
} }
@@ -774,7 +774,7 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz
// WARNING: Glyph not found on font, optionally use a fallback glyph // WARNING: Glyph not found on font, optionally use a fallback glyph
} }
} }
if (glyphCounter < codepointCount) TRACELOG(LOG_WARNING, "FONT: Requested codepoints glyphs found: [%i/%i]", k, codepointCount); if (glyphCounter < codepointCount) TRACELOG(LOG_WARNING, "FONT: Requested codepoints glyphs found: [%i/%i]", k, codepointCount);
} }
else TRACELOG(LOG_WARNING, "FONT: Failed to process TTF font data"); else TRACELOG(LOG_WARNING, "FONT: Failed to process TTF font data");

2
src/rtextures.c
View File

@@ -702,7 +702,7 @@ bool ExportImage(Image image, const char *fileName)
result = SaveFileData(fileName, image.data, GetPixelDataSize(image.width, image.height, image.format)); result = SaveFileData(fileName, image.data, GetPixelDataSize(image.width, image.height, image.format));
} }
else TRACELOG(LOG_WARNING, "IMAGE: Export image format requested not supported"); else TRACELOG(LOG_WARNING, "IMAGE: Export image format requested not supported");
if (allocatedData) RL_FREE(imgData); if (allocatedData) RL_FREE(imgData);
#endif // SUPPORT_IMAGE_EXPORT #endif // SUPPORT_IMAGE_EXPORT

178
tools/rexm/rexm.c
View File

@@ -175,8 +175,8 @@ static void ClearExampleResources(char **resPaths);
static int AddVSProjectToSolution(const char *slnFile, const char *projFile, const char *category); static int AddVSProjectToSolution(const char *slnFile, const char *projFile, const char *category);
static int RemoveVSProjectFromSolution(const char *slnFile, const char *exName); static int RemoveVSProjectFromSolution(const char *slnFile, const char *exName);
// Generate unique UUID v4 string // Generate unique UUID v4 string
// Output format: {9A2F48CC-0DA8-47C0-884E-02E37F9BE6C1} // Output format: {9A2F48CC-0DA8-47C0-884E-02E37F9BE6C1}
static const char *GenerateUUIDv4(void); static const char *GenerateUUIDv4(void);
// Update source code header and comments metadata // Update source code header and comments metadata
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
char exRename[64] = { 0 }; // Example re-name, without extension char exRename[64] = { 0 }; // Example re-name, without extension
int opCode = OP_NONE; // Operation code: 0-None(Help), 1-Create, 2-Add, 3-Rename, 4-Remove int opCode = OP_NONE; // Operation code: 0-None(Help), 1-Create, 2-Add, 3-Rename, 4-Remove
/* /*
// Testing code for UpdateSourceMetadata() // Testing code for UpdateSourceMetadata()
rlExampleInfo test = { 0 }; rlExampleInfo test = { 0 };
@@ -263,8 +263,8 @@ int main(int argc, char *argv[])
char cat[12] = { 0 }; char cat[12] = { 0 };
strncpy(cat, argv[2], catIndex); strncpy(cat, argv[2], catIndex);
bool catFound = false; bool catFound = false;
for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++) for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++)
{ {
if (TextIsEqual(cat, exCategories[i])) { catFound = true; break; } if (TextIsEqual(cat, exCategories[i])) { catFound = true; break; }
} }
@@ -297,8 +297,8 @@ int main(int argc, char *argv[])
char cat[12] = { 0 }; char cat[12] = { 0 };
strncpy(cat, GetFileName(argv[2]), catIndex); strncpy(cat, GetFileName(argv[2]), catIndex);
bool catFound = false; bool catFound = false;
for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++) for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++)
{ {
if (TextIsEqual(cat, exCategories[i])) { catFound = true; break; } if (TextIsEqual(cat, exCategories[i])) { catFound = true; break; }
} }
@@ -336,8 +336,8 @@ int main(int argc, char *argv[])
char cat[12] = { 0 }; char cat[12] = { 0 };
strncpy(cat, argv[3], newCatIndex); strncpy(cat, argv[3], newCatIndex);
bool newCatFound = false; bool newCatFound = false;
for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++) for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++)
{ {
if (TextIsEqual(cat, exCategories[i])) { newCatFound = true; break; } if (TextIsEqual(cat, exCategories[i])) { newCatFound = true; break; }
} }
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
char *exText = LoadFileText(exTemplateFilePath); char *exText = LoadFileText(exTemplateFilePath);
char *exTextUpdated[6] = { 0 }; char *exTextUpdated[6] = { 0 };
int exIndex = TextFindIndex(exText, "/****************"); int exIndex = TextFindIndex(exText, "/****************");
// Update required info with some defaults // Update required info with some defaults
exTextUpdated[0] = TextReplace(exText + exIndex, "<module>", exCategory); exTextUpdated[0] = TextReplace(exText + exIndex, "<module>", exCategory);
exTextUpdated[1] = TextReplace(exTextUpdated[0], "<name>", exName + strlen(exCategory) + 1); exTextUpdated[1] = TextReplace(exTextUpdated[0], "<name>", exName + strlen(exCategory) + 1);
@@ -431,7 +431,7 @@ int main(int argc, char *argv[])
//TextReplace(newExample, "@<user_github>", "@raysan5"); //TextReplace(newExample, "@<user_github>", "@raysan5");
//TextReplace(newExample, "<year_created>", 2025); //TextReplace(newExample, "<year_created>", 2025);
//TextReplace(newExample, "<year_updated>", 2025); //TextReplace(newExample, "<year_updated>", 2025);
SaveFileText(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName), exTextUpdated[1]); SaveFileText(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName), exTextUpdated[1]);
for (int i = 0; i < 6; i++) { MemFree(exTextUpdated[i]); exTextUpdated[i] = NULL; } for (int i = 0; i < 6; i++) { MemFree(exTextUpdated[i]); exTextUpdated[i] = NULL; }
UnloadFileText(exText); UnloadFileText(exText);
@@ -444,10 +444,10 @@ int main(int argc, char *argv[])
// Create: raylib/examples/<category>/<category>_example_name.png // Create: raylib/examples/<category>/<category>_example_name.png
if (FileExists(TextFormat("%s/%s.png", GetDirectoryPath(inFileName), exName))) if (FileExists(TextFormat("%s/%s.png", GetDirectoryPath(inFileName), exName)))
{ {
FileCopy(TextFormat("%s/%s.png", GetDirectoryPath(inFileName), exName), FileCopy(TextFormat("%s/%s.png", GetDirectoryPath(inFileName), exName),
TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName)); TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName));
} }
else // No screenshot available next to source file else // No screenshot available next to source file
{ {
// Copy screenshot template // Copy screenshot template
FileCopy(exTemplateScreenshot, TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName)); FileCopy(exTemplateScreenshot, TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName));
@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
// Copy: raylib/examples/<category>/resources/... // Copy: raylib/examples/<category>/resources/...
// ----------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------
// Scan resources used in example to copy // Scan resources used in example to copy
// NOTE: resources path will be relative to example source file directory // NOTE: resources path will be relative to example source file directory
int resPathCount = 0; int resPathCount = 0;
char **resPaths = ScanExampleResources(TextFormat("%s/%s.c", GetDirectoryPath(inFileName), exName), &resPathCount); char **resPaths = ScanExampleResources(TextFormat("%s/%s.c", GetDirectoryPath(inFileName), exName), &resPathCount);
@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
ClearExampleResources(resPaths); ClearExampleResources(resPaths);
// ----------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------
// Add example to the collection list, if not already there // Add example to the collection list, if not already there
// NOTE: Required format: shapes;shapes_basic_shapes;★☆☆☆;1.0;4.2;2014;2025;"Ray";@raysan5 // NOTE: Required format: shapes;shapes_basic_shapes;★☆☆☆;1.0;4.2;2014;2025;"Ray";@raysan5
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
@@ -524,7 +524,7 @@ int main(int argc, char *argv[])
if (TextFindIndex(exCollectionList, exName) == -1) // Example not found if (TextFindIndex(exCollectionList, exName) == -1) // Example not found
{ {
char *exCollectionListUpdated = (char *)RL_CALLOC(REXM_MAX_BUFFER_SIZE, 1); // Updated list copy, 2MB char *exCollectionListUpdated = (char *)RL_CALLOC(REXM_MAX_BUFFER_SIZE, 1); // Updated list copy, 2MB
// Add example to the main list, by category // Add example to the main list, by category
// by default add it last in the category list // by default add it last in the category list
// NOTE: When populating to other files, lists are sorted by name // NOTE: When populating to other files, lists are sorted by name
@@ -542,7 +542,7 @@ int main(int argc, char *argv[])
// NOTE: If no example info is provided (other than category/name), just using some default values // NOTE: If no example info is provided (other than category/name), just using some default values
rlExampleInfo *exInfo = LoadExampleInfo(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName)); rlExampleInfo *exInfo = LoadExampleInfo(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName));
// Get example difficulty stars text // Get example difficulty stars text
char starsText[16] = { 0 }; char starsText[16] = { 0 };
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -557,7 +557,7 @@ int main(int argc, char *argv[])
// Add example to collection at the EOF // Add example to collection at the EOF
int endIndex = (int)strlen(exCollectionList); int endIndex = (int)strlen(exCollectionList);
memcpy(exCollectionListUpdated, exCollectionList, endIndex); memcpy(exCollectionListUpdated, exCollectionList, endIndex);
sprintf(exCollectionListUpdated + endIndex, TextFormat("%s;%s;%s;%s;%s;%i;%i;\"%s\";@%s\n", sprintf(exCollectionListUpdated + endIndex, TextFormat("%s;%s;%s;%s;%s;%i;%i;\"%s\";@%s\n",
exInfo->category, exInfo->name, starsText, exInfo->verCreated, exInfo->verUpdated, exInfo->yearCreated, exInfo->yearReviewed, exInfo->author, exInfo->authorGitHub)); exInfo->category, exInfo->name, starsText, exInfo->verCreated, exInfo->verUpdated, exInfo->yearCreated, exInfo->yearReviewed, exInfo->author, exInfo->authorGitHub));
} }
else else
@@ -571,7 +571,7 @@ int main(int argc, char *argv[])
} }
UnloadExampleInfo(exInfo); UnloadExampleInfo(exInfo);
SaveFileText(exCollectionFilePath, exCollectionListUpdated); SaveFileText(exCollectionFilePath, exCollectionListUpdated);
RL_FREE(exCollectionListUpdated); RL_FREE(exCollectionListUpdated);
} }
@@ -583,23 +583,23 @@ int main(int argc, char *argv[])
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
UpdateRequiredFiles(); UpdateRequiredFiles();
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
// Create: raylib/projects/VS2022/examples/<category>_example_name.vcxproj // Create: raylib/projects/VS2022/examples/<category>_example_name.vcxproj
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
// WARNING: When adding new project a unique UUID should be assigned! // WARNING: When adding new project a unique UUID should be assigned!
FileCopy(TextFormat("%s/../projects/VS2022/examples/core_basic_window.vcxproj", exBasePath), FileCopy(TextFormat("%s/../projects/VS2022/examples/core_basic_window.vcxproj", exBasePath),
TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName)); TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName));
FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName), FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName),
"core_basic_window", exName); "core_basic_window", exName);
FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName), FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName),
"..\\..\\examples\\core", TextFormat("..\\..\\examples\\%s", exCategory)); "..\\..\\examples\\core", TextFormat("..\\..\\examples\\%s", exCategory));
// Edit: raylib/projects/VS2022/raylib.sln --> Add new example project // Edit: raylib/projects/VS2022/raylib.sln --> Add new example project
// WARNING: This function uses TextFormat() extensively inside, // WARNING: This function uses TextFormat() extensively inside,
// we must store provided file paths because pointers will be overwriten // we must store provided file paths because pointers will be overwriten
// TODO: It seems projects are added to solution BUT not to required solution folder, // TODO: It seems projects are added to solution BUT not to required solution folder,
// that process still requires to be done manually // that process still requires to be done manually
AddVSProjectToSolution(exVSProjectSolutionFile, AddVSProjectToSolution(exVSProjectSolutionFile,
TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName), exCategory); TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName), exCategory);
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
@@ -620,7 +620,7 @@ int main(int argc, char *argv[])
system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName)); system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName));
#endif #endif
// Update generated .html metadata // Update generated .html metadata
UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exName), UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exName),
TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName)); TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName));
// Copy results to web side // Copy results to web side
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
if (strcmp(exCategory, exRecategory) == 0) if (strcmp(exCategory, exRecategory) == 0)
{ {
// Rename example on collection // Rename example on collection
FileTextReplace(exCollectionFilePath, TextFormat("%s;%s", exCategory, exName), FileTextReplace(exCollectionFilePath, TextFormat("%s;%s", exCategory, exName),
TextFormat("%s;%s", exRecategory, exRename)); TextFormat("%s;%s", exRecategory, exRename));
// Edit: Rename example code and screenshot files .c and .png // Edit: Rename example code and screenshot files .c and .png
@@ -656,7 +656,7 @@ int main(int argc, char *argv[])
rlExampleInfo *exList = LoadExamplesData(exCollectionFilePath, exCategory, false, &exListCount); rlExampleInfo *exList = LoadExamplesData(exCollectionFilePath, exCategory, false, &exListCount);
for (int i = 0; i < exListCount; i++) for (int i = 0; i < exListCount; i++)
{ {
if (strcmp(exList[i].name, exRename) == 0) if (strcmp(exList[i].name, exRename) == 0)
UpdateSourceMetadata(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exRename), &exList[i]); UpdateSourceMetadata(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exRename), &exList[i]);
} }
UnloadExamplesData(exList); UnloadExamplesData(exList);
@@ -668,7 +668,7 @@ int main(int argc, char *argv[])
FileTextReplace(TextFormat("%s/Makefile", exBasePath), exName, exRename); FileTextReplace(TextFormat("%s/Makefile", exBasePath), exName, exRename);
FileTextReplace(TextFormat("%s/Makefile.Web", exBasePath), exName, exRename); FileTextReplace(TextFormat("%s/Makefile.Web", exBasePath), exName, exRename);
FileTextReplace(TextFormat("%s/README.md", exBasePath), exName, exRename); FileTextReplace(TextFormat("%s/README.md", exBasePath), exName, exRename);
FileTextReplace(TextFormat("%s/../common/examples.js", exWebPath), FileTextReplace(TextFormat("%s/../common/examples.js", exWebPath),
exName + strlen(exCategory) + 1, exRename + strlen(exRecategory) + 1); // Skip category exName + strlen(exCategory) + 1, exRename + strlen(exRecategory) + 1); // Skip category
// Edit: Rename example project and solution // Edit: Rename example project and solution
@@ -681,7 +681,7 @@ int main(int argc, char *argv[])
{ {
// WARNING: Rename with change of category // WARNING: Rename with change of category
// TODO: Reorder collection to place renamed example at the end of category // TODO: Reorder collection to place renamed example at the end of category
FileTextReplace(exCollectionFilePath, TextFormat("%s;%s", exCategory, exName), FileTextReplace(exCollectionFilePath, TextFormat("%s;%s", exCategory, exName),
TextFormat("%s;%s", exRecategory, exRename)); TextFormat("%s;%s", exRecategory, exRename));
// TODO: Move example resources from <exCategory>/resources to <exRecategory>/resources // TODO: Move example resources from <exCategory>/resources to <exRecategory>/resources
@@ -715,7 +715,7 @@ int main(int argc, char *argv[])
system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exRecategory, exRename)); system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exRecategory, exRename));
#endif #endif
// Update generated .html metadata // Update generated .html metadata
UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exRename), UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exRename),
TextFormat("%s/%s/%s.c", exBasePath, exCategory, exRename)); TextFormat("%s/%s/%s.c", exBasePath, exCategory, exRename));
// Copy results to web side // Copy results to web side
@@ -768,7 +768,7 @@ int main(int argc, char *argv[])
else LOG("WARNING: REMOVE: Example not found in the collection\n"); else LOG("WARNING: REMOVE: Example not found in the collection\n");
UnloadFileText(exCollectionList); UnloadFileText(exCollectionList);
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
// Remove: raylib/examples/<category>/resources/.. // Remove: raylib/examples/<category>/resources/..
// WARNING: Some of those resources could be used by other examples, // WARNING: Some of those resources could be used by other examples,
// just leave this process to manual update for now! // just leave this process to manual update for now!
@@ -807,16 +807,16 @@ int main(int argc, char *argv[])
// Remove: raylib/examples/<category>/<category>_example_name.png // Remove: raylib/examples/<category>/<category>_example_name.png
FileRemove(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName)); FileRemove(TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName));
FileRemove(TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName)); FileRemove(TextFormat("%s/%s/%s.png", exBasePath, exCategory, exName));
// Edit: Update required files: Makefile, Makefile.Web, README.md, examples.js // Edit: Update required files: Makefile, Makefile.Web, README.md, examples.js
UpdateRequiredFiles(); UpdateRequiredFiles();
// Remove: raylib/projects/VS2022/examples/<category>_example_name.vcxproj // Remove: raylib/projects/VS2022/examples/<category>_example_name.vcxproj
FileRemove(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName)); FileRemove(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exName));
// Edit: raylib/projects/VS2022/raylib.sln --> Remove example project // Edit: raylib/projects/VS2022/raylib.sln --> Remove example project
RemoveVSProjectFromSolution(TextFormat("%s/../projects/VS2022/raylib.sln", exBasePath), exName); RemoveVSProjectFromSolution(TextFormat("%s/../projects/VS2022/raylib.sln", exBasePath), exName);
// Remove: raylib.com/examples/<category>/<category>_example_name.html // Remove: raylib.com/examples/<category>/<category>_example_name.html
// Remove: raylib.com/examples/<category>/<category>_example_name.data // Remove: raylib.com/examples/<category>/<category>_example_name.data
// Remove: raylib.com/examples/<category>/<category>_example_name.wasm // Remove: raylib.com/examples/<category>/<category>_example_name.wasm
@@ -860,7 +860,7 @@ int main(int argc, char *argv[])
int exListLen = (int)strlen(exList); int exListLen = (int)strlen(exList);
strcpy(exListUpdated, exList); strcpy(exListUpdated, exList);
// Copy examples list into an update list // Copy examples list into an update list
// NOTE: Checking and removing duplicate entries // NOTE: Checking and removing duplicate entries
int lineCount = 0; int lineCount = 0;
char **exListLines = LoadTextLines(exList, &lineCount); char **exListLines = LoadTextLines(exList, &lineCount);
@@ -928,11 +928,11 @@ int main(int argc, char *argv[])
// Validate: raylib/examples/<category>/<category>_example_name.png -> File exists? // Validate: raylib/examples/<category>/<category>_example_name.png -> File exists?
if (!FileExists(TextFormat("%s/%s/%s.png", exBasePath, exInfo->category, exInfo->name))) exInfo->status |= VALID_MISSING_PNG; if (!FileExists(TextFormat("%s/%s/%s.png", exBasePath, exInfo->category, exInfo->name))) exInfo->status |= VALID_MISSING_PNG;
// Validate: example screenshot is not the template default one // Validate: example screenshot is not the template default one
Image imScreenshot = LoadImage(TextFormat("%s/%s/%s.png", exBasePath, exInfo->category, exInfo->name)); Image imScreenshot = LoadImage(TextFormat("%s/%s/%s.png", exBasePath, exInfo->category, exInfo->name));
Image imTemplate = LoadImage(TextFormat("%s/examples_template.png", exBasePath)); Image imTemplate = LoadImage(TextFormat("%s/examples_template.png", exBasePath));
if (memcmp(imScreenshot.data, imTemplate.data, GetPixelDataSize(imScreenshot.width, imScreenshot.height, imScreenshot.format)) == 0) if (memcmp(imScreenshot.data, imTemplate.data, GetPixelDataSize(imScreenshot.width, imScreenshot.height, imScreenshot.format)) == 0)
exInfo->status |= VALID_INVALID_PNG; exInfo->status |= VALID_INVALID_PNG;
UnloadImage(imTemplate); UnloadImage(imTemplate);
UnloadImage(imScreenshot); UnloadImage(imScreenshot);
@@ -945,7 +945,7 @@ int main(int argc, char *argv[])
// Validate: raylib/examples/README.md -> Example listed? // Validate: raylib/examples/README.md -> Example listed?
if (FileTextFind(TextFormat("%s/README.md", exBasePath), exInfo->name) == -1) exInfo->status |= VALID_NOT_IN_README; if (FileTextFind(TextFormat("%s/README.md", exBasePath), exInfo->name) == -1) exInfo->status |= VALID_NOT_IN_README;
// Validate: raylib.com/common/examples.js -> Example listed? // Validate: raylib.com/common/examples.js -> Example listed?
if (FileTextFind(TextFormat("%s/../common/examples.js", exWebPath), exInfo->name + TextFindIndex(exInfo->name, "_") + 1) == -1) exInfo->status |= VALID_NOT_IN_JS; if (FileTextFind(TextFormat("%s/../common/examples.js", exWebPath), exInfo->name + TextFindIndex(exInfo->name, "_") + 1) == -1) exInfo->status |= VALID_NOT_IN_JS;
@@ -1025,10 +1025,10 @@ int main(int argc, char *argv[])
// NOTE: Additional validation elements // NOTE: Additional validation elements
// Validate: Example naming conventions: <category>/<category>_example_name, valid category // Validate: Example naming conventions: <category>/<category>_example_name, valid category
if ((TextFindIndex(exInfo->name, exInfo->category) == -1) || if ((TextFindIndex(exInfo->name, exInfo->category) == -1) ||
(!TextIsEqual(exInfo->category, "core") && !TextIsEqual(exInfo->category, "shapes") && (!TextIsEqual(exInfo->category, "core") && !TextIsEqual(exInfo->category, "shapes") &&
!TextIsEqual(exInfo->category, "textures") && !TextIsEqual(exInfo->category, "text") && !TextIsEqual(exInfo->category, "textures") && !TextIsEqual(exInfo->category, "text") &&
!TextIsEqual(exInfo->category, "models") && !TextIsEqual(exInfo->category, "shaders") && !TextIsEqual(exInfo->category, "models") && !TextIsEqual(exInfo->category, "shaders") &&
!TextIsEqual(exInfo->category, "audio") && !TextIsEqual(exInfo->category, "others"))) exInfo->status |= VALID_INVALID_CATEGORY; !TextIsEqual(exInfo->category, "audio") && !TextIsEqual(exInfo->category, "others"))) exInfo->status |= VALID_INVALID_CATEGORY;
// Validate: Example info (stars, author, github) missmatches with example header content // Validate: Example info (stars, author, github) missmatches with example header content
@@ -1081,9 +1081,9 @@ int main(int argc, char *argv[])
{ {
FileCopy(TextFormat("%s/../projects/VS2022/examples/core_basic_window.vcxproj", exBasePath), FileCopy(TextFormat("%s/../projects/VS2022/examples/core_basic_window.vcxproj", exBasePath),
TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name)); TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name));
FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name), FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name),
"core_basic_window", exInfo->name); "core_basic_window", exInfo->name);
FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name), FileTextReplace(TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name),
"..\\..\\examples\\core", TextFormat("..\\..\\examples\\%s", exInfo->category)); "..\\..\\examples\\core", TextFormat("..\\..\\examples\\%s", exInfo->category));
exInfo->status &= ~VALID_MISSING_VCXPROJ; exInfo->status &= ~VALID_MISSING_VCXPROJ;
@@ -1092,7 +1092,7 @@ int main(int argc, char *argv[])
// Add project (.vcxproj) to raylib solution (.sln) // Add project (.vcxproj) to raylib solution (.sln)
if (exInfo->status & VALID_NOT_IN_VCXSOL) if (exInfo->status & VALID_NOT_IN_VCXSOL)
{ {
AddVSProjectToSolution(exVSProjectSolutionFile, AddVSProjectToSolution(exVSProjectSolutionFile,
TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name), exInfo->category); TextFormat("%s/../projects/VS2022/examples/%s.vcxproj", exBasePath, exInfo->name), exInfo->category);
exInfo->status &= ~VALID_NOT_IN_VCXSOL; exInfo->status &= ~VALID_NOT_IN_VCXSOL;
@@ -1115,11 +1115,11 @@ int main(int argc, char *argv[])
#endif #endif
// Update generated .html metadata // Update generated .html metadata
UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exInfo->category, exInfo->name), UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exInfo->category, exInfo->name),
TextFormat("%s/%s/%s.c", exBasePath, exInfo->category, exInfo->name)); TextFormat("%s/%s/%s.c", exBasePath, exInfo->category, exInfo->name));
// Copy results to web side // Copy results to web side
FileCopy(TextFormat("%s/%s/%s.html", exBasePath, exInfo->category, exInfo->name), FileCopy(TextFormat("%s/%s/%s.html", exBasePath, exInfo->category, exInfo->name),
TextFormat("%s/%s/%s.html", exWebPath, exInfo->category, exInfo->name)); TextFormat("%s/%s/%s.html", exWebPath, exInfo->category, exInfo->name));
FileCopy(TextFormat("%s/%s/%s.data", exBasePath, exInfo->category, exInfo->name), FileCopy(TextFormat("%s/%s/%s.data", exBasePath, exInfo->category, exInfo->name),
TextFormat("%s/%s/%s.data", exWebPath, exInfo->category, exInfo->name)); TextFormat("%s/%s/%s.data", exWebPath, exInfo->category, exInfo->name));
@@ -1284,7 +1284,7 @@ int main(int argc, char *argv[])
UnloadExamplesData(exCollection); UnloadExamplesData(exCollection);
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
} break; } break;
case OP_BUILD: case OP_BUILD:
{ {
@@ -1301,7 +1301,7 @@ int main(int argc, char *argv[])
//putenv("MAKE=mingw32-make"); //putenv("MAKE=mingw32-make");
//ChangeDirectory(exBasePath); //ChangeDirectory(exBasePath);
system(TextFormat("mingw32-make -C %s %s/%s PLATFORM=PLATFORM_DESKTOP -B", exBasePath, exCategory, exName)); system(TextFormat("mingw32-make -C %s %s/%s PLATFORM=PLATFORM_DESKTOP -B", exBasePath, exCategory, exName));
#else #else
system(TextFormat("make -C %s %s/%s PLATFORM=PLATFORM_DESKTOP -B", exBasePath, exCategory, exName)); system(TextFormat("make -C %s %s/%s PLATFORM=PLATFORM_DESKTOP -B", exBasePath, exCategory, exName));
#endif #endif
@@ -1311,10 +1311,10 @@ int main(int argc, char *argv[])
system(TextFormat("mingw32-make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName)); system(TextFormat("mingw32-make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName));
#else #else
system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName)); system(TextFormat("make -C %s -f Makefile.Web %s/%s PLATFORM=PLATFORM_WEB -B", exBasePath, exCategory, exName));
#endif #endif
// Update generated .html metadata // Update generated .html metadata
UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exName), UpdateWebMetadata(TextFormat("%s/%s/%s.html", exBasePath, exCategory, exName),
TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName)); TextFormat("%s/%s/%s.c", exBasePath, exCategory, exName));
// Copy results to web side // Copy results to web side
@@ -1384,7 +1384,7 @@ static int UpdateRequiredFiles(void)
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
int exListCount = 0; int exListCount = 0;
rlExampleInfo *exList = LoadExamplesData(exCollectionFilePath, "ALL", true, &exListCount); rlExampleInfo *exList = LoadExamplesData(exCollectionFilePath, "ALL", true, &exListCount);
for (int i = 0; i < exListCount; i++) for (int i = 0; i < exListCount; i++)
{ {
rlExampleInfo *info = &exList[i]; rlExampleInfo *info = &exList[i];
UpdateSourceMetadata(TextFormat("%s/%s/%s.c", exBasePath, info->category, info->name), info); UpdateSourceMetadata(TextFormat("%s/%s/%s.c", exBasePath, info->category, info->name), info);
@@ -1490,7 +1490,7 @@ static int UpdateRequiredFiles(void)
--preload-file shaders/resources/shaders/glsl100/vertex_displacement.fs@resources/shaders/glsl100/vertex_displacement.fs \ --preload-file shaders/resources/shaders/glsl100/vertex_displacement.fs@resources/shaders/glsl100/vertex_displacement.fs \
--preload-file shaders/resources/shaders/glsl330/vertex_displacement.fs@resources/shaders/glsl330/vertex_displacement.fs --preload-file shaders/resources/shaders/glsl330/vertex_displacement.fs@resources/shaders/glsl330/vertex_displacement.fs
*/ */
mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex,
TextFormat("%s/%s: %s/%s.c\n", exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name)); TextFormat("%s/%s: %s/%s.c\n", exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name));
mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, " $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \\\n"); mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, " $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \\\n");
@@ -1525,7 +1525,7 @@ static int UpdateRequiredFiles(void)
core/core_2d_camera: core/core_2d_camera.c core/core_2d_camera: core/core_2d_camera.c
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
*/ */
mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex,
TextFormat("%s/%s: %s/%s.c\n", exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name)); TextFormat("%s/%s: %s/%s.c\n", exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name));
mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, " $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)\n\n"); mkwIndex += sprintf(mkwTextUpdated + mkwListStartIndex + mkwIndex, " $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)\n\n");
} }
@@ -1567,7 +1567,7 @@ static int UpdateRequiredFiles(void)
for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++) for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES; i++)
{ {
int exCollectionCount = 0; int exCollectionCount = 0;
rlExampleInfo *exCollection = LoadExamplesData(exCollectionFilePath, exCategories[i], false, &exCollectionCount); rlExampleInfo *exCollection = LoadExamplesData(exCollectionFilePath, exCategories[i], false, &exCollectionCount);
// Every category includes some introductory text, as it is quite short, just copying it here // Every category includes some introductory text, as it is quite short, just copying it here
if (i == 0) // "core" if (i == 0) // "core"
@@ -1633,7 +1633,7 @@ static int UpdateRequiredFiles(void)
} }
mdIndex += sprintf(mdTextUpdated + mdListStartIndex + mdIndex, mdIndex += sprintf(mdTextUpdated + mdListStartIndex + mdIndex,
TextFormat("| [%s](%s/%s.c) | <img src=\"%s/%s.png\" alt=\"%s\" width=\"80\"> | %s | %s | %s | [%s](https://github.com/%s) |\n", TextFormat("| [%s](%s/%s.c) | <img src=\"%s/%s.png\" alt=\"%s\" width=\"80\"> | %s | %s | %s | [%s](https://github.com/%s) |\n",
exCollection[x].name, exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name, exCollection[x].name, exCollection[x].name, exCollection[x].category, exCollection[x].name, exCollection[x].category, exCollection[x].name, exCollection[x].name,
starsText, exCollection[x].verCreated, exCollection[x].verUpdated, exCollection[x].author, exCollection[x].authorGitHub)); starsText, exCollection[x].verCreated, exCollection[x].verUpdated, exCollection[x].author, exCollection[x].authorGitHub));
} }
@@ -1672,7 +1672,7 @@ static int UpdateRequiredFiles(void)
for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES - 1; i++) for (int i = 0; i < REXM_MAX_EXAMPLE_CATEGORIES - 1; i++)
{ {
int exCollectionCount = 0; int exCollectionCount = 0;
rlExampleInfo *exCollection = LoadExamplesData(exCollectionFilePath, exCategories[i], false, &exCollectionCount); rlExampleInfo *exCollection = LoadExamplesData(exCollectionFilePath, exCategories[i], false, &exCollectionCount);
for (int x = 0; x < exCollectionCount; x++) for (int x = 0; x < exCollectionCount; x++)
{ {
for (int s = 0; s < 4; s++) for (int s = 0; s < 4; s++)
@@ -1713,22 +1713,22 @@ static int UpdateRequiredFiles(void)
static rlExampleInfo *LoadExamplesData(const char *fileName, const char *category, bool sort, int *exCount) static rlExampleInfo *LoadExamplesData(const char *fileName, const char *category, bool sort, int *exCount)
{ {
#define MAX_EXAMPLES_INFO 256 #define MAX_EXAMPLES_INFO 256
rlExampleInfo *exInfo = (rlExampleInfo *)RL_CALLOC(MAX_EXAMPLES_INFO, sizeof(rlExampleInfo)); rlExampleInfo *exInfo = (rlExampleInfo *)RL_CALLOC(MAX_EXAMPLES_INFO, sizeof(rlExampleInfo));
int exCounter = 0; int exCounter = 0;
*exCount = 0; *exCount = 0;
char *text = LoadFileText(fileName); char *text = LoadFileText(fileName);
if (text != NULL) if (text != NULL)
{ {
int lineCount = 0; int lineCount = 0;
char **lines = LoadTextLines(text, &lineCount); char **lines = LoadTextLines(text, &lineCount);
for (int i = 0; i < lineCount; i++) for (int i = 0; i < lineCount; i++)
{ {
// Basic validation for lines start categories // Basic validation for lines start categories
if ((lines[i][0] != '#') && if ((lines[i][0] != '#') &&
((lines[i][0] == 'c') || // core ((lines[i][0] == 'c') || // core
(lines[i][0] == 's') || // shapes, shaders (lines[i][0] == 's') || // shapes, shaders
(lines[i][0] == 't') || // textures, text (lines[i][0] == 't') || // textures, text
@@ -1755,11 +1755,11 @@ static rlExampleInfo *LoadExamplesData(const char *fileName, const char *categor
} }
} }
} }
UnloadTextLines(lines, lineCount); UnloadTextLines(lines, lineCount);
UnloadFileText(text); UnloadFileText(text);
} }
// Sorting required // Sorting required
if (sort) SortExampleByName(exInfo, exCounter); if (sort) SortExampleByName(exInfo, exCounter);
@@ -1785,7 +1785,7 @@ static int FileTextFind(const char *fileName, const char *find)
UnloadFileText(fileText); UnloadFileText(fileText);
} }
return result; return result;
} }
// Replace text in an existing file // Replace text in an existing file
@@ -1794,7 +1794,7 @@ static int FileTextReplace(const char *fileName, const char *textLookUp, const c
int result = 0; int result = 0;
char *fileText = NULL; char *fileText = NULL;
char *fileTextUpdated = { 0 }; char *fileTextUpdated = { 0 };
if (FileExists(fileName)) if (FileExists(fileName))
{ {
fileText = LoadFileText(fileName); fileText = LoadFileText(fileName);
@@ -1814,12 +1814,12 @@ static int FileCopy(const char *srcPath, const char *dstPath)
int result = 0; int result = 0;
int srcDataSize = 0; int srcDataSize = 0;
unsigned char *srcFileData = LoadFileData(srcPath, &srcDataSize); unsigned char *srcFileData = LoadFileData(srcPath, &srcDataSize);
// Create required paths if they do not exist // Create required paths if they do not exist
if (!DirectoryExists(GetDirectoryPath(dstPath))) if (!DirectoryExists(GetDirectoryPath(dstPath)))
MakeDirectory(GetDirectoryPath(dstPath)); MakeDirectory(GetDirectoryPath(dstPath));
if ((srcFileData != NULL) && (srcDataSize > 0)) if ((srcFileData != NULL) && (srcDataSize > 0))
result = SaveFileData(dstPath, srcFileData, srcDataSize); result = SaveFileData(dstPath, srcFileData, srcDataSize);
UnloadFileData(srcFileData); UnloadFileData(srcFileData);
@@ -1877,7 +1877,7 @@ static int FileMove(const char *srcPath, const char *dstPath)
static rlExampleInfo *LoadExampleInfo(const char *exFileName) static rlExampleInfo *LoadExampleInfo(const char *exFileName)
{ {
rlExampleInfo *exInfo = (rlExampleInfo *)RL_CALLOC(1, sizeof(rlExampleInfo)); rlExampleInfo *exInfo = (rlExampleInfo *)RL_CALLOC(1, sizeof(rlExampleInfo));
if (FileExists(exFileName) && IsFileExtension(exFileName, ".c")) if (FileExists(exFileName) && IsFileExtension(exFileName, ".c"))
{ {
strcpy(exInfo->name, GetFileNameWithoutExt(exFileName)); strcpy(exInfo->name, GetFileNameWithoutExt(exFileName));
@@ -1972,14 +1972,14 @@ static void UnloadExampleInfo(rlExampleInfo *exInfo)
static int ParseExampleInfoLine(const char *line, rlExampleInfo *entry) static int ParseExampleInfoLine(const char *line, rlExampleInfo *entry)
{ {
#define MAX_EXAMPLE_INFO_LINE_LEN 512 #define MAX_EXAMPLE_INFO_LINE_LEN 512
char temp[MAX_EXAMPLE_INFO_LINE_LEN] = { 0 }; char temp[MAX_EXAMPLE_INFO_LINE_LEN] = { 0 };
strncpy(temp, line, MAX_EXAMPLE_INFO_LINE_LEN); strncpy(temp, line, MAX_EXAMPLE_INFO_LINE_LEN);
temp[MAX_EXAMPLE_INFO_LINE_LEN - 1] = '\0'; // Ensure null termination temp[MAX_EXAMPLE_INFO_LINE_LEN - 1] = '\0'; // Ensure null termination
int tokenCount = 0; int tokenCount = 0;
char **tokens = TextSplit(line, ';', &tokenCount); char **tokens = TextSplit(line, ';', &tokenCount);
if (tokenCount != 9) LOG("REXM: WARNING: Example collection line contains invalid number of tokens: %i\n", tokenCount); if (tokenCount != 9) LOG("REXM: WARNING: Example collection line contains invalid number of tokens: %i\n", tokenCount);
// Get category and name // Get category and name
@@ -1989,10 +1989,10 @@ static int ParseExampleInfoLine(const char *line, rlExampleInfo *entry)
// Parsing stars // Parsing stars
// NOTE: Counting the unicode char occurrences: ★ // NOTE: Counting the unicode char occurrences: ★
const char *starPtr = tokens[2]; const char *starPtr = tokens[2];
while (*starPtr) while (*starPtr)
{ {
if (((unsigned char)starPtr[0] == 0xe2) && if (((unsigned char)starPtr[0] == 0xe2) &&
((unsigned char)starPtr[1] == 0x98) && ((unsigned char)starPtr[1] == 0x98) &&
((unsigned char)starPtr[2] == 0x85)) ((unsigned char)starPtr[2] == 0x85))
{ {
entry->stars++; entry->stars++;
@@ -2009,7 +2009,7 @@ static int ParseExampleInfoLine(const char *line, rlExampleInfo *entry)
entry->yearCreated = TextToInteger(tokens[5]); entry->yearCreated = TextToInteger(tokens[5]);
entry->yearReviewed = TextToInteger(tokens[6]); entry->yearReviewed = TextToInteger(tokens[6]);
// Get author and github // Get author and github
if (tokens[7][0] == '"') tokens[7] += 1; if (tokens[7][0] == '"') tokens[7] += 1;
if (tokens[7][strlen(tokens[7]) - 1] == '"') tokens[7][strlen(tokens[7]) - 1] = '\0'; if (tokens[7][strlen(tokens[7]) - 1] == '"') tokens[7][strlen(tokens[7]) - 1] = '\0';
strcpy(entry->author, tokens[7]); strcpy(entry->author, tokens[7]);
@@ -2023,7 +2023,7 @@ static int rlExampleInfoCompare(const void *a, const void *b)
{ {
const rlExampleInfo *ex1 = (const rlExampleInfo *)a; const rlExampleInfo *ex1 = (const rlExampleInfo *)a;
const rlExampleInfo *ex2 = (const rlExampleInfo *)b; const rlExampleInfo *ex2 = (const rlExampleInfo *)b;
return strcmp(ex1->name, ex2->name); return strcmp(ex1->name, ex2->name);
} }
@@ -2125,7 +2125,7 @@ static void ClearExampleResources(char **resPaths)
} }
// Add VS project (.vcxproj) to existing VS solution (.sln) // Add VS project (.vcxproj) to existing VS solution (.sln)
// WARNING: Adding a .vcxproj to .sln can not be automated with: // WARNING: Adding a .vcxproj to .sln can not be automated with:
// - "dotnet" tool (C# projects only) // - "dotnet" tool (C# projects only)
// - "devenv" tool (no adding support, only building) // - "devenv" tool (no adding support, only building)
// It must be done manually editing the .sln file // It must be done manually editing the .sln file
@@ -2133,7 +2133,7 @@ static int AddVSProjectToSolution(const char *slnFile, const char *projFile, con
{ {
int result = 0; int result = 0;
// WARNING: Function uses extensively TextFormat(), // WARNING: Function uses extensively TextFormat(),
// *projFile ptr will be overwriten after a while // *projFile ptr will be overwriten after a while
// Generate unique UUID // Generate unique UUID
@@ -2160,7 +2160,7 @@ static int AddVSProjectToSolution(const char *slnFile, const char *projFile, con
offsetIndex += prjStartIndex; offsetIndex += prjStartIndex;
offsetIndex += sprintf(slnTextUpdated + offsetIndex, "EndProject\n"); offsetIndex += sprintf(slnTextUpdated + offsetIndex, "EndProject\n");
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
// Update project config // Update project config
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
// Find position to add project config: At the end of global section, same strategy as VS2022 "Add Project" // Find position to add project config: At the end of global section, same strategy as VS2022 "Add Project"
@@ -2272,7 +2272,7 @@ static int RemoveVSProjectFromSolution(const char *slnFile, const char *exName)
{ {
// Found line with project --> get UUID // Found line with project --> get UUID
strncpy(uuid, lines[i] + index + exNameLen*2 + 26, 36); strncpy(uuid, lines[i] + index + exNameLen*2 + 26, 36);
// Skip copying line and also next one // Skip copying line and also next one
i++; i++;
} }
@@ -2292,8 +2292,8 @@ static int RemoveVSProjectFromSolution(const char *slnFile, const char *exName)
return result; return result;
} }
// Generate unique UUID v4 string // Generate unique UUID v4 string
// Output format: {9A2F48CC-0DA8-47C0-884E-02E37F9BE6C1} // Output format: {9A2F48CC-0DA8-47C0-884E-02E37F9BE6C1}
static const char *GenerateUUIDv4(void) static const char *GenerateUUIDv4(void)
{ {
static char uuid[38] = { 0 }; static char uuid[38] = { 0 };
@@ -2339,7 +2339,7 @@ static void UpdateSourceMetadata(const char *exSrcPath, const rlExampleInfo *inf
// Update example header title (line #3 - ALWAYS) // Update example header title (line #3 - ALWAYS)
// String: "* raylib [shaders] example - texture drawing" // String: "* raylib [shaders] example - texture drawing"
exTextUpdated[0] = TextReplaceBetween(exTextUpdatedPtr, "* raylib [", "\n", exTextUpdated[0] = TextReplaceBetween(exTextUpdatedPtr, "* raylib [", "\n",
TextFormat("%s] example - %s", info->category, exNameFormated)); TextFormat("%s] example - %s", info->category, exNameFormated));
if (exTextUpdated[0] != NULL) exTextUpdatedPtr = exTextUpdated[0]; if (exTextUpdated[0] != NULL) exTextUpdatedPtr = exTextUpdated[0];
@@ -2359,7 +2359,7 @@ static void UpdateSourceMetadata(const char *exSrcPath, const rlExampleInfo *inf
// Update example creation/update raylib versions // Update example creation/update raylib versions
// String: "* Example originally created with raylib 2.0, last time updated with raylib 3.7 // String: "* Example originally created with raylib 2.0, last time updated with raylib 3.7
exTextUpdated[2] = TextReplaceBetween(exTextUpdatedPtr, "* Example originally created with raylib ", "\n", exTextUpdated[2] = TextReplaceBetween(exTextUpdatedPtr, "* Example originally created with raylib ", "\n",
TextFormat("%s, last time updated with raylib %s", info->verCreated, info->verUpdated)); TextFormat("%s, last time updated with raylib %s", info->verCreated, info->verUpdated));
if (exTextUpdated[2] != NULL) exTextUpdatedPtr = exTextUpdated[2]; if (exTextUpdated[2] != NULL) exTextUpdatedPtr = exTextUpdated[2];
@@ -2367,13 +2367,13 @@ static void UpdateSourceMetadata(const char *exSrcPath, const rlExampleInfo *inf
// String: "* Copyright (c) 2019-2025 Contributor Name (@github_user) and Ramon Santamaria (@raysan5)" // String: "* Copyright (c) 2019-2025 Contributor Name (@github_user) and Ramon Santamaria (@raysan5)"
if (info->yearCreated == info->yearReviewed) if (info->yearCreated == info->yearReviewed)
{ {
exTextUpdated[3] = TextReplaceBetween(exTextUpdatedPtr, "Copyright (c) ", ")", exTextUpdated[3] = TextReplaceBetween(exTextUpdatedPtr, "Copyright (c) ", ")",
TextFormat("%i %s (@%s", info->yearCreated, info->author, info->authorGitHub)); TextFormat("%i %s (@%s", info->yearCreated, info->author, info->authorGitHub));
if (exTextUpdated[3] != NULL) exTextUpdatedPtr = exTextUpdated[3]; if (exTextUpdated[3] != NULL) exTextUpdatedPtr = exTextUpdated[3];
} }
else else
{ {
exTextUpdated[3] = TextReplaceBetween(exTextUpdatedPtr, "Copyright (c) ", ")", exTextUpdated[3] = TextReplaceBetween(exTextUpdatedPtr, "Copyright (c) ", ")",
TextFormat("%i-%i %s (@%s", info->yearCreated, info->yearReviewed, info->author, info->authorGitHub)); TextFormat("%i-%i %s (@%s", info->yearCreated, info->yearReviewed, info->author, info->authorGitHub));
if (exTextUpdated[3] != NULL) exTextUpdatedPtr = exTextUpdated[3]; if (exTextUpdated[3] != NULL) exTextUpdatedPtr = exTextUpdated[3];
} }
@@ -2387,10 +2387,10 @@ static void UpdateSourceMetadata(const char *exSrcPath, const rlExampleInfo *inf
// Update contributors names // Update contributors names
// String: "* Example contributed by Contributor Name (@github_user) and reviewed by Ramon Santamaria (@raysan5)" // String: "* Example contributed by Contributor Name (@github_user) and reviewed by Ramon Santamaria (@raysan5)"
// WARNING: Not all examples are contributed by someone, so the result of this replace can be NULL (string not found) // WARNING: Not all examples are contributed by someone, so the result of this replace can be NULL (string not found)
exTextUpdated[5] = TextReplaceBetween(exTextUpdatedPtr, "* Example contributed by ", ")", exTextUpdated[5] = TextReplaceBetween(exTextUpdatedPtr, "* Example contributed by ", ")",
TextFormat("%s (@%s", info->author, info->authorGitHub)); TextFormat("%s (@%s", info->author, info->authorGitHub));
if (exTextUpdated[5] != NULL) exTextUpdatedPtr = exTextUpdated[5]; if (exTextUpdated[5] != NULL) exTextUpdatedPtr = exTextUpdated[5];
if (exTextUpdatedPtr != NULL) SaveFileText(exSourcePath, exTextUpdatedPtr); if (exTextUpdatedPtr != NULL) SaveFileText(exSourcePath, exTextUpdatedPtr);
for (int i = 0; i < 6; i++) { MemFree(exTextUpdated[i]); exTextUpdated[i] = NULL; } for (int i = 0; i < 6; i++) { MemFree(exTextUpdated[i]); exTextUpdated[i] = NULL; }