cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-02 10:19:48 +00:00
Code Issues Releases Wiki Activity

anim shit for stages

Browse source
This commit is contained in:
Cameron Taylor 2021-08-28 12:41:15 -04:00
parent 7ef82bd1d3
commit 2747de79cb
2 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
source/BGSprite.hx
View file

@ -9,32 +9,53 @@ class BGSprite extends FlxSprite
*/ */
public var idleAnim:String; public var idleAnim:String;
public function new(image:String, x:Float = 0, y:Float = 0, parX:Float = 1, parY:Float = 1, ?daAnimations:Array<String>, ?loopingAnim:Bool = false) /**
* NOTE: loadOldWay param is just for current backward compatibility! Will be moved later!
*/
public function new(image:String, x:Float = 0, y:Float = 0, parX:Float = 1, parY:Float = 1, ?daAnimations:Array<String>, ?loopingAnim:Bool = false,
?loadOldWay:Bool = true)
{ {
super(x, y); super(x, y);
if (daAnimations != null) if (loadOldWay)
{ {
frames = Paths.getSparrowAtlas(image); if (daAnimations != null)
for (anims in daAnimations)
{ {
animation.addByPrefix(anims, anims, 24, loopingAnim); setupSparrow(image, daAnimations, loopingAnim);
animation.play(anims); }
else
if (idleAnim == null) {
idleAnim = anims; justLoadImage(image);
} }
}
else
{
loadGraphic(Paths.image(image));
active = false;
} }
scrollFactor.set(parX, parY); scrollFactor.set(parX, parY);
antialiasing = true; antialiasing = true;
} }
public function setupSparrow(image:String, daAnimations:Array<String>, ?loopingAnim:Bool = false)
{
frames = Paths.getSparrowAtlas(image);
for (anims in daAnimations)
{
var daLoop:Bool = loopingAnim;
if (loopingAnim == null)
daLoop = false;
animation.addByPrefix(anims, anims, 24, daLoop);
animation.play(anims);
if (idleAnim == null)
idleAnim = anims;
}
}
public function justLoadImage(image:String)
{
loadGraphic(Paths.image(image));
active = false;
}
public function dance():Void public function dance():Void
{ {
if (idleAnim != null) if (idleAnim != null)

21
source/PlayState.hx
View file

@ -526,13 +526,6 @@ class PlayState extends MusicBeatState
tankSky.velocity.x = FlxG.random.float(5, 15); tankSky.velocity.x = FlxG.random.float(5, 15);
add(tankSky); add(tankSky);
// need to implement animated effects, prob not too hard?
var smokeLeft:BGSprite = new BGSprite('smokeLeft', -200, -100, 0.4, 0.4, ['SmokeBlurLeft'], true);
add(smokeLeft);
var smokeRight:BGSprite = new BGSprite('smokeRight', 1100, -100, 0.4, 0.4, ['SmokeRight'], true);
add(smokeRight);
// tankGround. // tankGround.
tankWatchtower = new BGSprite('tankWatchtower', 100, 50, 0.5, 0.5, ['watchtower gradient color']); tankWatchtower = new BGSprite('tankWatchtower', 100, 50, 0.5, 0.5, ['watchtower gradient color']);
@ -991,7 +984,12 @@ class PlayState extends MusicBeatState
for (prop in parsed.propsBackground) for (prop in parsed.propsBackground)
{ {
var funnyProp:BGSprite = new BGSprite(prop.path, prop.x, prop.y, prop.scrollX, prop.scrollY); var funnyProp:BGSprite = new BGSprite(prop.path, prop.x, prop.y, prop.scrollX, prop.scrollY, null, false, false);
if (prop.animBullshit != null)
funnyProp.setupSparrow(prop.path, prop.animBullshit.anims, prop.animBullshit.isLooping);
else
funnyProp.justLoadImage(prop.path);
funnyProp.setGraphicSize(Std.int(funnyProp.width * prop.scaleX), Std.int(funnyProp.height * prop.scaleY)); funnyProp.setGraphicSize(Std.int(funnyProp.width * prop.scaleX), Std.int(funnyProp.height * prop.scaleY));
funnyProp.updateHitbox(); funnyProp.updateHitbox();
@ -3203,4 +3201,11 @@ typedef Props =
var path:String; var path:String;
var scaleX:Float; var scaleX:Float;
var scaleY:Float; var scaleY:Float;
var ?animBullshit:PropAnimData;
}
typedef PropAnimData =
{
var isLooping:Bool;
var anims:Array<String>;
} }