Update to raylib 5.0

Author: RobLoach

README.md

@@ -49,7 +49,7 @@ int main() {
 
 ``` c
 bool InitPhysFS();                                              // Initialize the PhysFS file system
-bool InitPhysFSEx(const char* newDir, const char* mountPoint);  // Initialize the PhysFS file system with the given mount point.
+bool InitPhysFSEx(const char* newDir, const char* mountPoint);  // Initialize the PhysFS file system with a mount point.
 bool ClosePhysFS();                                             // Close the PhysFS file system
 bool IsPhysFSReady();                                           // Check if PhysFS has been initialized successfully
 bool MountPhysFS(const char* newDir, const char* mountPoint);   // Mount the given directory or archive as a mount point
@@ -69,9 +69,9 @@ Texture2D LoadTextureFromPhysFS(const char* fileName);          // Load a textur
 Wave LoadWaveFromPhysFS(const char* fileName);                  // Load wave data from PhysFS
 Music LoadMusicStreamFromPhysFS(const char* fileName);          // Load music data from PhysFS
 Font LoadFontFromPhysFS(const char* fileName, int fontSize, int *fontChars, int charsCount);  // Load a font from PhysFS
-Shader LoadShaderFromPhysFS(const char *vsFileName, const char *fsFileName);  // Load shader from PhysFS
+Shader LoadShaderFromPhysFS(const char* vsFileName, const char* fsFileName);  // Load shader from PhysFS
 void SetPhysFSCallbacks();                                      // Set the raylib file loader/saver callbacks to use PhysFS
-const char* GetPerfDirectory(const char *org, const char *app); // Get the user's current config directory for the application.
+const char* GetPerfDirectory(const char *organization, const char *application); // Get the user's current config directory for the application.
 ```
 
 ### Defines

cmake/FindPhysFS.cmake

@@ -11,6 +11,7 @@ set(PHYSFS_ARCHIVE_QPAK OFF CACHE BOOL "" FORCE)
 set(PHYSFS_ARCHIVE_SLB OFF CACHE BOOL "" FORCE)
 set(PHYSFS_ARCHIVE_ISO9660 OFF CACHE BOOL "" FORCE)
 set(PHYSFS_ARCHIVE_VDF OFF CACHE BOOL "" FORCE)
+set(PHYSFS_TARGETNAME_UNINSTALL "physfs_uninstall" CACHE STRING "" FORCE)
 
 # library options
 set(PHYSFS_BUILD_STATIC ON CACHE BOOL "" FORCE)
@@ -23,7 +24,7 @@ include(FetchContent)
 FetchContent_Declare(
     physfs
     GIT_REPOSITORY https://github.com/icculus/physfs.git
-    GIT_TAG release-3.2.0
+    GIT_TAG 31209b7c2ce629dbda0db2329ce469ab9a2b90b9
 )
 FetchContent_MakeAvailable(physfs)
 include_directories(${physfs_SOURCE_DIR}/src)

cmake/FindRaylib.cmake

@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     raylib
     GIT_REPOSITORY https://github.com/raysan5/raylib.git
-    GIT_TAG 4.5.0
+    GIT_TAG 5.0
     GIT_SHALLOW 1
 )
 FetchContent_GetProperties(raylib)

raylib-physfs.h

