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

update deps

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-07-12 14:09:54 -06:00
parent a1f65d7684
commit b38238d18c
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
haxe_libraries/hollywoo.hxml
View File

@@ -1,6 +1,6 @@
# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#8317eec14c274160c4a031099fb2d4d71ab63f1b" into hollywoo/0.0.0/github/8317eec14c274160c4a031099fb2d4d71ab63f1b
# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/8317eec14c274160c4a031099fb2d4d71ab63f1b"
# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#60e95716333b077964589596081acc87ed8d9983" into hollywoo/0.0.0/github/60e95716333b077964589596081acc87ed8d9983
# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/60e95716333b077964589596081acc87ed8d9983"
-lib kiss
-lib kiss-tools
-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/8317eec14c274160c4a031099fb2d4d71ab63f1b/src/
-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/60e95716333b077964589596081acc87ed8d9983/src/
-D hollywoo=0.0.0

4
haxe_libraries/kiss-flixel.hxml
View File

@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#e7ee5e8385dd21a828217f2df49eaa7c15558a0c" into kiss-flixel/0.0.0/github/e7ee5e8385dd21a828217f2df49eaa7c15558a0c
# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#1128c564132f9a2d7a30057146a690b6ff122c34" into kiss-flixel/0.0.0/github/1128c564132f9a2d7a30057146a690b6ff122c34
-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/e7ee5e8385dd21a828217f2df49eaa7c15558a0c/src/
-cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/1128c564132f9a2d7a30057146a690b6ff122c34/src/
-D kiss-flixel=0.0.0
--macro kiss_flixel.ShaderFrontend.use()

4
haxe_libraries/kiss-tools.hxml
View File

@@ -1,4 +1,4 @@
# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#66767a64a2de69155e641abcd2fbef925ff1af93" into kiss-tools/0.0.0/github/66767a64a2de69155e641abcd2fbef925ff1af93
# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#3462a9e61256e34535030da587910400a182eef4" into kiss-tools/0.0.0/github/3462a9e61256e34535030da587910400a182eef4
-lib kiss
-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/66767a64a2de69155e641abcd2fbef925ff1af93/src/
-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/3462a9e61256e34535030da587910400a182eef4/src/
-D kiss-tools=0.0.0

2
src/hollywoo_flixel/FlxDirector.hx
View File

@@ -19,7 +19,7 @@ import hollywoo.Movie;
import hollywoo.Scene;
import hollywoo.Director;
import hollywoo.StagePosition;
import hollywoo.HFloat;
import kiss_tools.JsonFloat;
import hollywoo_flixel.FlxMovie;
import flixel.util.FlxColor;
import flixel.text.FlxText;

2
src/hollywoo_flixel/FlxDirector.kiss
View File

@@ -930,7 +930,7 @@
(prop.updateHitbox)
(when (> prop.height FlxG.height)
(prop.setGraphicSize 0 FlxG.height))
(flxMovie.propScales.put propKey (new HFloat prop.scale.x))))
(flxMovie.propScales.put propKey (new JsonFloat prop.scale.x))))
(let [:Float scale .value (flxMovie.propScales.get propKey)]
(when (StringTools.contains propKey "anonProp") (return))

6
src/hollywoo_flixel/FlxMovie.hx
View File

@@ -13,7 +13,7 @@ import hollywoo_flixel.ActorFlxSprite;
import kiss_flixel.SpriteTools;
import kiss_flixel.FlxKeyShortcutHandler;
import kiss_tools.JsonMap;
import hollywoo.HFloat;
import kiss_tools.JsonFloat;
import openfl.Assets;
import flixel.tweens.FlxTween;
@@ -26,7 +26,7 @@ class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, FlxSound, FlxS
public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, delayLengthsJson:String, voiceLineMatchesJson:String, propScalesJson:String, miscFloatsJson:String, miscIntsJson:String, positionRelativityJson:String) {
super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, delayLengthsJson, voiceLineMatchesJson, miscFloatsJson, miscIntsJson, positionRelativityJson);
propScales = new JsonMap(propScalesJson, new HFloat(1.0));
propScales = new JsonMap(propScalesJson, new JsonFloat(1.0));
}
public var uiCamera:FlxCamera;
public var screenCamera:FlxCamera;
@@ -35,7 +35,7 @@ class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, FlxSound, FlxS
public var textProps:Array<FlxSprite> = [];
public var propScales:JsonMap<HFloat>;
public var propScales:JsonMap<JsonFloat>;
public var propsInScene:Map<String,Array<String>> = [];
public var overlaidPropsInScenes:Map<String,Map<FlxSprite,String>> = [];
public var tweenedPositionsOfSpritesInScenes:Map<String,Map<FlxSprite,FlxPoint>> = [];

2
src/hollywoo_flixel/HollywooFlixelDSL.kiss
View File

@@ -520,7 +520,7 @@
(let [scale (Std.parseFloat scaleStr)]
(if (Math.isNaN scale)
(print "Failed to parse ${scaleStr}. leaving value the same")
(propScales.put propKey (new HFloat scale)))
(propScales.put propKey (new JsonFloat scale)))
// Re-scale props immediately
(doFor prop .props (dictGet scenes sceneKey)
(flxDirector.scaleProp prop.prop))