Update to latest dependency changes

Author: chrisws

nuklear/Nuklear

@@ -1,10 +1,10 @@
-*Raylib* 4.2
+*Raylib* 4.5-dev
 =======
 raylib is a simple and easy-to-use library to enjoy videogames programming.
 
 https://www.raylib.com/
 
-Implemented APIs (558)
+Implemented APIs (566)
 ----------------
 
 | Name    | Description   |
@@ -24,6 +24,7 @@ Implemented APIs (558)
 | func CheckCollisionLines(startPos1, endPos1, startPos2, endPos2, collisionPoint) | Check the collision between two lines defined by two points each, returns collision point by reference |
 | func CheckCollisionPointCircle(point, center, radius) | Check if point is inside circle |
 | func CheckCollisionPointLine(point, p1, p2, threshold) | Check if point belongs to line created between two points [p1] and [p2] with defined margin in pixels [threshold] |
+| func CheckCollisionPointPoly(point, points, pointCount) | Check if point is within a polygon described by array of vertices |
 | func CheckCollisionPointRec(point, rec) | Check if point is inside rectangle |
 | func CheckCollisionPointTriangle(point, p1, p2, p3) | Check if point is inside a triangle |
 | func CheckCollisionRecs(rec1, rec2) | Check collision between two rectangles |
@@ -33,7 +34,7 @@ Implemented APIs (558)
 | sub CloseAudioDevice() | Close the audio device and context |
 | func closePhysics() | n/a |
 | sub CloseWindow() | Close window and unload OpenGL context |
-| func CodepointToUTF8(codepoint, byteSize) | Encode one codepoint into UTF-8 byte array (array length returned as parameter) |
+| func CodepointToUTF8(codepoint, utf8Size) | Encode one codepoint into UTF-8 byte array (array length returned as parameter) |
 | func ColorAlpha(color, alpha) | Get color with alpha applied, alpha goes from 0.0f to 1.0f |
 | func ColorAlphaBlend(dst, src, tint) | Get src alpha-blended into dst color with tint |
 | func ColorFromHSV(hue, saturation, value) | Get a Color from HSV values, hue [0..360], saturation/value [0..1] |
@@ -158,6 +159,8 @@ Implemented APIs (558)
 | func GenImageGradientH(width, height, left, right) | Generate image: horizontal gradient |
 | func GenImageGradientRadial(width, height, density, inner, outer) | Generate image: radial gradient |
 | func GenImageGradientV(width, height, top, bottom) | Generate image: vertical gradient |
+| func GenImagePerlinNoise(width, height, offsetX, offsetY, scale) | Generate image: perlin noise |
+| func GenImageText(width, height, text) | Generate image: grayscale image from text data |
 | func GenImageWhiteNoise(width, height, factor) | Generate image: white noise |
 | func GenMeshCone(radius, height, slices) | Generate cone/pyramid mesh |
 | func GenMeshCube(width, height, length) | Generate cuboid mesh |
@@ -177,8 +180,10 @@ Implemented APIs (558)
 | func GetCameraMatrix2D(camera) | Get camera 2d transform matrix |
 | func GetCharPressed() | Get char pressed (unicode), call it multiple times for chars queued, returns 0 when the queue is empty |
 | func GetClipboardText() | Get clipboard text content |
-| func GetCodepoint(text, bytesProcessed) | Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure |
+| func GetCodepoint(text, codepointSize) | Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure |
 | func GetCodepointCount(text) | Get total number of codepoints in a UTF-8 encoded string |
+| func GetCodepointNext(text, codepointSize) | Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure |
+| func GetCodepointPrevious(text, codepointSize) | Get previous codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure |
 | func GetCollisionRec(rec1, rec2) | Get collision rectangle for two rectangles collision |
 | func GetColor(hexValue) | Get Color structure from hexadecimal value |
 | func GetCurrentMonitor() | Get current connected monitor |
@@ -315,8 +320,10 @@ Implemented APIs (558)
 | sub ImageCrop(image, crop) | Crop an image to a defined rectangle |
 | sub ImageDither(image, rBpp, gBpp, bBpp, aBpp) | Dither image data to 16bpp or lower (Floyd-Steinberg dithering) |
 | sub ImageDraw(dst, src, srcRec, dstRec, tint) | Draw a source image within a destination image (tint applied to source) |
