kiss-lang/hollywoo-flixel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linearmotion macros accept connectedsprites

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-08-19 20:47:24 -05:00
parent 2dc1782a7b
commit d71a865362
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/hollywoo_flixel/HollywooFlixelDSL.kiss
View File

@@ -189,7 +189,7 @@
position (resolvePosition positionKey holderType)] position (resolvePosition positionKey holderType)]
(linearMotion skipping sprite position.x position.y speed cc soundLoop volumeMod connectedSprites))) (linearMotion skipping sprite position.x position.y speed cc soundLoop volumeMod connectedSprites)))
(defMacro _linearMotionTo [withMacro await objectKey positionKey speed soundLoop volumeMod] (defMacro _linearMotionTo [withMacro await objectKey positionKey speed soundLoop volumeMod connectedSprites]
`(,withMacro ,objectKey o `(,withMacro ,objectKey o
(linearMotionTo (linearMotionTo
skipping skipping
@@ -198,16 +198,13 @@
,speed ,speed
,(if (eval await) `cc `null) ,(if (eval await) `cc `null)
,soundLoop ,soundLoop
,volumeMod) ,volumeMod
(array FlxSprite ,@connectedSprites))
,(if (eval await) `null `(cc)))) ,(if (eval await) `null `(cc))))
(defMacroFunction tryRead [stream]
(try (read stream)
(catch [e] `null)))
(defMacroFunction awaitLMTReaderMacro [stream withMacro await] (defMacroFunction awaitLMTReaderMacro [stream withMacro await]
(let [nextLineStream (stream.expect "hollywoo macro line" ->(stream.takeLineAsStream)) (let [nextLineStream (stream.expect "hollywoo macro line" ->(stream.takeLineAsStream))
exps [(read nextLineStream) (read nextLineStream) (read nextLineStream) (tryRead nextLineStream) (tryRead nextLineStream)]] exps [(read nextLineStream) (read nextLineStream) (read nextLineStream) (readOr nextLineStream `null) (readOr nextLineStream `null) (readOr nextLineStream `[])]]
`(_linearMotionTo ,withMacro ,await ,@exps))) `(_linearMotionTo ,withMacro ,await ,@exps)))
(defReaderMacro "AWAITLINEARMOTIONACTORTO" [stream &builder b] (defReaderMacro "AWAITLINEARMOTIONACTORTO" [stream &builder b]
@@ -223,7 +220,7 @@
(awaitLMTReaderMacro stream `withPropCC false)) (awaitLMTReaderMacro stream `withPropCC false))
(defMacro _linearMotion [withMacro await objectKey _x _y speed soundLoop volumeMod] (defMacro _linearMotion [withMacro await objectKey _x _y speed soundLoop volumeMod connectedSprites]
`(,withMacro ,objectKey o `(,withMacro ,objectKey o
(let [x o.x y o.y] (let [x o.x y o.y]
(linearMotion (linearMotion
@@ -234,12 +231,16 @@
,speed ,speed
,(if (eval await) `cc `null) ,(if (eval await) `cc `null)
,soundLoop ,soundLoop
,volumeMod)) ,volumeMod
(array FlxSprite ,@connectedSprites)))
,(if (eval await) `null `(cc)))) ,(if (eval await) `null `(cc))))
// This looks like duplication of the above,
// but these ones use the version of the function without TO
(defMacroFunction awaitLMReaderMacro [stream withMacro await] (defMacroFunction awaitLMReaderMacro [stream withMacro await]
(let [nextLineStream (stream.expect "hollywoo macro line" ->(stream.takeLineAsStream)) (let [nextLineStream (stream.expect "hollywoo macro line" ->(stream.takeLineAsStream))
exps [(read nextLineStream) (read nextLineStream) (read nextLineStream) (read nextLineStream) (tryRead nextLineStream) (tryRead nextLineStream)]] exps [(read nextLineStream) (read nextLineStream) (read nextLineStream) (read nextLineStream) (readOr nextLineStream `null) (readOr nextLineStream `null) (readOr nextLineStream `[])]]
`(_linearMotion ,withMacro ,await ,@exps))) `(_linearMotion ,withMacro ,await ,@exps)))
(defReaderMacro "AWAITLINEARMOTIONACTOR" [stream &builder b] (defReaderMacro "AWAITLINEARMOTIONACTOR" [stream &builder b]