Browse Source

Fix Math having no delimiters

This required updating Cakelisp to keep the delimiter on the context
pitch-detection
Macoy Madson 2 years ago
parent
commit
58f5b18160
  1. 5
      Build_Debug.sh
  2. 2
      Dependencies/cakelisp
  3. 10
      src/Math.cake

5
Build_Debug.sh

@ -5,7 +5,7 @@ echo "\n\nOgre\n\n"
echo "\n\nSDL Ogre\n\n"
./Dependencies/cakelisp/bin/cakelisp test/src/SDLOgreApp.cake || exit $?
echo "\n\nAuto Test\n\n"
./Dependencies/cakelisp/bin/cakelisp src/AutoTest.cake src/SDL.cake src/Tracy.cake || exit $?
./Dependencies/cakelisp/bin/cakelisp src/AutoTest.cake src/Math.cake src/SDL.cake src/Tracy.cake || exit $?
echo "\n\nVocal Game (hot reload)\n\n"
./Dependencies/cakelisp/bin/cakelisp test/src/MakeHotReload.cake test/src/VocalGame.cake || exit $?
@ -17,9 +17,6 @@ echo "\n\nVocal Game (no reload)\n\n"
./Dependencies/cakelisp/bin/cakelisp \
test/src/NoHotReload.cake test/src/VocalGame.cake || exit $?
# TODO: Need process command change detection to successfully rebuild this
./Dependencies/cakelisp/bin/cakelisp src/AutoTest.cake src/Math.cake || exit $?
# TESTING
# echo "\n\nVocal Game (no reload)\n\n"

2
Dependencies/cakelisp

@ -1 +1 @@
Subproject commit 9f0a8965b9777b353c22f7c118526fb6df50909f
Subproject commit b8ad85dd908b5d96f78692ef6b2d85159e555b20

10
src/Math.cake

@ -9,7 +9,7 @@
z float)
;; Expand vector to each of its components
(defmacro vec3-expand (vec symbol)
(defmacro vec3-xyz (vec symbol)
(tokenize-push output
(field (token-splice vec) x)
(field (token-splice vec) y)
@ -18,11 +18,5 @@
(defun test--math (&return int)
(var my-vec vec3 (array 1.f 2.f 3.f))
;; TODO: ExpressionList delimiter is lost because macro expansion uses different evaluate all
;; (printf "%f %f %f\n" (vec3-expand my-vec))
(printf "%f %f %f\n" (field my-vec x)
(field my-vec y)
(field my-vec z))
(printf "%f %f %f\n" (vec3-xyz my-vec))
(return 0))
(add-build-config-label "Math")

Loading…
Cancel
Save