v4.5.0

RobLoach · Sep 7, 2023 · 598a243 · 598a243
1 parent 7774555
commit 598a243
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 39 deletions.
diff --git a/cmake/FindRaylib.cmake b/cmake/FindRaylib.cmake
@@ -4,6 +4,7 @@ FetchContent_Declare(
     raylib
     GIT_REPOSITORY https://github.com/raysan5/raylib.git
     GIT_TAG 4.5.0
+    GIT_SHALLOW 1
 )
 FetchContent_GetProperties(raylib)
 if (NOT raylib_POPULATED) # Have we downloaded raylib yet?

diff --git a/raylib-physfs.h b/raylib-physfs.h
@@ -1,11 +1,11 @@
 /**********************************************************************************************
 *
-*   raylib-physfs - Integrate PhysFS with raylib, allowing to load images, audio and fonts from data archives.
+*   raylib-physfs 4.5.0 - Integrate PhysFS with raylib, allowing to load images, audio and fonts from data archives.
 *
 *   Copyright 2021 Rob Loach (@RobLoach)
 *
 *   DEPENDENCIES:
-*       raylib 4.2+ https://www.raylib.com/
+*       raylib 4.5+ https://www.raylib.com/
 *       physfs https://github.com/icculus/physfs
 *
 *   LICENSE: zlib/libpng

diff --git a/test/raylib-assert.h b/test/raylib-assert.h
@@ -3,10 +3,12 @@
 *   raylib-assert - Assertion library for raylib.
 *   https://github.com/robloach/raylib-assert
 *
-*   Copyright 2021 Rob Loach (@RobLoach)
+*   Version: v2.0.0
+*
+*   Copyright 2023 Rob Loach (@RobLoach)
 *
 *   DEPENDENCIES:
-*       raylib https://www.raylib.com/
+*       raylib 4.5+ https://www.raylib.com
 *
 *   LICENSE: zlib/libpng
 *
@@ -57,6 +59,24 @@ extern "C" {
 #endif
 #endif
 
+#ifndef RAYLIB_ASSERT_TRACELOG
+/**
+ * The TraceLog() function to use.
+ *
+ * @see TraceLog()
+ */
+#define RAYLIB_ASSERT_TRACELOG TraceLog
+#endif
+
+#ifndef RAYLIB_ASSERT_TEXTFORMAT
+/**
+ * The TextFormat() function to use when formating text.
+ *
+ * @see TextFormat()
+ */
+#define RAYLIB_ASSERT_TEXTFORMAT TextFormat
+#endif
+
 // Variadic Arguments
 #define RAYLIB_ASSERT_CAT( A, B ) A ## B
 #define RAYLIB_ASSERT_SELECT( NAME, NUM ) RAYLIB_ASSERT_CAT( NAME ## _, NUM )