-| sub ImageDrawCircle(dst, centerX, centerY, radius, color) | Draw circle within an image |
-| sub ImageDrawCircleV(dst, center, radius, color) | Draw circle within an image (Vector version) |
+| sub ImageDrawCircle(dst, centerX, centerY, radius, color) | Draw a filled circle within an image |
+| sub ImageDrawCircleLines(dst, centerX, centerY, radius, color) | Draw circle outline within an image |
+| sub ImageDrawCircleLinesV(dst, center, radius, color) | Draw circle outline within an image (Vector version) |
+| sub ImageDrawCircleV(dst, center, radius, color) | Draw a filled circle within an image (Vector version) |
 | sub ImageDrawLine(dst, startPosX, startPosY, endPosX, endPosY, color) | Draw line within an image |
 | sub ImageDrawLineV(dst, start, end, color) | Draw line within an image (Vector version) |
 | sub ImageDrawPixel(dst, posX, posY, color) | Draw pixel within an image |
@@ -408,6 +415,7 @@ Implemented APIs (558)
 | func LoadTexture(fileName) | Load texture from file into GPU memory (VRAM) |
 | func LoadTextureCubemap(image, layout) | Load cubemap from image, multiple image cubemap layouts supported |
 | func LoadTextureFromImage(image) | Load texture from image data |
+| func LoadUTF8(codepoints, length) | Load UTF-8 text encoded from codepoints array |
 | func LoadWave(fileName) | Load wave data from file |
 | func LoadWaveFromMemory(fileType, fileData, dataSize) | Load wave from memory buffer, fileType refers to extension: i.e. '.wav' |
 | func LoadWaveSamples(wave) | Load samples data from wave as a 32bit float data array |
@@ -515,7 +523,6 @@ Implemented APIs (558)
 | sub SwapScreenBuffer() | Swap back buffer with front buffer (screen drawing) |
 | sub TakeScreenshot(fileName) | Takes a screenshot of current screen (filename extension defines format) |
 | sub TextAppend(text, append, position) | Append text at specific position and move cursor! |
-| func TextCodepointsToUTF8(codepoints, length) | Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!) |
 | func TextCopy(dst, src) | Copy one string to another, returns bytes copied |
 | func TextFindIndex(text, find) | Find first text occurrence within a string |
 | func TextFormat(text, args) | Text formatting with variables (sprintf() style) |
@@ -549,6 +556,7 @@ Implemented APIs (558)
 | sub UnloadShader(shader) | Unload shader from GPU memory (VRAM) |
 | sub UnloadSound(sound) | Unload sound |
 | sub UnloadTexture(texture) | Unload texture from GPU memory (VRAM) |
+| sub UnloadUTF8(text) | Unload UTF-8 text encoded from codepoints array |
 | sub UnloadWave(wave) | Unload wave data |
 | sub UnloadWaveSamples(samples) | Unload samples data loaded with LoadWaveSamples() |
 | sub UpdateAudioStream(stream, data, frameCount) | Update audio stream buffers with data |

raylib/README.md

@@ -6,6 +6,7 @@
   {5, 5, "CHECKCOLLISIONLINES", cmd_checkcollisionlines},
   {3, 3, "CHECKCOLLISIONPOINTCIRCLE", cmd_checkcollisionpointcircle},
   {4, 4, "CHECKCOLLISIONPOINTLINE", cmd_checkcollisionpointline},
+  {3, 3, "CHECKCOLLISIONPOINTPOLY", cmd_checkcollisionpointpoly},
   {2, 2, "CHECKCOLLISIONPOINTREC", cmd_checkcollisionpointrec},
   {4, 4, "CHECKCOLLISIONPOINTTRIANGLE", cmd_checkcollisionpointtriangle},
   {2, 2, "CHECKCOLLISIONRECS", cmd_checkcollisionrecs},
@@ -38,6 +39,8 @@
   {4, 4, "GENIMAGEGRADIENTH", cmd_genimagegradienth},
   {5, 5, "GENIMAGEGRADIENTRADIAL", cmd_genimagegradientradial},
   {4, 4, "GENIMAGEGRADIENTV", cmd_genimagegradientv},
