diff --git a/haxe_libraries/hollywoo.hxml b/haxe_libraries/hollywoo.hxml index de2f014..7a0b44d 100644 --- a/haxe_libraries/hollywoo.hxml +++ b/haxe_libraries/hollywoo.hxml @@ -1,6 +1,6 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#af4eea78316afdd0c8310e720540a97710a59f7d" into hollywoo/0.0.0/github/af4eea78316afdd0c8310e720540a97710a59f7d -# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/af4eea78316afdd0c8310e720540a97710a59f7d" +# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#6b4b0af84db3bf9b30ac164991f05b29f239229b" into hollywoo/0.0.0/github/6b4b0af84db3bf9b30ac164991f05b29f239229b +# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/6b4b0af84db3bf9b30ac164991f05b29f239229b" -lib kiss -lib kiss-tools --cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/af4eea78316afdd0c8310e720540a97710a59f7d/src/ +-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/6b4b0af84db3bf9b30ac164991f05b29f239229b/src/ -D hollywoo=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss-flixel.hxml b/haxe_libraries/kiss-flixel.hxml index 69454c7..2977393 100644 --- a/haxe_libraries/kiss-flixel.hxml +++ b/haxe_libraries/kiss-flixel.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#36e718647667dcdd844179545c328679b5560aee" into kiss-flixel/0.0.0/github/36e718647667dcdd844179545c328679b5560aee +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#988a773602ed204abe025e89012ce0d6d295c9c2" into kiss-flixel/0.0.0/github/988a773602ed204abe025e89012ce0d6d295c9c2 -lib flixel -lib flixel-addons -lib flixel-ui @@ -6,6 +6,6 @@ -lib kiss-tools -lib lime -lib openfl --cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/36e718647667dcdd844179545c328679b5560aee/src/ +-cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/988a773602ed204abe025e89012ce0d6d295c9c2/src/ -D kiss-flixel=0.0.0 --macro kiss_flixel.ShaderFrontend.use() \ No newline at end of file diff --git a/src/hollywoo_flixel/HollywooFlixelDSL.kiss b/src/hollywoo_flixel/HollywooFlixelDSL.kiss index 1cb6835..5d814ea 100644 --- a/src/hollywoo_flixel/HollywooFlixelDSL.kiss +++ b/src/hollywoo_flixel/HollywooFlixelDSL.kiss @@ -495,15 +495,21 @@ ->cc (director.chooseString "Which prop?" (dictGet propsInScene sceneKey) ->propKey - (let [lastScale .value (propScales.get propKey)] - (director.enterString "Redefine $propKey scale from ${lastScale}?" - ->scaleStr - (let [scale (Std.parseFloat scaleStr)] - (propScales.put propKey (new HFloat scale)) - // Re-scale props immediately - (doFor prop .props (dictGet scenes sceneKey) - (flxDirector.scaleProp prop.prop)) - (cc)))))) + (withFunctions + [ + (definePropScale [cc] + (let [lastScale .value (propScales.get propKey)] + (director.enterString "Redefine $propKey scale from ${lastScale}?" + ->scaleStr + (let [scale (Std.parseFloat scaleStr)] + (propScales.put propKey (new HFloat scale)) + // Re-scale props immediately + (doFor prop .props (dictGet scenes sceneKey) + (flxDirector.scaleProp prop.prop)) + (cc))))) + ] + (set lastCommand definePropScale) + (definePropScale cc)))) (shortcutHandler.registerItem "[d]efine [z] of a position" ->cc (director.chooseString "Which position?" (dictGet positionsInScene sceneKey)