wip

pfeodrippe · Jan 13, 2025 · 282911b · 282911b
1 parent 8f585f5
commit 282911b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/bin/vybe_flecs.c b/bin/vybe_flecs.c
@@ -9,7 +9,7 @@ int ftruncate(int fildes, off_t length);
 #endif
 
 // -- Types.
-#define vy(n) ("C_vybe!!type/" "" #n)
+#define vy(n) ("C_vybe_DOT_type_SLASH_" "" #n)
 #define vyk(n) #n
 #define vyi(n) __Vy_##n
 

diff --git a/src/vybe/game.clj b/src/vybe/game.clj
@@ -1286,6 +1286,7 @@
    (vf/eid w vt/Transform)
    (vf/eid w :global)
    (vf.c/vybe-default-systems-c w)
+   #_(vybe.flecs-test/default-systems w)
 
    ;; Setup default systems.
    (default-systems w)

diff --git a/test/vybe/flecs_test.clj b/test/vybe/flecs_test.clj
@@ -105,7 +105,7 @@
         mat-translation (vr.c/matrix-translate (:x translation) (:y translation) (:z translation))]
     (vr.c/matrix-multiply (vr.c/matrix-multiply mat-scale mat-rotation) mat-translation)))
 
-(vc/defn* ^:debug vybe-transform :- :void
+(vc/defn* vybe-transform :- :void
   [it :- [:* vf/iter_t]]
   (let [pos (field it vt/Translation 0)
         rot (field it vt/Rotation 1)
@@ -158,7 +158,8 @@
     (vf/eid w vt/Scale)
     (vf/eid w vt/Transform)
     (vf/eid w :global)
-    (default-systems w)
+    #_(default-systems w)
+    (vf.c/vybe-default-systems-c w)
 
     (merge w {:alice [(vt/Scale [1.0 1.0 1.0]) (vt/Translation)
                       (vt/Rotation [0 0 0 1]) [(vt/Transform) :global] (vt/Transform)

diff --git a/todo.md b/todo.md
@@ -252,13 +252,17 @@
 - [ ] VybeC
   - [ ] move existing system into VybeC from C
     - [ ] direct translation
+      - [x] compile
+      - [ ] fix "mismatch between term.id and term.first" error
     - [ ] with-system working in VybeC
       - [ ] set components automatically
     - [ ] fix string tap
     - [ ] make `@, vp/&` etc better
     - [ ] `defsystem`?
   - [ ] read from source if some function has a inline (or not) metadata telling
         us the fn spec
+  - [ ] fix windows test
+  - [ ] upgrade Flecs
   - [ ] eval
     - [ ] form to quickly evaluate stuff
     - [ ] REPL plugin like portal does for cljs?