multi atlas stuff

probably shoulda put this in the update today OH WELL also stolen from psych
soushimiya · Feb 5, 2025 · 35a5d88 · 35a5d88
1 parent 9b851c8
commit 35a5d88
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/source/Character.hx b/source/Character.hx
@@ -394,6 +394,9 @@ class Character extends FlxSpriteGroup
 			case sparrow:
 				character = new FlxSprite();
 				character.frames = Paths.getSparrowAtlas(characterInfo.info.spritePath);
+			case multiSparrow:
+				character = new FlxSprite();
+				character.frames = Paths.getMultipleSparrowAtlas(characterInfo.info.spritePaths);
 			case packer:
 				character = new FlxSprite();
 				character.frames = Paths.getPackerAtlas(characterInfo.info.spritePath);

diff --git a/source/Paths.hx b/source/Paths.hx
@@ -89,6 +89,23 @@ class Paths
 		return 'assets/images/$key';
 	}
 
+	//Stolen from Psych Engine hehehhehe
+	inline static public function getMultipleSparrowAtlas(keys:Array<String>){
+		var parentFrames:FlxAtlasFrames = getSparrowAtlas(keys[0]);
+		if(keys.length > 1){
+			var original:FlxAtlasFrames = parentFrames;
+			parentFrames = new FlxAtlasFrames(parentFrames.parent);
+			parentFrames.addAtlas(original, true);
+			for (i in 1...keys.length){
+				var extraFrames:FlxAtlasFrames = getSparrowAtlas(keys[i]);
+				if(extraFrames != null){
+					parentFrames.addAtlas(extraFrames, true);
+				}
+			}
+		}
+		return parentFrames;
+	}
+
 	inline static public function video(key:String){
 		return file(key, "videos", "mp4");
 	}

diff --git a/source/characters/CharacterInfoBase.hx b/source/characters/CharacterInfoBase.hx
@@ -24,6 +24,7 @@ enum FrameLoadType {
 	packer;
 	load(frameWidth:Int, frameHeight:Int);
 	atlas;
+	multiSparrow;
 }
 
 typedef AnimInfo = {
@@ -71,6 +72,7 @@ typedef CharacterFunctions = {
 typedef CharacterInfo = {
 	var name:String;
 	var spritePath:String;
+	var spritePaths:Array<String>;
 	var frameLoadType:FrameLoadType;
 	var iconName:String;
 	var deathCharacter:String;
@@ -109,6 +111,7 @@ class CharacterInfoBase
 	public var info:CharacterInfo = {
 		name: "",
 		spritePath: "",
+		spritePaths: [],
 		frameLoadType: sparrow,
 		iconName: "face",
 		deathCharacter: "Bf",
@@ -430,6 +433,7 @@ class CharacterInfoBase
 	function setPacker():FrameLoadType{ return FrameLoadType.packer; }
 	function setLoad(frameWidth:Int, frameHeight:Int):FrameLoadType{ return FrameLoadType.load(frameWidth, frameHeight); }
 	function setAtlas():FrameLoadType{ return FrameLoadType.atlas; }
+	function setMultiSparrow():FrameLoadType{ return FrameLoadType.multiSparrow; }
 
 	public function toString():String{ return ""+info; }
 }