sync fwk

MAKE.bat

@@ -322,6 +322,7 @@ if "%1"=="fwk" (
         git fetch
         git reset --hard origin/main
     popd
+    call make.bat split
     call MAKE.bat fwk_prep
     start "" fwk_diff.WinMerge
     exit /b
@@ -338,12 +339,12 @@ if "%1"=="gwk" (
     copy/y ..\fwk-mirror\engine\fwk _fwk\engine\fwk
     copy/y ..\fwk-mirror\engine\split\*.inl _fwk\engine\split\
     rem copy/y ..\fwk-mirror\engine\split\3rd_*.c _fwk\engine\split\
+    make back
 
     exit /b
 )
 
 if "%1"=="fwk_prep" (
-    call make.bat split
     if not exist "_fwk" mkdir "_fwk"
     if not exist "_fwk\demos" mkdir "_fwk\demos"
     if not exist "_fwk\tools" mkdir "_fwk\tools"
@@ -453,8 +454,8 @@ if "%1"=="back" (
 
     rem tools\fwkren.exe tools\cook.ini to
 
-    call make.bat join
+    rem call make.bat join
-    call make.bat amalgamation
+    rem call make.bat amalgamation
 
     echo All done.
     endlocal

bind/v4k.lua

@@ -3341,7 +3341,7 @@ unsigned play;
 bool paused;
 struct atlas_t *a;
 } sprite_t;
-enum { OBJTYPE_sprite_t = 10 };       typedef struct { unsigned static_assert_on_L__LINE__ : !!(10 <= 255); } static_assert_on_Lconcat(_L,3959)___COUNTER__;       typedef struct { unsigned static_assert_on_L__LINE__ : !!(sizeof(sprite_t)); } static_assert_on_Lconcat(_L,3959)___COUNTER__;;
+enum { OBJTYPE_sprite_t = 10 };       typedef struct { unsigned static_assert_on_L__LINE__ : !!(10 <= 255); } static_assert_on_Lconcat(_L,3962)___COUNTER__;       typedef struct { unsigned static_assert_on_L__LINE__ : !!(sizeof(sprite_t)); } static_assert_on_Lconcat(_L,3962)___COUNTER__;;
  void     sprite_ctor(sprite_t *s);
  void     sprite_dtor(sprite_t *s);
  void     sprite_tick(sprite_t *s);

engine/joint/v4k.h

@@ -14068,6 +14068,10 @@ extern "C" {
 #define COOK_DISABLED           0 // ifdef(nocook, 1, 0) ///+
 #endif
 
+#ifndef ENABLE_RPMALLOC
+#define ENABLE_RPMALLOC         0 // ifdef(tcc, 0, 1) // forbidden on tcc because of lacking TLS support
+#endif
+
 // -----------------------------------------------------------------------------
 // if/n/def hell
 
@@ -15368,7 +15372,6 @@ API extern int   (*obj_init[256])(); ///-
 API extern int   (*obj_quit[256])(); ///-
 API extern int   (*obj_tick[256])(); ///-
 API extern int   (*obj_draw[256])(); ///-
-
 API extern int   (*obj_lerp[256])(); ///-
 
 API extern int   (*obj_aabb[256])(); ///-
@@ -17735,7 +17738,7 @@ typedef struct camera_t {
     vec2 last_look; vec3 last_move; // used for friction and damping
     bool damping;
 
-    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30o], isometric[if pitch == 35.264o]
+    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30º], isometric[if pitch == 35.264º]
     float distance;    // distance to pivot, when orbiting
     // vec2 polarity = { +1,-1 }; // @todo
     // vec2 sensitivity = { 2,2 }; // @todo
@@ -241313,7 +241316,7 @@ static char *ui_filter = 0;
 // - rlyeh, public domain
 //
 // changelog:
-// - ported to FWK api
+// - ported to V4K api
 // - namespaced symbols
 // - diverse win32 fixes
 // - adaptive cols/rows
@@ -241490,7 +241493,7 @@ static void browser_reload_directory_content(struct browser *browser, const char
             // remove last '/' if present. ok to overwrite absolute var, file_*() API returns writeable strings.
             char *dir = absolute; if( dir[ strlen(dir) - 1 ] == '/' ) dir[ strlen(dir) - 1 ] = '\0';
 
-            dir = file_name(dir);  // /home/rlyeh/prj/fwk/art -> art
+            dir = file_name(dir);  // /home/rlyeh/prj/v4k/art -> art
             BROWSER_PRINTF("%s\n", dir);
 
             if( dir[0] != '.' ) // skip special files, folders and internal files like .git or .art.zip
@@ -378856,10 +378859,10 @@ void v4k_init() {
 // - network replication can be done by external tools by comparing the filesystems and by sending the resulting diff zipped
 //
 // ## Editor roadmap
-// - Gizmos?, scene tree, property editor?, load/save?, undo/redo?, copy/paste, on/off (vis,tick,ddraw,log), vcs.
+// - Gizmos✱, scene tree, property editor✱, load/save✱, undo/redo✱, copy/paste, on/off (vis,tick,ddraw,log), vcs.
-// - Scenenode pass: node singleton display, node console, node labels, node outlines?.<!-- node == gameobj ? -->
+// - Scenenode pass: node singleton display, node console, node labels, node outlines✱.<!-- node == gameobj ? -->
-// - Render pass: billboards?, materials, un/lit, cast shadows, wireframe, skybox?/mie?, fog/atmosphere
+// - Render pass: billboards✱, materials, un/lit, cast shadows, wireframe, skybox✱/mie✱, fog/atmosphere
-// - Level pass: volumes, triggers, platforms, level streaming, collide?, physics
+// - Level pass: volumes, triggers, platforms, level streaming, collide✱, physics
 // - Edit pass: Procedural content, brushes, noise and CSG.
 // - GUI pass: timeline and data tracks, node graphs. <!-- worthy: will be reused into materials, animgraphs and blueprints -->
 

engine/split/3rd_nuklear_filebrowser.h

@@ -2,7 +2,7 @@
 // - rlyeh, public domain
 //
 // changelog:
-// - ported to FWK api
+// - ported to V4K api
 // - namespaced symbols
 // - diverse win32 fixes
 // - adaptive cols/rows
@@ -179,7 +179,7 @@ static void browser_reload_directory_content(struct browser *browser, const char
             // remove last '/' if present. ok to overwrite absolute var, file_*() API returns writeable strings.
             char *dir = absolute; if( dir[ strlen(dir) - 1 ] == '/' ) dir[ strlen(dir) - 1 ] = '\0';
 
-            dir = file_name(dir);  // /home/rlyeh/prj/fwk/art -> art
+            dir = file_name(dir);  // /home/rlyeh/prj/v4k/art -> art
             BROWSER_PRINTF("%s\n", dir);
 
             if( dir[0] != '.' ) // skip special files, folders and internal files like .git or .art.zip

engine/split/v4k_config.h

@@ -37,6 +37,10 @@
 #define COOK_DISABLED           0 // ifdef(nocook, 1, 0) ///+
 #endif
 
+#ifndef ENABLE_RPMALLOC
+#define ENABLE_RPMALLOC         0 // ifdef(tcc, 0, 1) // forbidden on tcc because of lacking TLS support
+#endif
+
 // -----------------------------------------------------------------------------
 // if/n/def hell
 

engine/split/v4k_editor.c

@@ -6,10 +6,10 @@
 // - network replication can be done by external tools by comparing the filesystems and by sending the resulting diff zipped
 //
 // ## Editor roadmap
-// - Gizmos?, scene tree, property editor?, load/save?, undo/redo?, copy/paste, on/off (vis,tick,ddraw,log), vcs.
+// - Gizmos✱, scene tree, property editor✱, load/save✱, undo/redo✱, copy/paste, on/off (vis,tick,ddraw,log), vcs.
-// - Scenenode pass: node singleton display, node console, node labels, node outlines?.<!-- node == gameobj ? -->
+// - Scenenode pass: node singleton display, node console, node labels, node outlines✱.<!-- node == gameobj ? -->
-// - Render pass: billboards?, materials, un/lit, cast shadows, wireframe, skybox?/mie?, fog/atmosphere
+// - Render pass: billboards✱, materials, un/lit, cast shadows, wireframe, skybox✱/mie✱, fog/atmosphere
-// - Level pass: volumes, triggers, platforms, level streaming, collide?, physics
+// - Level pass: volumes, triggers, platforms, level streaming, collide✱, physics
 // - Edit pass: Procedural content, brushes, noise and CSG.
 // - GUI pass: timeline and data tracks, node graphs. <!-- worthy: will be reused into materials, animgraphs and blueprints -->
 

engine/split/v4k_obj.h

@@ -208,7 +208,6 @@ API extern int   (*obj_init[256])(); ///-
 API extern int   (*obj_quit[256])(); ///-
 API extern int   (*obj_tick[256])(); ///-
 API extern int   (*obj_draw[256])(); ///-
-
 API extern int   (*obj_lerp[256])(); ///-
 
 API extern int   (*obj_aabb[256])(); ///-

engine/split/v4k_scene.h

@@ -15,7 +15,7 @@ typedef struct camera_t {
     vec2 last_look; vec3 last_move; // used for friction and damping
     bool damping;
 
-    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30o], isometric[if pitch == 35.264o]
+    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30º], isometric[if pitch == 35.264º]
     float distance;    // distance to pivot, when orbiting
     // vec2 polarity = { +1,-1 }; // @todo
     // vec2 sensitivity = { 2,2 }; // @todo

engine/v4k

@@ -222477,7 +222477,7 @@ static char *ui_filter = 0;
 // - rlyeh, public domain
 //
 // changelog:
-// - ported to FWK api
+// - ported to V4K api
 // - namespaced symbols
 // - diverse win32 fixes
 // - adaptive cols/rows
@@ -222654,7 +222654,7 @@ static void browser_reload_directory_content(struct browser *browser, const char
             // remove last '/' if present. ok to overwrite absolute var, file_*() API returns writeable strings.
             char *dir = absolute; if( dir[ strlen(dir) - 1 ] == '/' ) dir[ strlen(dir) - 1 ] = '\0';
 
-            dir = file_name(dir);  // /home/rlyeh/prj/fwk/art -> art
+            dir = file_name(dir);  // /home/rlyeh/prj/v4k/art -> art
             BROWSER_PRINTF("%s\n", dir);
 
             if( dir[0] != '.' ) // skip special files, folders and internal files like .git or .art.zip

engine/v4k.c

@@ -29188,10 +29188,10 @@ void v4k_init() {
 // - network replication can be done by external tools by comparing the filesystems and by sending the resulting diff zipped
 //
 // ## Editor roadmap
-// - Gizmos?, scene tree, property editor?, load/save?, undo/redo?, copy/paste, on/off (vis,tick,ddraw,log), vcs.
+// - Gizmos✱, scene tree, property editor✱, load/save✱, undo/redo✱, copy/paste, on/off (vis,tick,ddraw,log), vcs.
-// - Scenenode pass: node singleton display, node console, node labels, node outlines?.<!-- node == gameobj ? -->
+// - Scenenode pass: node singleton display, node console, node labels, node outlines✱.<!-- node == gameobj ? -->
-// - Render pass: billboards?, materials, un/lit, cast shadows, wireframe, skybox?/mie?, fog/atmosphere
+// - Render pass: billboards✱, materials, un/lit, cast shadows, wireframe, skybox✱/mie✱, fog/atmosphere
-// - Level pass: volumes, triggers, platforms, level streaming, collide?, physics
+// - Level pass: volumes, triggers, platforms, level streaming, collide✱, physics
 // - Edit pass: Procedural content, brushes, noise and CSG.
 // - GUI pass: timeline and data tracks, node graphs. <!-- worthy: will be reused into materials, animgraphs and blueprints -->
 

engine/v4k.h

@@ -135,6 +135,10 @@ extern "C" {
 #define COOK_DISABLED           0 // ifdef(nocook, 1, 0) ///+
 #endif
 
+#ifndef ENABLE_RPMALLOC
+#define ENABLE_RPMALLOC         0 // ifdef(tcc, 0, 1) // forbidden on tcc because of lacking TLS support
+#endif
+
 // -----------------------------------------------------------------------------
 // if/n/def hell
 
@@ -1435,7 +1439,6 @@ API extern int   (*obj_init[256])(); ///-
 API extern int   (*obj_quit[256])(); ///-
 API extern int   (*obj_tick[256])(); ///-
 API extern int   (*obj_draw[256])(); ///-
-
 API extern int   (*obj_lerp[256])(); ///-
 
 API extern int   (*obj_aabb[256])(); ///-
@@ -3802,7 +3805,7 @@ typedef struct camera_t {
     vec2 last_look; vec3 last_move; // used for friction and damping
     bool damping;
 
-    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30o], isometric[if pitch == 35.264o]
+    bool orthographic; // 0 perspective, 1 orthographic; when ortho: dimetric[if pitch == -30º], isometric[if pitch == 35.264º]
     float distance;    // distance to pivot, when orbiting
     // vec2 polarity = { +1,-1 }; // @todo
     // vec2 sensitivity = { 2,2 }; // @todo