gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

daaaaa

Browse Source
This commit is contained in:
lunarcleint
2023-07-09 20:56:53 -07:00
parent 48a1f5bf77
commit 5c6a4ff57d
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterAnimScreen.hx
+5 -10
View File
@@ -2,22 +2,19 @@ package funkin.editors.character;
import flixel.math.FlxPoint;
import flixel.animation.FlxAnimation;
import funkin.backend.utils.XMLUtil.AnimData;
class CharacterAnimScreen extends UISubstateWindow {
public var animName:Null<String>;
public var offset:FlxPoint;
public var flxanim:FlxAnimation;
public var animData:AnimData;
public var saveButton:UIButton;
public var closeButton:UIButton;
private var onSave:(animName:Null<String>, offset:FlxPoint, flxanim:FlxAnimation) -> Void = null;
private var onSave:(animData:AnimData) -> Void = null;
public function new(animName:Null<String>, ?offset:FlxPoint, ?flxanim:FlxAnimation, ?onSave:(animName:Null<String>, offset:FlxPoint, flxanim:FlxAnimation) -> Void) {
public function new(animName:Null<String>, animData:AnimData) {
this.animName = animName;
this.offset = offset;
this.flxanim = flxanim;
this.onSave = onSave;
super();
}
@@ -26,8 +23,6 @@ class CharacterAnimScreen extends UISubstateWindow {
if (creatingAnim) {
animName = "";
offset = FlxPoint.get(0,0);
flxanim = new FlxAnimation(CharacterEditor.instance.character.animation, animName, []);
}
winTitle = creatingAnim ? 'Creating Animation' : 'Animation $animName properties';
@@ -48,7 +43,7 @@ class CharacterAnimScreen extends UISubstateWindow {
add(saveButton);
closeButton = new UIButton(saveButton.x - 20, saveButton.y, creatingAnim ? "Cancel" : "Close", function() {
if (creatingAnim) onSave(null, null, null);
if (creatingAnim) onSave(null);
close();
}, 125);
add(closeButton);
source/funkin/editors/character/CharacterEditor.hx
+2 -2
View File
@@ -338,7 +338,7 @@ class CharacterEditor extends UIState {
}
function _char_add_anim(_) {
FlxG.state.openSubState(new CharacterAnimScreen(null));
FlxG.state.openSubState(new CharacterAnimScreen(null, null));
}
function _char_update_anim(_) {
@@ -362,7 +362,7 @@ class CharacterEditor extends UIState {
}
public function deleteAnim(name:String, addtoUndo:Bool = true) {
playAnimation(character.animation.getNameList()[character.animation.getNameList().indexOf(name)-1]);
playAnimation(character.animation.getNameList()[Std.int(Math.abs(character.animation.getNameList().indexOf(name)-1))]);
@:privateAccess var flxanim:FlxAnimation = character.animation._animations.get(name);
var oldID:Int = character.animation.getNameList().indexOf(name);