Update dependencies

Author: chrisws

configure.ac

@@ -62,6 +62,8 @@ case "${host_os}" in
     WEBSOCKET_LDFLAGS="-lwsock32"
     GTK_SERVER_LDFLAGS=""
     GTK_SERVER_CPPFLAGS="-DGTK_SERVER_WIN32"
+    IOIO_CPPFLAGS=""
+    IOIO_LDFLAGS=""
     ;;
 
   *)
@@ -72,6 +74,8 @@ case "${host_os}" in
     GTK_SERVER_LDFLAGS="`pkg-config --libs gtk+-3.0` -lXm -lXt"
     GTK_SERVER_CPPFLAGS="`pkg-config --cflags gtk+-3.0` -DGTK_SERVER_FFI -DGTK_SERVER_LIBRARY -DGTK_SERVER_UNIX -DGTK_SERVER_GTK3x"
     RAYLIB_LDFLAGS="-lGL -lm -lpthread -ldl -lrt -lX11"
+    IOIO_CPPFLAGS="-I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux"
+    IOIO_LDFLAGS="-L/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server -ljvm"
 esac
 
 AC_SUBST(DEBUG_LDFLAGS)
@@ -82,6 +86,8 @@ AC_SUBST(WEBSOCKET_LDFLAGS)
 AC_SUBST(PLATFORM_LDFLAGS)
 AC_SUBST(GTK_SERVER_LDFLAGS)
 AC_SUBST(GTK_SERVER_CPPFLAGS)
+AC_SUBST(IOIO_LDFLAGS)
+AC_SUBST(IOIO_CPPFLAGS)
 
 dnl change default aru setting to avoid warning
 ARFLAGS=cr

gtk-server/uthash

@@ -19,11 +19,11 @@ all-am: $(generated)
 CLEANFILES = $(generated)
 
 AM_CXXFLAGS=-fno-rtti -std=c++14
-AM_CPPFLAGS = -I../include -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux -Wall
+AM_CPPFLAGS = -I../include -Wall @IOIO_CPPFLAGS@
 lib_LTLIBRARIES = libioio.la
 
 libioio_la_SOURCES = ../include/param.cpp ../include/hashmap.cpp ../include/apiexec.cpp main.cpp $(generated)
-libioio_la_LDFLAGS = -module -rpath '$(libdir)' @PLATFORM_LDFLAGS@ -L/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server -ljvm
+libioio_la_LDFLAGS = -module -rpath '$(libdir)' @PLATFORM_LDFLAGS@ @IOIO_LDFLAGS@
 
 $(generated): api.json mkapi.bas mkdoc.bas
 	$(sbasic) mkapi.bas > $@

ioio/Makefile.am

@@ -4,7 +4,7 @@ raylib is a simple and easy-to-use library to enjoy videogames programming.
 
 https://www.raylib.com/
 
-Implemented APIs (604)
+Implemented APIs (610)
 ----------------
 
 | Name    | Description   |
@@ -160,6 +160,7 @@ Implemented APIs (604)
 | func ExportImageAsCode(image, fileName) | Export image as code file defining an array of bytes, returns true on success |
 | func ExportImageToMemory(image, fileType, fileSize) | Export image to memory buffer |
 | func ExportMesh(mesh, fileName) | Export mesh data to file, returns true on success |
+| func ExportMeshAsCode(mesh, fileName) | Export mesh as code file (.h) defining multiple arrays of vertex attributes |
 | func ExportWave(wave, fileName) | Export wave data to file, returns true on success |
 | func ExportWaveAsCode(wave, fileName) | Export wave sample data to code (.h), returns true on success |
 | func Fade(color, alpha) | Get color with alpha applied, alpha goes from 0.0f to 1.0f |
@@ -262,6 +263,8 @@ Implemented APIs (604)
 | func GetScreenWidth() | Get current screen width |
 | func GetShaderLocation(shader, uniformName) | Get shader uniform location |
 | func GetShaderLocationAttrib(shader, attribName) | Get shader attribute location |