+  {5, 5, "GENIMAGEPERLINNOISE", cmd_genimageperlinnoise},
+  {3, 3, "GENIMAGETEXT", cmd_genimagetext},
   {3, 3, "GENIMAGEWHITENOISE", cmd_genimagewhitenoise},
   {3, 3, "GENMESHCONE", cmd_genmeshcone},
   {3, 3, "GENMESHCUBE", cmd_genmeshcube},
@@ -57,6 +60,8 @@
   {0, 0, "GETCLIPBOARDTEXT", cmd_getclipboardtext},
   {1, 1, "GETCODEPOINT", cmd_getcodepoint},
   {1, 1, "GETCODEPOINTCOUNT", cmd_getcodepointcount},
+  {1, 1, "GETCODEPOINTNEXT", cmd_getcodepointnext},
+  {1, 1, "GETCODEPOINTPREVIOUS", cmd_getcodepointprevious},
   {2, 2, "GETCOLLISIONREC", cmd_getcollisionrec},
   {1, 1, "GETCOLOR", cmd_getcolor},
   {0, 0, "GETCURRENTMONITOR", cmd_getcurrentmonitor},
@@ -198,6 +203,7 @@
   {1, 1, "LOADTEXTURE", cmd_loadtexture},
   {2, 2, "LOADTEXTURECUBEMAP", cmd_loadtexturecubemap},
   {1, 1, "LOADTEXTUREFROMIMAGE", cmd_loadtexturefromimage},
+  {2, 2, "LOADUTF8", cmd_loadutf8},
   {1, 1, "LOADWAVE", cmd_loadwave},
   {3, 3, "LOADWAVEFROMMEMORY", cmd_loadwavefrommemory},
   {1, 1, "LOADWAVESAMPLES", cmd_loadwavesamples},
@@ -208,7 +214,6 @@
   {3, 3, "SAVEFILEDATA", cmd_savefiledata},
   {2, 2, "SAVEFILETEXT", cmd_savefiletext},
   {1, 1, "SETGAMEPADMAPPINGS", cmd_setgamepadmappings},
-  {2, 2, "TEXTCODEPOINTSTOUTF8", cmd_textcodepointstoutf8},
   {2, 2, "TEXTCOPY", cmd_textcopy},
   {2, 2, "TEXTFINDINDEX", cmd_textfindindex},
   {3, 3, "TEXTINSERT", cmd_textinsert},

raylib/func-def.h

@@ -95,6 +95,18 @@ static int cmd_checkcollisionpointline(int argc, slib_par_t *params, var_t *retv
   return 1;
 }
 
+//
+// Check if point is within a polygon described by array of vertices
+//
+static int cmd_checkcollisionpointpoly(int argc, slib_par_t *params, var_t *retval) {
+  auto point = get_param_vec2(argc, params, 0);
+  auto points = (Vector2 *)get_param_vec2_array(argc, params, 1);
+  auto pointCount = get_param_int(argc, params, 2, 0);
+  auto fnResult = CheckCollisionPointPoly(point, points, pointCount);
+  v_setint(retval, fnResult);
+  return 1;
+}
+
 //
 // Check if point is inside rectangle
 //
