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

oh i broke some stuff

Browse Source
This commit is contained in:
lunarcleint
2023-08-04 17:50:15 -07:00
parent d03146c24d
commit df536041e2
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterEditor.hx
+10 -9
View File
@@ -238,7 +238,7 @@ class CharacterEditor extends UIState {
characterPropertiresWindow = new CharacterPropertiesWindow();
uiGroup.add(characterPropertiresWindow);
characterAnimsWindow = new UIButtonList<CharacterAnimButtons>(777, 209, 473, 488, "Character Animations", FlxPoint.get(429, 32), FlxPoint.get(0, 16));
characterAnimsWindow = new UIButtonList<CharacterAnimButtons>(777, 209, 473, 488, "Character Animations", FlxPoint.get(429, 32));
characterAnimsWindow.addButton.callback =
function() CharacterEditor.instance.createAnimWithUI();
for (i=>anim in character.getNameList())
@@ -532,12 +532,9 @@ class CharacterEditor extends UIState {
public function playAnimation(anim:String) {
character.playAnim(anim, true);
for(i in characterAnimsWindow.buttons.members) {
if(i is CharacterAnimButtons) {
var i:CharacterAnimButtons = cast i;
i.alpha = i.anim == anim ? 1 : 0.25;
}
}
for(i in characterAnimsWindow.buttons.members)
i.alpha = i.anim == anim ? 1 : 0.25;
}
function _offsets_left(_) {
@@ -580,7 +577,9 @@ class CharacterEditor extends UIState {
if (character.getNameList().length == 0) return;
character.animOffsets.set(anim, character.getAnimOffset(anim) + change);
for (i in characterAnimsWindow.members) if (cast(i, CharacterAnimButtons).anim == anim) cast(i ,CharacterAnimButtons).updateInfo(anim, character.getAnimOffset(anim), ghosts.animGhosts[anim].visible);
for (i in characterAnimsWindow.buttons.members)
if (i.anim == anim)
i.updateInfo(anim, character.getAnimOffset(anim), ghosts.animGhosts[anim].visible);
character.frameOffset.set(character.getAnimOffset(anim).x, character.getAnimOffset(anim).y);
ghosts.updateOffsets(anim, change);
@@ -598,7 +597,9 @@ class CharacterEditor extends UIState {
];
for (anim in character.getNameList()) {
character.animOffsets[anim].zero();
for (i in characterAnimsWindow.members) if (cast(i, CharacterAnimButtons).anim == anim) cast(i ,CharacterAnimButtons).updateInfo(anim, character.getAnimOffset(anim), ghosts.animGhosts[anim].visible);
for (i in characterAnimsWindow.buttons.members)
if (i.anim == anim)
i.updateInfo(anim, character.getAnimOffset(anim), ghosts.animGhosts[anim].visible);
}
ghosts.clearOffsets();
source/funkin/editors/ui/UIButtonList.hx
+3 -3
View File
@@ -35,7 +35,7 @@ class UIButtonList<T:UIButton> extends UIWindow {
FlxG.cameras.add(buttonCameras, false);
buttonCameras.bgColor = 0;
addButton = new UIButton(25, 16, "", null, Std.int(buttonSize.x));
addButton = new UIButton(25, 16, "", null, Std.int(this.buttonSize.x));
addButton.color = 0xFF00FF00;
addButton.cameras = [buttonCameras];
@@ -80,8 +80,8 @@ class UIButtonList<T:UIButton> extends UIWindow {
if (addButton != null)
addButton.setPosition(
(bWidth/2) - (buttonSize.x/2),
CoolUtil.fpsLerp(addButton.y, (buttonSize.y+buttonSpacing) * buttons.members.length, 0.25));
(bWidth/2) - (buttonSize.x/2) + buttonOffset.x,
CoolUtil.fpsLerp(addButton.y, ((buttonSize.y+buttonSpacing) * buttons.members.length) + buttonOffset.y, 0.25));
if (curMoving != null) {
curMovingInterval += FlxG.mouse.deltaY;