+| func GetShapesTexture() | Get texture that is used for shapes drawing |
+| func GetShapesTextureRectangle() | Get texture source rectangle that is used for shapes drawing |
 | func GetSplinePointBasis(p1, p2, p3, p4, t) | Get (evaluate) spline point: B-Spline |
 | func GetSplinePointBezierCubic(p1, c2, c3, p4, t) | Get (evaluate) spline point: Cubic Bezier |
 | func GetSplinePointBezierQuad(p1, c2, p3, t) | Get (evaluate) spline point: Quadratic Bezier |
@@ -273,6 +276,7 @@ Implemented APIs (604)
 | func GetTouchPosition(index) | Get touch position XY for a touch point index (relative to screen size) |
 | func GetTouchX() | Get touch position X for touch point 0 (relative to screen size) |
 | func GetTouchY() | Get touch position Y for touch point 0 (relative to screen size) |
+| func GetViewRay(mousePosition, camera, width, height) | Get a ray trace from mouse position in a viewport |
 | func GetWindowHandle() | Get native window handle |
 | func GetWindowPosition() | Get window position XY on monitor |
 | func GetWindowScaleDPI() | Get window scale DPI factor |
@@ -425,6 +429,7 @@ Implemented APIs (604)
 | func LoadFontFromMemory(fileType, fileData, dataSize, fontSize, codepoints, codepointCount) | Load font from memory buffer, fileType refers to extension: i.e. '.ttf' |
 | func LoadImage(fileName) | Load image from file into CPU memory (RAM) |
 | func LoadImageAnim(fileName, frames) | Load image sequence from file (frames appended to image.data) |
+| func LoadImageAnimFromMemory(fileType, fileData, dataSize, frames) | Load image sequence from memory buffer |
 | func LoadImageColors(image) | Load color data from image as a Color array (RGBA - 32bit) |
 | func LoadImageFromMemory(fileType, fileData, dataSize) | Load image from memory buffer, fileType refers to extension: i.e. '.png' |
 | func LoadImageFromScreen() | Load image from screen buffer and (screenshot) |
@@ -566,6 +571,7 @@ Implemented APIs (604)
 | func TextLength(text) | Get text length, checks for '\\0' ending |
 | func TextReplace(text, replace, by) | Replace text string (WARNING: memory must be freed!) |
 | func TextSubtext(text, position, length) | Get a piece of a text string |
+| func TextToFloat(text) | Get float value from text (negative values not supported) |
 | func TextToInteger(text) | Get integer value from text (negative values not supported) |
 | func TextToLower(text) | Get lower case version of provided string |
 | func TextToPascal(text) | Get Pascal case notation version of provided string |

nuklear/Nuklear

@@ -34,6 +34,7 @@
   {2, 2, "EXPORTIMAGEASCODE", cmd_exportimageascode},
   {2, 2, "EXPORTIMAGETOMEMORY", cmd_exportimagetomemory},
   {2, 2, "EXPORTMESH", cmd_exportmesh},
+  {2, 2, "EXPORTMESHASCODE", cmd_exportmeshascode},
   {2, 2, "EXPORTWAVE", cmd_exportwave},
   {2, 2, "EXPORTWAVEASCODE", cmd_exportwaveascode},
   {2, 2, "FADE", cmd_fade},
@@ -129,6 +130,8 @@
   {0, 0, "GETSCREENWIDTH", cmd_getscreenwidth},
   {2, 2, "GETSHADERLOCATION", cmd_getshaderlocation},
   {2, 2, "GETSHADERLOCATIONATTRIB", cmd_getshaderlocationattrib},
+  {0, 0, "GETSHAPESTEXTURE", cmd_getshapestexture},
+  {0, 0, "GETSHAPESTEXTURERECTANGLE", cmd_getshapestexturerectangle},
   {5, 5, "GETSPLINEPOINTBASIS", cmd_getsplinepointbasis},
   {5, 5, "GETSPLINEPOINTBEZIERCUBIC", cmd_getsplinepointbeziercubic},
   {4, 4, "GETSPLINEPOINTBEZIERQUAD", cmd_getsplinepointbezierquad},
@@ -140,6 +143,7 @@
   {1, 1, "GETTOUCHPOSITION", cmd_gettouchposition},
   {0, 0, "GETTOUCHX", cmd_gettouchx},
   {0, 0, "GETTOUCHY", cmd_gettouchy},