@@ -1,11 +1,11 @@
 /**********************************************************************************************
 *
-*   raylib-physfs 4.5.0 - Integrate PhysFS with raylib, allowing to load images, audio and fonts from data archives.
+*   raylib-physfs 5.0.0 - Integrate PhysFS with raylib, allowing to load images, audio and fonts from data archives.
 *
 *   Copyright 2021 Rob Loach (@RobLoach)
 *
 *   DEPENDENCIES:
-*       raylib 4.5+ https://www.raylib.com/
+*       raylib 5.0+ https://www.raylib.com/
 *       physfs https://github.com/icculus/physfs
 *
 *   LICENSE: zlib/libpng
@@ -54,10 +54,10 @@ RAYLIB_PHYSFS_DEF bool MountPhysFSFromMemory(const unsigned char *fileData, int
 RAYLIB_PHYSFS_DEF bool UnmountPhysFS(const char* oldDir);                         // Unmounts the given directory
 RAYLIB_PHYSFS_DEF bool FileExistsInPhysFS(const char* fileName);                  // Check if the given file exists in PhysFS
 RAYLIB_PHYSFS_DEF bool DirectoryExistsInPhysFS(const char* dirPath);              // Check if the given directory exists in PhysFS
-RAYLIB_PHYSFS_DEF unsigned char* LoadFileDataFromPhysFS(const char* fileName, unsigned int* bytesRead);  // Load a data buffer from PhysFS (memory should be freed)
+RAYLIB_PHYSFS_DEF unsigned char* LoadFileDataFromPhysFS(const char* fileName, int* bytesRead);  // Load a data buffer from PhysFS (memory should be freed)
 RAYLIB_PHYSFS_DEF char* LoadFileTextFromPhysFS(const char* fileName);             // Load text from a file (memory should be freed)
 RAYLIB_PHYSFS_DEF bool SetPhysFSWriteDirectory(const char* newDir);               // Set the base directory where PhysFS should write files to (defaults to the current working directory)
-RAYLIB_PHYSFS_DEF bool SaveFileDataToPhysFS(const char* fileName, void* data, unsigned int bytesToWrite);  // Save the given file data in PhysFS
+RAYLIB_PHYSFS_DEF bool SaveFileDataToPhysFS(const char* fileName, void* data, int bytesToWrite);  // Save the given file data in PhysFS
 RAYLIB_PHYSFS_DEF bool SaveFileTextToPhysFS(const char* fileName, char* text);    // Save the given file text in PhysFS
 RAYLIB_PHYSFS_DEF FilePathList LoadDirectoryFilesFromPhysFS(const char* dirPath);  // Get filenames in a directory path (memory should be freed)
 RAYLIB_PHYSFS_DEF long GetFileModTimeFromPhysFS(const char* fileName);            // Get file modification time (last write time) from PhysFS
@@ -80,7 +80,7 @@ RAYLIB_PHYSFS_DEF const char* GetPerfDirectory(const char *organization, const c
 #ifndef RAYLIB_PHYSFS_IMPLEMENTATION_ONCE
 #define RAYLIB_PHYSFS_IMPLEMENTATION_ONCE
 
-// MiniPhysFS
+// PhysFS
 #define PHYSFS_IMPL
 #define PHYSFS_PLATFORM_IMPL
 #define PHYSFS_DECL RAYLIB_PHYSFS_DEF
@@ -113,13 +113,13 @@ void TracePhysFSError(const char* detail) {
  * Loads the given file as a byte array from PhysFS (read).
  *
  * @param fileName The file to load.
- * @param bytesRead An unsigned integer to save the bytes that were read.
+ * @param bytesRead An integer to save the bytes that were read.
  *
  * @return The file data as a pointer. Make sure to use UnloadFileData() when finished using the file data.
  *
  * @see UnloadFileData()
  */