@@ -170,6 +190,7 @@ extern "C" {
 
 // Assert()
 #ifdef RAYLIB_ASSERT_NDEBUG
+#define Assert_0()
 #define Assert_1(condition)
 #define Assert_2(condition, message)
 #define Assert_3(condition, message, p1)
@@ -178,16 +199,18 @@ extern "C" {
 #define Assert_6(condition, message, p1, p2, p3, p4)
 #define Assert_7(condition, message, p1, p2, p3, p4, p5)
 #else
+#define Assert_0() AssertFail_1("No condition provided for Assert()")
 #define Assert_1(condition) Assert_2(condition, #condition)
-#define Assert_2(condition, message) do { if (!((bool)(condition))) { TraceLog(RAYLIB_ASSERT_LOG, "ASSERT: %s (%s:%i)", message, __FILE__, __LINE__); } } while(0)
-#define Assert_3(condition, message, p1) Assert_2(condition, TextFormat(message, p1))
-#define Assert_4(condition, message, p1, p2) Assert_2(condition, TextFormat(message, p1, p2))
-#define Assert_5(condition, message, p1, p2, p3) Assert_2(condition, TextFormat(message, p1, p2, p3))
-#define Assert_6(condition, message, p1, p2, p3, p4) Assert_2(condition, TextFormat(message, p1, p2, p3, p4))
-#define Assert_7(condition, message, p1, p2, p3, p4, p5) Assert_2(condition, TextFormat(message, p1, p2, p3, p4, p5))
+#define Assert_2(condition, message) do { if (!((bool)(condition))) { RAYLIB_ASSERT_TRACELOG(RAYLIB_ASSERT_LOG, "ASSERT: %s (%s:%i)", message, __FILE__, __LINE__); } } while(0)
+#define Assert_3(condition, message, p1) Assert_2(condition, RAYLIB_ASSERT_TEXTFORMAT(message, p1))
+#define Assert_4(condition, message, p1, p2) Assert_2(condition, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2))
+#define Assert_5(condition, message, p1, p2, p3) Assert_2(condition, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3))
+#define Assert_6(condition, message, p1, p2, p3, p4) Assert_2(condition, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
+#define Assert_7(condition, message, p1, p2, p3, p4, p5) Assert_2(condition, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4, p5))
 #endif
 
 // AssertEqual()
+#define AssertEqual_0() AssertFail_1("No condition provided for AssertEqual()")
 #define AssertEqual_1(condition) Assert_2(condition, #condition)
 #define AssertEqual_2(actual, expected) Assert_4((actual) == (expected), "AssertEqual(%s, %s) - Provided arguments are not equal", #actual, #expected)
 #define AssertEqual_3(actual, expected, message) Assert_2((actual) == (expected), message)
@@ -197,6 +220,7 @@ extern "C" {
 #define AssertEqual_7(actual, expected, message, p1, p2, p3, p4) Assert_6((actual) == (expected), message, p1, p2, p3, p4)
 
 // AssertNotEqual()
+#define AssertNotEqual_0() AssertFail_1("No condition provided for AssertNotEqual()")
 #define AssertNotEqual_1(condition) AssertNot_2(condition, #condition)
 #define AssertNotEqual_2(actual, expected) Assert_4((actual) != (expected), "AssertNotEqual(%s, %s) - Provided arguments are equal", #actual, #expected)
 #define AssertNotEqual_3(actual, expected, message) Assert_2((actual) != (expected), message)
@@ -206,6 +230,7 @@ extern "C" {
 #define AssertNotEqual_7(actual, expected, message, p1, p2, p3, p4) Assert_6((actual) != (expected), message, p1, p2, p3, p4)
 
 // AssertNot()
+#define AssertNot_0() AssertFail_1("No condition provided for AssertNot()")
 #define AssertNot_1(condition) Assert_2(!(bool)(condition), #condition)
 #define AssertNot_2(condition, message) Assert_2(!(bool)(condition), message)
 #define AssertNot_3(condition, message, p1) Assert_3(!(bool)(condition), message, p1)
@@ -225,33 +250,33 @@ extern "C" {
 #define AssertFail_6(message, p1, p2, p3, p4, p5)
 #define AssertFail_7(message, p1, p2, p3, p4, p5, p6)
 #else
-#define AssertFail_0() TraceLog(RAYLIB_ASSERT_LOG, "ASSERT: AssertFail() (%s:%i)", __FILE__, __LINE__)
-#define AssertFail_1(message) TraceLog(RAYLIB_ASSERT_LOG, "ASSERT: %s (%s:%i)", message, __FILE__, __LINE__)
-#define AssertFail_2(message, p1) AssertFail_1(TextFormat(message, p1))
-#define AssertFail_3(message, p1, p2) AssertFail_1(TextFormat(message, p1, p2))
-#define AssertFail_4(message, p1, p2, p3) AssertFail_1(TextFormat(message, p1, p2, p3))
-#define AssertFail_5(message, p1, p2, p3, p4) AssertFail_1(TextFormat(message, p1, p2, p3, p4))
-#define AssertFail_6(message, p1, p2, p3, p4, p5) AssertFail_1(TextFormat(message, p1, p2, p3, p4, p5))
-#define AssertFail_7(message, p1, p2, p3, p4, p5, p6) AssertFail_1(TextFormat(message, p1, p2, p3, p4, p5, p6))
+#define AssertFail_0() RAYLIB_ASSERT_TRACELOG(RAYLIB_ASSERT_LOG, "ASSERT: AssertFail() (%s:%i)", __FILE__, __LINE__)
+#define AssertFail_1(message) RAYLIB_ASSERT_TRACELOG(RAYLIB_ASSERT_LOG, "ASSERT: %s (%s:%i)", message, __FILE__, __LINE__)
+#define AssertFail_2(message, p1) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1))
+#define AssertFail_3(message, p1, p2) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2))
+#define AssertFail_4(message, p1, p2, p3) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3))
+#define AssertFail_5(message, p1, p2, p3, p4) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
+#define AssertFail_6(message, p1, p2, p3, p4, p5) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4, p5))
+#define AssertFail_7(message, p1, p2, p3, p4, p5, p6) AssertFail_1(RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4, p5, p6))
 #endif
 
 // AssertImage()
 #define AssertImage_0() AssertFail_1("No image provided for AssertImage()")
-#define AssertImage_1(image) AssertNotEqual_4((image).data, 0, "AssertImage(%s) - Image not loaded", #image)
-#define AssertImage_2(image, message) AssertNotEqual_3((image).data, 0, message)
-#define AssertImage_3(image, message, p1) AssertNotEqual_4((image).data, 0, message, p1)
-#define AssertImage_4(image, message, p1, p2) AssertNotEqual_5((image).data, 0, message, p1, p2)
-#define AssertImage_5(image, message, p1, p2, p3) AssertNotEqual_6((image).data, 0, message, p1, p2, p3)
-#define AssertImage_6(image, message, p1, p2, p3, p4) AssertNotEqual_7((image).data, 0, message, p1, p2, p3, p4)
+#define AssertImage_1(image) Assert_3(IsImageReady(image), "AssertImage(%s) - Image not loaded", #image)
+#define AssertImage_2(image, message) Assert_2(IsImageReady(image), message)
+#define AssertImage_3(image, message, p1) Assert_3(IsImageReady(image), message, p1)
+#define AssertImage_4(image, message, p1, p2) Assert_4(IsImageReady(image), message, p1, p2)
+#define AssertImage_5(image, message, p1, p2, p3) Assert_5(IsImageReady(image), message, p1, p2, p3)
+#define AssertImage_6(image, message, p1, p2, p3, p4) Assert_6(IsImageReady(image), message, p1, p2, p3, p4)
 
 // AssertTexture()
 #define AssertTexture_0() AssertFail_1("No texture provided for AssertTexture()")
-#define AssertTexture_1(texture) AssertNotEqual_4((texture).id, 0, "AssertTexture(%s) - Texture not loaded", #texture)
-#define AssertTexture_2(texture, message) AssertNotEqual_3((texture).data, 0, message)
-#define AssertTexture_3(texture, message, p1) AssertNotEqual_4((texture).data, 0, message, p1)
-#define AssertTexture_4(texture, message, p1, p2) AssertNotEqual_5((texture).data, 0, message, p1, p2)
-#define AssertTexture_5(texture, message, p1, p2, p3) AssertNotEqual_6((texture).data, 0, message, p1, p2, p3)
-#define AssertTexture_6(texture, message, p1, p2, p3, p4) AssertNotEqual_7((texture).data, 0, message, p1, p2, p3, p4)
+#define AssertTexture_1(texture) Assert_3(IsTextureReady(texture), "AssertTexture(%s) - Texture not loaded", #texture)
+#define AssertTexture_2(texture, message) Assert_2(IsTextureReady(texture), message)
+#define AssertTexture_3(texture, message, p1) Assert_3(IsTextureReady(texture), message, p1)
+#define AssertTexture_4(texture, message, p1, p2) Assert_4(IsTextureReady(texture), message, p1, p2)
+#define AssertTexture_5(texture, message, p1, p2, p3) Assert_5(IsTextureReady(texture), message, p1, p2, p3)
+#define AssertTexture_6(texture, message, p1, p2, p3, p4) Assert_6(IsTextureReady(texture), message, p1, p2, p3, p4)
 
 // AssertImageSame()
 #ifdef RAYLIB_ASSERT_NDEBUG
@@ -260,7 +285,7 @@ extern "C" {
 #define AssertImageSame_2(image1, image2)
 #define AssertImageSame_3(image1, image2, message)
 #define AssertImageSame_4(image1, image2, message, p1)
-#define AssertImageSame_5(image1, image2, message, p1, p2,)
+#define AssertImageSame_5(image1, image2, message, p1, p2)
 #define AssertImageSame_6(image1, image2, message, p1, p2, p3)
 #define AssertImageSame_7(image1, image2, message, p1, p2, p3, p4)
 #else
@@ -289,13 +314,23 @@ extern "C" {
         AssertFail_1(message); \
     } \
 } while(0)
-#define AssertImageSame_4(image1, image2, message, p1) AssertImageSame_3(image1, image2, TextFormat(message, p1))
-#define AssertImageSame_5(image1, image2, message, p1, p2) AssertImageSame_3(image1, image2, TextFormat(message, p1, p2))
-#define AssertImageSame_6(image1, image2, message, p1, p2, p3) AssertImageSame_3(image1, image2, TextFormat(message, p1, p2, p3))
-#define AssertImageSame_7(image1, image2, message, p1, p2, p3, p4) AssertImageSame_3(image1, image2, TextFormat(message, p1, p2, p3, p4))
+#define AssertImageSame_4(image1, image2, message, p1) AssertImageSame_3(image1, image2, RAYLIB_ASSERT_TEXTFORMAT(message, p1))
+#define AssertImageSame_5(image1, image2, message, p1, p2) AssertImageSame_3(image1, image2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2))
+#define AssertImageSame_6(image1, image2, message, p1, p2, p3) AssertImageSame_3(image1, image2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3))
+#define AssertImageSame_7(image1, image2, message, p1, p2, p3, p4) AssertImageSame_3(image1, image2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
 #endif
 
 // AssertColorSame()
+#ifdef RAYLIB_ASSERT_NDEBUG
+#define AssertColorSame_0()
+#define AssertColorSame_1(color)
+#define AssertColorSame_2(color1, color2)
+#define AssertColorSame_3(color1, color2, message)
+#define AssertColorSame_4(color1, color2, message, p1)
+#define AssertColorSame_5(color1, color2, message, p1, p2)
+#define AssertColorSame_6(color1, color2, message, p1, p2, p3)
+#define AssertColorSame_7(color1, color2, message, p1, p2, p3, p4)
+#else
 #define AssertColorSame_0() AssertFail_1("Colors not provided to AssertColorSame()")
 #define AssertColorSame_1(color) AssertFail_1("Expected two colors for AssertColorSame()")
 #define AssertColorSame_2(color1, color2) AssertColorSame_5(color1, color2, "AssertColorSame(%s, %s) - Colors do not match", #color1, #color2)
@@ -304,10 +339,11 @@ extern "C" {
         AssertFail_1(message); \
     }\
 } while (0)
-#define AssertColorSame_4(color1, color2, message, p1) AssertColorSame_3(color1, color2, TextFormat(message, p1))
-#define AssertColorSame_5(color1, color2, message, p1, p2) AssertColorSame_3(color1, color2, TextFormat(message, p1, p2))
-#define AssertColorSame_6(color1, color2, message, p1, p2, p3) AssertColorSame_3(color1, color2, TextFormat(message, p1, p2, p3))
-#define AssertColorSame_7(color1, color2, message, p1, p2, p3, p4) AssertColorSame_3(color1, color2, TextFormat(message, p1, p2, p3, p4))
+#define AssertColorSame_4(color1, color2, message, p1) AssertColorSame_3(color1, color2, RAYLIB_ASSERT_TEXTFORMAT(message, p1))
+#define AssertColorSame_5(color1, color2, message, p1, p2) AssertColorSame_3(color1, color2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2))
+#define AssertColorSame_6(color1, color2, message, p1, p2, p3) AssertColorSame_3(color1, color2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3))
+#define AssertColorSame_7(color1, color2, message, p1, p2, p3, p4) AssertColorSame_3(color1, color2, RAYLIB_ASSERT_TEXTFORMAT(message, p1, p2, p3, p4))
+#endif
 
 #ifdef __cplusplus
 }