Update raylib to version 5.5 and fix resulting errors

Author: smithjasper

project.janet

@@ -1,4 +1,4 @@
-( declare-project
+(declare-project
   :name "jaylib"
   :description "Janet bindings to Raylib"
   :url "https://github.com/janet-lang/jaylib"
@@ -13,7 +13,7 @@
     # you might need to edit ./raylib/src/external/glfw/src/x11_init.c:1124
     # to match /usr/X11R6/lib/libX11.so*
     :openbsd '["-Iraylib/src" "-Iraylib/src/external/glfw/include" "-I/usr/X11R6/include" "-Du_char=unsigned char" "-Dalloca(x)=malloc(x)"]
-    #default
+    # default
     '["-Iraylib/src" "-Iraylib/src/external/glfw/include"]))
 
 (def lflags
@@ -35,7 +35,8 @@
             "_DARWIN_C_SOURCE" (if (= o :macos) "1" nil)
             "_GNU_SOURCE" true
             "SUPPORT_FILEFORMAT_BMP" true
-            "STB_IMAGE_IMPLEMENTATION" true}
+            "STB_IMAGE_IMPLEMENTATION" true
+            "_GLFW_X11" (if (= o :linux) true nil)}
 
   :source ["src/main.c"
            # raylib sources

raylib

@@ -353,10 +353,10 @@ static Janet cfun_LoadMaterialDefault(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(defaultMaterial);
 }
 
-static Janet cfun_IsMaterialReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsMaterialValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Material material = *jaylib_getmaterial(argv, 0);
-    if (IsMaterialReady(material)) {
+    if (IsMaterialValid(material)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -396,10 +396,10 @@ static Janet cfun_LoadModel(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(model);
 }
 
-static Janet cfun_IsModelReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsModelValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Model model = *jaylib_getmodel(argv, 0);
-    if (IsModelReady(model)) {
+    if (IsModelValid(model)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -797,9 +797,9 @@ static JanetReg threed_cfuns[] = {
         "(load-material-default)\n\n"
         "Load and return the default material"    
     },
-    {"material-ready?", cfun_IsMaterialReady,
-        "(material-ready? material)\n\n"
-        "Checks if a material is ready"
+    {"material-valid?", cfun_IsMaterialValid,
+        "(material-valid? material)\n\n"
+        "Checks if a material is valid"
     },
     {"unload-material", cfun_UnloadMaterial,
         "(unload-material material)\n\n"
@@ -861,9 +861,9 @@ static JanetReg threed_cfuns[] = {
         "(load-model filename)\n\n"
         "Load model from files (meshes and materials)"    
     },
-    {"model-ready?", cfun_IsModelReady,
-        "(model-ready? model)\n\n"
-        "Checks if a model is ready"
+    {"model-valid?", cfun_IsModelValid,
+        "(model-valid? model)\n\n"
+        "Checks if a model is valid"
     },
     {"load-model-from-mesh", cfun_LoadModelFromMesh,
         "(load-model-from-mesh mesh)\n\n"

src/3d.h

@@ -46,10 +46,10 @@ static Janet cfun_LoadWave(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(wave);
 }
 
-static Janet cfun_IsWaveReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsWaveValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Wave wave = *jaylib_getwave(argv, 0);
-    if (IsWaveReady(wave)) {
+    if (IsWaveValid(wave)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -72,10 +72,10 @@ static Janet cfun_LoadSoundFromWave(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(sound);
 }
 
-static Janet cfun_IsSoundReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsSoundValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Sound sound = *jaylib_getsound(argv, 0);
-    if (IsSoundReady(sound)) {
+    if (IsSoundValid(sound)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -188,10 +188,10 @@ static Janet cfun_LoadMusicStreamFromMemory(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(music);
 }
 
-static Janet cfun_IsMusicReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsMusicValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Music music = *jaylib_getmusic(argv, 0);
-    if (IsMusicReady(music)) {
+    if (IsMusicValid(music)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -388,17 +388,17 @@ static JanetReg audio_cfuns[] = {
         "(load-wave file-name)\n\n"
         "Load wave data from file"
     },
-    {"wave-ready?", cfun_IsWaveReady,
-        "(wave-ready? wave)\n\n"
-        "Checks if wave data is ready"
+    {"wave-valid?", cfun_IsWaveValid,
+        "(wave-valid? wave)\n\n"
+        "Checks if wave data is valid"
     },
     {"load-sound", cfun_LoadSound, 
         "(load-sound file-name)\n\n"
         "Load sound from file"
     },
-    {"sound-ready?", cfun_IsSoundReady,
-        "(sound-ready? wave)\n\n"
-        "Checks if sound is ready"
+    {"sound-valid?", cfun_IsSoundValid,
+        "(sound-valid? wave)\n\n"
+        "Checks if sound is valid"
     },
     {"load-sound-from-wave", cfun_LoadSoundFromWave, 
         "(load-sound-from-wave wave)\n\n"
@@ -460,9 +460,9 @@ static JanetReg audio_cfuns[] = {
         "(load-music-stream-from-memory file-type data data-size)\n\n"
         "Load music stream from data"
     },
-    {"music-ready?", cfun_IsMusicReady,
-        "(music-ready? wave)\n\n"
-        "Checks if a music stream is ready"
+    {"music-valid?", cfun_IsMusicValid,
+        "(music-valid? wave)\n\n"
+        "Checks if a music stream is valid"
     },
     {"unload-music-stream", cfun_UnloadMusicStream, 
         "(unload-music-stream music)\n\n"

src/audio.h

@@ -40,10 +40,10 @@ static Janet cfun_GetBitmapHeaderBuffer(int32_t argc, Janet *argv) {
     return janet_wrap_buffer(data);
 }
 
-static Janet cfun_IsImageReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsImageValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Image image = *jaylib_getimage(argv, 0);
-    if (IsImageReady(image)) {
+    if (IsImageValid(image)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -81,10 +81,10 @@ static Janet cfun_LoadTexture(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(texture);
 }
 
-static Janet cfun_IsTextureReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsTextureValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Texture2D texture = *jaylib_gettexture2d(argv, 0);
-    if (IsTextureReady(texture)) {
+    if (IsTextureValid(texture)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -114,8 +114,6 @@ static Janet cfun_LoadTextureCubemap(int32_t argc, Janet *argv) {
         layoutType = CUBEMAP_LAYOUT_CROSS_THREE_BY_FOUR;
     } else if (!janet_cstrcmp(kw,  "4x3")) {
         layoutType = CUBEMAP_LAYOUT_CROSS_FOUR_BY_THREE;
-    } else if (!janet_cstrcmp(kw, "panorama")) {
-        layoutType = CUBEMAP_LAYOUT_PANORAMA;
     } else {
         janet_panicf("unknown layout type %v", argv[1]);
     }
@@ -136,7 +134,7 @@ static Janet cfun_LoadRenderTexture(int32_t argc, Janet *argv) {
 static Janet cfun_IsRenderTextureReady(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     RenderTexture texture = *jaylib_getrendertexture(argv, 0);
-    if (IsRenderTextureReady(texture)) {
+    if (IsRenderTextureValid(texture)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -722,9 +720,9 @@ static const JanetReg image_cfuns[] = {
         "(get-bitmap-header-buffer dimx dimy)\n\n"
         "returns a header for a 24bpp bitmap with dimensions dimx*dimy"
     },
-    {"image-ready?", cfun_IsImageReady,
-        "(image-ready? image)\n\n"
-        "Check if an image is ready"
+    {"image-valid?", cfun_IsImageValid,
+        "(image-valid? image)\n\n"
+        "Check if an image is valid"
     },
     {"export-image", cfun_ExportImage, 
         "(export-image image file-name)\n\n"
@@ -738,9 +736,9 @@ static const JanetReg image_cfuns[] = {
         "(load-texture file-name)\n\n"
         "Load texture from file into GPU memory (VRAM)"
     },
-    {"texture-ready?", cfun_IsTextureReady,
-        "(texture-ready? texture)\n\n"
-        "Check if a texture is ready"
+    {"texture-valid?", cfun_IsTextureValid,
+        "(texture-valid? texture)\n\n"
+        "Check if a texture is valid"
     },
     {"load-texture-from-image", cfun_LoadTextureFromImage,  
         "(load-texture-from-image image)\n\n"

src/image.h

@@ -273,9 +273,8 @@ static Janet cfun_DrawRectangleRoundedLines(int32_t argc, Janet *argv) {
     Rectangle rec = jaylib_getrect(argv, 0);
     float roundness = (float) janet_getnumber(argv, 1);
     int segments = janet_getinteger(argv, 2);
-    int lineThick = janet_getinteger(argv, 3);
-    Color color = jaylib_getcolor(argv, 4);
-    DrawRectangleRoundedLines(rec, roundness, segments, lineThick, color);
+    Color color = jaylib_getcolor(argv, 3);
+    DrawRectangleRoundedLines(rec, roundness, segments, color);
     return janet_wrap_nil();
 }
 

src/shapes.h

@@ -31,10 +31,10 @@ static Janet cfun_LoadFont(int32_t argc, Janet *argv) {
     return janet_wrap_abstract(font);
 }
 
-static Janet cfun_IsFontReady(int32_t argc, Janet *argv) {
+static Janet cfun_IsFontValid(int32_t argc, Janet *argv) {
     janet_fixarity(argc, 1);
     Font font = *jaylib_getfont(argv, 0);
-    if (IsFontReady(font)) {
+    if (IsFontValid(font)) {
         return janet_wrap_true();
     } else {
         return janet_wrap_false();
@@ -199,9 +199,9 @@ static JanetReg text_cfuns[] = {
         "(load-font file-name)\n\n"
         "Load font from file into GPU memory (VRAM)"
     },
-    {"font-ready?", cfun_IsFontReady,
-        "(font-ready? font)\n\n"
-        "Check if a font is ready"
+    {"font-valid?", cfun_IsFontValid,
+        "(font-valid? font)\n\n"
+        "Check if a font is valid"
     },
     {"load-font-ex", cfun_LoadFontEx,
         "(load-font-ex file-name font-size &opt font-chars)\n\n"