+  {4, 4, "GETVIEWRAY", cmd_getviewray},
   {0, 0, "GETWINDOWHANDLE", cmd_getwindowhandle},
   {0, 0, "GETWINDOWPOSITION", cmd_getwindowposition},
   {0, 0, "GETWINDOWSCALEDPI", cmd_getwindowscaledpi},
@@ -209,6 +213,7 @@
   {5, 5, "LOADFONTFROMMEMORY", cmd_loadfontfrommemory},
   {1, 1, "LOADIMAGE", cmd_loadimage},
   {1, 1, "LOADIMAGEANIM", cmd_loadimageanim},
+  {3, 3, "LOADIMAGEANIMFROMMEMORY", cmd_loadimageanimfrommemory},
   {1, 1, "LOADIMAGECOLORS", cmd_loadimagecolors},
   {3, 3, "LOADIMAGEFROMMEMORY", cmd_loadimagefrommemory},
   {0, 0, "LOADIMAGEFROMSCREEN", cmd_loadimagefromscreen},
@@ -246,6 +251,7 @@
   {1, 1, "TEXTLENGTH", cmd_textlength},
   {3, 3, "TEXTREPLACE", cmd_textreplace},
   {3, 3, "TEXTSUBTEXT", cmd_textsubtext},
+  {1, 1, "TEXTTOFLOAT", cmd_texttofloat},
   {1, 1, "TEXTTOINTEGER", cmd_texttointeger},
   {1, 1, "TEXTTOLOWER", cmd_texttolower},
   {1, 1, "TEXTTOPASCAL", cmd_texttopascal},

raylib/README.md

@@ -452,6 +452,23 @@ static int cmd_exportmesh(int argc, slib_par_t *params, var_t *retval) {
   return result;
 }
 
+//
+// Export mesh as code file (.h) defining multiple arrays of vertex attributes
+//
+static int cmd_exportmeshascode(int argc, slib_par_t *params, var_t *retval) {
+  int result;
+  int mesh_id = get_mesh_id(argc, params, 0, retval);
+  if (mesh_id != -1) {
+    auto fileName = get_param_str(argc, params, 1, 0);
+    auto fnResult = ExportMeshAsCode(_meshMap.at(mesh_id), fileName);
+    v_setint(retval, fnResult);
+    result = 1;
+  } else {
+    result = 0;
+  }
+  return result;
+}
+
 //
 // Export wave data to file, returns true on success
 //
@@ -1531,6 +1548,24 @@ static int cmd_getshaderlocationattrib(int argc, slib_par_t *params, var_t *retv
   return 1;
 }
 
+//
+// Get texture that is used for shapes drawing
+//
+static int cmd_getshapestexture(int argc, slib_par_t *params, var_t *retval) {
+  auto fnResult = GetShapesTexture();
+  v_settexture2d(retval, fnResult);
+  return 1;
+}
+
+//
+// Get texture source rectangle that is used for shapes drawing
+//
+static int cmd_getshapestexturerectangle(int argc, slib_par_t *params, var_t *retval) {
+  auto fnResult = GetShapesTextureRectangle();
+  v_setrect(retval, fnResult);
+  return 1;
+}
+
 //
 // Get (evaluate) spline point: B-Spline
 //