@@ -148,9 +160,9 @@ static int cmd_checkcollisionspheres(int argc, slib_par_t *params, var_t *retval
 //
 static int cmd_codepointtoutf8(int argc, slib_par_t *params, var_t *retval) {
   auto codepoint = get_param_int(argc, params, 0, 0);
-  auto byteSize = 0;
-  auto fnResult = (const char *)CodepointToUTF8(codepoint, &byteSize);
-  v_setstrn(retval, fnResult, byteSize);
+  auto utf8Size = 0;
+  auto fnResult = (const char *)CodepointToUTF8(codepoint, &utf8Size);
+  v_setstrn(retval, fnResult, utf8Size);
   MemFree((void *)fnResult);
   return 1;
 }
@@ -505,6 +517,32 @@ static int cmd_genimagegradientv(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
+//
+// Generate image: perlin noise
+//
+static int cmd_genimageperlinnoise(int argc, slib_par_t *params, var_t *retval) {
+  auto width = get_param_int(argc, params, 0, 0);
+  auto height = get_param_int(argc, params, 1, 0);
+  auto offsetX = get_param_int(argc, params, 2, 0);
+  auto offsetY = get_param_int(argc, params, 3, 0);
+  auto scale = get_param_num(argc, params, 4, 0);
+  auto fnResult = GenImagePerlinNoise(width, height, offsetX, offsetY, scale);
+  v_setimage(retval, fnResult);
+  return 1;
+}
+
+//
+// Generate image: grayscale image from text data
+//
+static int cmd_genimagetext(int argc, slib_par_t *params, var_t *retval) {
+  auto width = get_param_int(argc, params, 0, 0);
+  auto height = get_param_int(argc, params, 1, 0);
+  auto text = get_param_str(argc, params, 2, 0);
+  auto fnResult = GenImageText(width, height, text);
+  v_setimage(retval, fnResult);
+  return 1;
+}
+
 //
 // Generate image: white noise
 //
@@ -713,8 +751,8 @@ static int cmd_getclipboardtext(int argc, slib_par_t *params, var_t *retval) {
 //
 static int cmd_getcodepoint(int argc, slib_par_t *params, var_t *retval) {
   auto text = get_param_str(argc, params, 0, 0);
-  auto bytesProcessed = (int *)0;
-  auto fnResult = GetCodepoint(text, bytesProcessed);
+  auto codepointSize = (int *)0;
+  auto fnResult = GetCodepoint(text, codepointSize);
   v_setint(retval, fnResult);
   return 1;
 }
@@ -729,6 +767,28 @@ static int cmd_getcodepointcount(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
+//
+// Get next codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure
+//
+static int cmd_getcodepointnext(int argc, slib_par_t *params, var_t *retval) {
+  auto text = get_param_str(argc, params, 0, 0);
+  auto codepointSize = (int *)0;
+  auto fnResult = GetCodepointNext(text, codepointSize);
+  v_setint(retval, fnResult);
+  return 1;
+}
+
+//
+// Get previous codepoint in a UTF-8 encoded string, 0x3f('?') is returned on failure
+//
+static int cmd_getcodepointprevious(int argc, slib_par_t *params, var_t *retval) {
+  auto text = get_param_str(argc, params, 0, 0);
+  auto codepointSize = (int *)0;
+  auto fnResult = GetCodepointPrevious(text, codepointSize);
+  v_setint(retval, fnResult);
+  return 1;
+}
+
 //
 // Get collision rectangle for two rectangles collision
 //
@@ -2312,6 +2372,17 @@ static int cmd_loadtexturefromimage(int argc, slib_par_t *params, var_t *retval)
   return result;
 }
 
+//
+// Load UTF-8 text encoded from codepoints array
+//
+static int cmd_loadutf8(int argc, slib_par_t *params, var_t *retval) {
+  auto codepoints = (const int *)get_param_int_t(argc, params, 0, 0);
+  auto length = get_param_int(argc, params, 1, 0);
+  auto fnResult = (const char *)LoadUTF8(codepoints, length);
+  v_setstr(retval, fnResult);
+  return 1;
+}
+
 //
 // Load wave data from file
 //
@@ -2434,17 +2505,6 @@ static int cmd_setgamepadmappings(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
-//
-// Encode text as codepoints array into UTF-8 text string (WARNING: memory must be freed!)
-//
-static int cmd_textcodepointstoutf8(int argc, slib_par_t *params, var_t *retval) {
-  auto codepoints = (const int *)get_param_int_t(argc, params, 0, 0);
-  auto length = get_param_int(argc, params, 1, 0);
-  auto fnResult = (const char *)TextCodepointsToUTF8(codepoints, length);
-  v_setstr(retval, fnResult);
-  return 1;
-}
-
 //
 // Copy one string to another, returns bytes copied
 //

raylib/func.h

@@ -120,6 +120,8 @@
   {5, 5, "IMAGEDITHER", cmd_imagedither},
   {5, 5, "IMAGEDRAW", cmd_imagedraw},
   {5, 5, "IMAGEDRAWCIRCLE", cmd_imagedrawcircle},
+  {5, 5, "IMAGEDRAWCIRCLELINES", cmd_imagedrawcirclelines},
+  {4, 4, "IMAGEDRAWCIRCLELINESV", cmd_imagedrawcirclelinesv},
   {4, 4, "IMAGEDRAWCIRCLEV", cmd_imagedrawcirclev},
   {6, 6, "IMAGEDRAWLINE", cmd_imagedrawline},
   {4, 4, "IMAGEDRAWLINEV", cmd_imagedrawlinev},
@@ -232,6 +234,7 @@
   {1, 1, "UNLOADSHADER", cmd_unloadshader},
   {1, 1, "UNLOADSOUND", cmd_unloadsound},
   {1, 1, "UNLOADTEXTURE", cmd_unloadtexture},
+  {1, 1, "UNLOADUTF8", cmd_unloadutf8},
   {1, 1, "UNLOADWAVE", cmd_unloadwave},
   {1, 1, "UNLOADWAVESAMPLES", cmd_unloadwavesamples},
   {3, 3, "UPDATEAUDIOSTREAM", cmd_updateaudiostream},

raylib/proc-def.h

@@ -1611,7 +1611,7 @@ static int cmd_imagedraw(int argc, slib_par_t *params, var_t *retval) {
 }
 
 //
-// Draw circle within an image
+// Draw a filled circle within an image
 //
 static int cmd_imagedrawcircle(int argc, slib_par_t *params, var_t *retval) {
   int result;
@@ -1630,7 +1630,44 @@ static int cmd_imagedrawcircle(int argc, slib_par_t *params, var_t *retval) {
 }
 
 //
-// Draw circle within an image (Vector version)
+// Draw circle outline within an image
+//
+static int cmd_imagedrawcirclelines(int argc, slib_par_t *params, var_t *retval) {
+  int result;
+  int dst_id = get_image_id(argc, params, 0, retval);
+  if (dst_id != -1) {
+    auto centerX = get_param_int(argc, params, 1, 0);
+    auto centerY = get_param_int(argc, params, 2, 0);
+    auto radius = get_param_int(argc, params, 3, 0);
+    auto color = get_param_color(argc, params, 4);
+    ImageDrawCircleLines(&_imageMap.at(dst_id), centerX, centerY, radius, color);
+    result = 1;
+  } else {
+    result = 0;
+  }
+  return result;
+}
+
+//
+// Draw circle outline within an image (Vector version)
+//
+static int cmd_imagedrawcirclelinesv(int argc, slib_par_t *params, var_t *retval) {
+  int result;
+  int dst_id = get_image_id(argc, params, 0, retval);
+  if (dst_id != -1) {
+    auto center = get_param_vec2(argc, params, 1);
+    auto radius = get_param_int(argc, params, 2, 0);
+    auto color = get_param_color(argc, params, 3);
+    ImageDrawCircleLinesV(&_imageMap.at(dst_id), center, radius, color);
+    result = 1;
+  } else {
+    result = 0;
+  }
+  return result;
+}
+
+//
+// Draw a filled circle within an image (Vector version)
 //
 static int cmd_imagedrawcirclev(int argc, slib_par_t *params, var_t *retval) {
   int result;
@@ -3087,6 +3124,15 @@ static int cmd_unloadtexture(int argc, slib_par_t *params, var_t *retval) {
   return result;
 }
 
+//
+// Unload UTF-8 text encoded from codepoints array
+//
+static int cmd_unloadutf8(int argc, slib_par_t *params, var_t *retval) {
+  auto text = (char *)get_param_str(argc, params, 0, 0);
+  UnloadUTF8(text);
+  return 1;
+}
+
 //
 // Unload wave data
 //

raylib/proc.h

@@ -0,0 +1,14 @@
+import font1
+import font2
+
+for i = 50 to 200 step 40
+  font1.drawtext(10, 100+i, i, "This is some text!")
+next i
+
+font2.drawtext(10, 20, 70, true, "()ABCDEFGHIJKLMNOPQRSTUVWXYZ *+,-./<>1234567890;")
+font2.drawtext(10, 40, 100, true, "()ABCDEFGHIJKLMNOPQRSTUVWXYZ *+,-./<>1234567890;")
+font2.drawtext(10, 60, 70, false, "()ABCDEFGHIJKLMNOPQRSTUVWXYZ *+,-./<>1234567890;")
+font2.drawtext(10, 80, 100, false, "()ABCDEFGHIJKLMNOPQRSTUVWXYZ *+,-./<>1234567890;")
+
+showpage
+pause