-unsigned char* LoadFileDataFromPhysFS(const char* fileName, unsigned int* bytesRead) {
+unsigned char* LoadFileDataFromPhysFS(const char* fileName, int* bytesRead) {
     if (!FileExistsInPhysFS(fileName)) {
         TraceLog(LOG_WARNING, TextFormat("PHYSFS: Tried to load unexisting file '%s'", fileName));
         *bytesRead = 0;
@@ -320,7 +320,7 @@ bool DirectoryExistsInPhysFS(const char* dirPath) {
  * @return The loaded image on success. An empty Image otherwise.
  */
 Image LoadImageFromPhysFS(const char* fileName) {
-    unsigned int bytesRead;
+    int bytesRead;
     unsigned char* fileData = LoadFileDataFromPhysFS(fileName, &bytesRead);
     if (bytesRead == 0) {
         struct Image output;
@@ -371,8 +371,23 @@ Texture2D LoadTextureFromPhysFS(const char* fileName) {
  * @see UnloadFileText()
  */
 char* LoadFileTextFromPhysFS(const char *fileName) {
-    unsigned int bytesRead;
-    return (char*)LoadFileDataFromPhysFS(fileName, &bytesRead);
+    int bytesRead;
+    unsigned char* data = LoadFileDataFromPhysFS(fileName, &bytesRead);
+    if (bytesRead == 0) {
+        return 0;
+    }
+
+    // Copy the data, and append a null terminator.
+    char* text = (char*)MemAlloc(bytesRead + 1);
+    for (int i = 0; i < bytesRead; i++) {
+        text[i] = (char)data[i];
+    }
+    text[bytesRead] = '\0';
+
+    // Free the original data, and return the string.
+    MemFree(data);
+
+    return text;
 }
 
 /**
@@ -512,7 +527,7 @@ bool SetPhysFSWriteDirectory(const char* newDir) {
  *
  * @return True on success, false on failure.
  */
-bool SaveFileDataToPhysFS(const char* fileName, void* data, unsigned int bytesToWrite) {
+bool SaveFileDataToPhysFS(const char* fileName, void* data, int bytesToWrite) {
     // Protect against empty writes.
     if (bytesToWrite == 0) {
         return true;

test/raylib-assert.h

@@ -188,6 +188,19 @@ extern "C" {
  */
 #define AssertColorSame(...) RAYLIB_ASSERT_VA_SELECT(AssertColorSame, __VA_ARGS__)
 
+/**
+ * Assert whether two Vector2s are the same.
+ *
+ * @param vector1 The first Vector2 to check.
+ * @param vector2 The second Vector2 to check.
+ * @param message (Optional) The message to provide on failed assertions.
+ * @param p1 (Optional) The first parameter in the message.
+ * @param p2 (Optional) The second parameter in the message.
+ * @param p3 (Optional) The third parameter in the message.
+ * @param p4 (Optional) The fourth parameter in the message.
+ */
+#define AssertVector2Same(...) RAYLIB_ASSERT_VA_SELECT(AssertVector2Same, __VA_ARGS__)
+
 // Assert()
 #ifdef RAYLIB_ASSERT_NDEBUG
 #define Assert_0()
@@ -345,6 +358,31 @@ extern "C" {
 #define AssertColorSame_7(color1, color2, message, p1, p2, p3, p4) AssertColorSame_3(color1, color2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
 #endif
 
+// AssertVector2Same()
+#ifdef RAYLIB_ASSERT_NDEBUG
+#define AssertVector2Same_0()
+#define AssertVector2Same_1(vector)
+#define AssertVector2Same_2(vector1, vector2)
+#define AssertVector2Same_3(vector1, vector2, message)
+#define AssertVector2Same_4(vector1, vector2, message, p1)
+#define AssertVector2Same_5(vector1, vector2, message, p1, p2)
+#define AssertVector2Same_6(vector1, vector2, message, p1, p2, p3)
+#define AssertVector2Same_7(vector1, vector2, message, p1, p2, p3, p4)
+#else
+#define AssertVector2Same_0() AssertFail_1("Vectors not provided to AssertVector2Same()")
+#define AssertVector2Same_1(vector) AssertFail_1("Expected two vectors for AssertVector2Same()")
+#define AssertVector2Same_2(vector1, vector2) AssertVector2Same_5(vector1, vector2, "AssertVector2Same(%s, %s) - vectors do not match", #vector1, #vector2)
+#define AssertVector2Same_3(vector1, vector2, message) do { \
+    if (vector1.x != vector2.x || vector1.y != vector2.y) { \
+        AssertFail_1(message); \
+    }\
+} while (0)
+#define AssertVector2Same_4(vector1, vector2, message, p1) AssertVector2Same_3(vector1, vector2, RAYLIB_ASSERT_TEXTFORMAT(message, p1))
+#define AssertVector2Same_5(vector1, vector2, message, p1, p2) AssertVector2Same_3(vector1, vector2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2))
+#define AssertVector2Same_6(vector1, vector2, message, p1, p2, p3) AssertVector2Same_3(vector1, vector2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3))
+#define AssertVector2Same_7(vector1, vector2, message, p1, p2, p3, p4) AssertVector2Same_3(vector1, vector2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
+#endif
+
 #ifdef __cplusplus
 }
 #endif