@@ -1654,6 +1689,19 @@ static int cmd_gettouchy(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
+//
+// Get a ray trace from mouse position in a viewport
+//
+static int cmd_getviewray(int argc, slib_par_t *params, var_t *retval) {
+  auto mousePosition = get_param_vec2(argc, params, 0);
+  auto camera = get_camera_3d(argc, params, 1);
+  auto width = get_param_num(argc, params, 2, 0);
+  auto height = get_param_num(argc, params, 3, 0);
+  auto fnResult = GetViewRay(mousePosition, camera, width, height);
+  v_setray(retval, fnResult);
+  return 1;
+}
+
 //
 // Get native window handle
 //
@@ -2473,6 +2521,19 @@ static int cmd_loadimageanim(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
+//
+// Load image sequence from memory buffer
+//
+static int cmd_loadimageanimfrommemory(int argc, slib_par_t *params, var_t *retval) {
+  auto fileType = get_param_str(argc, params, 0, 0);
+  auto fileData = (const unsigned char *)get_param_str(argc, params, 1, 0);
+  auto dataSize = get_param_int(argc, params, 2, 0);
+  auto frames = (int *)0;
+  auto fnResult = LoadImageAnimFromMemory(fileType, fileData, dataSize, frames);
+  v_setimage(retval, fnResult);
+  return 1;
+}
+
 //
 // Load color data from image as a Color array (RGBA - 32bit)
 //
@@ -2918,7 +2979,7 @@ static int cmd_textlength(int argc, slib_par_t *params, var_t *retval) {
 // Replace text string (WARNING: memory must be freed!)
 //
 static int cmd_textreplace(int argc, slib_par_t *params, var_t *retval) {
-  auto text = (char *)get_param_str(argc, params, 0, 0);
+  auto text = get_param_str(argc, params, 0, 0);
   auto replace = get_param_str(argc, params, 1, 0);
   auto by = get_param_str(argc, params, 2, 0);
   auto fnResult = (const char *)TextReplace(text, replace, by);
@@ -2938,6 +2999,16 @@ static int cmd_textsubtext(int argc, slib_par_t *params, var_t *retval) {
   return 1;
 }
 
+//
+// Get float value from text (negative values not supported)
+//
+static int cmd_texttofloat(int argc, slib_par_t *params, var_t *retval) {
+  auto text = get_param_str(argc, params, 0, 0);
+  auto fnResult = TextToFloat(text);
+  v_setreal(retval, fnResult);
+  return 1;
+}
+
 //
 // Get integer value from text (negative values not supported)
 //

raylib/func-def.h

@@ -2996,7 +2996,7 @@ static int cmd_unloadautomationeventlist(int argc, slib_par_t *params, var_t *re
   int result;
   int list_id = get_automationeventlist_id(argc, params, 0, retval);
   if (list_id != -1) {
-    UnloadAutomationEventList(&_automationEventListMap.at(list_id));
+    UnloadAutomationEventList(_automationEventListMap.at(list_id));
     _automationEventListMap.erase(list_id);
     result = 1;
   } else {

raylib/func.h

@@ -123,16 +123,16 @@ static void server_ev_close(mg_connection *conn, Session *session) {
   }
 }
 
-static void server_handler(struct mg_connection *conn, int event, void *eventData, void *session) {
+static void server_handler(struct mg_connection *conn, int event, void *eventData) {
   switch (event) {
   case MG_EV_HTTP_MSG:
-    server_http_msg(conn, (mg_http_message *)eventData, (Session *)session);
+    server_http_msg(conn, (mg_http_message *)eventData, (Session *)conn->fn_data);
     break;
   case MG_EV_WS_MSG:
     server_ws_msg(conn, (mg_ws_message *)eventData);
     break;
   case MG_EV_CLOSE:
-    server_ev_close(conn, (Session *)session);
+    server_ev_close(conn, (Session *)conn->fn_data);
     break;
   default:
     break;
@@ -171,19 +171,19 @@ static void client_ws_msg(mg_connection *conn, mg_ws_message *message, Session *
   }
 }
 
-static void client_handler(mg_connection *conn, int event, void *eventData, void *fnData) {
+static void client_handler(mg_connection *conn, int event, void *eventData) {
   switch (event) {
   case MG_EV_ERROR:
     fprintf(stderr, "ERROR: [%p] %s", conn->fd, (char *)eventData);
     break;
   case MG_EV_WS_OPEN:
-    client_ws_open(conn, (Session *)fnData);
+    client_ws_open(conn, (Session *)conn->fn_data);
     break;
   case MG_EV_WS_MSG:
-    client_ws_msg(conn, (mg_ws_message *)eventData, (Session *)fnData);
+    client_ws_msg(conn, (mg_ws_message *)eventData, (Session *)conn->fn_data);
     break;
   case MG_EV_CLOSE:
-    ((Session *)fnData)->_state = kClosed;
+    ((Session *)conn->fn_data)->_state = kClosed;
     break;
   default:
     break;