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

add back in keyboard offsets + clean up

Browse Source
This commit is contained in:
lunarcleint
2024-07-21 22:34:01 -07:00
parent e50bf77008
commit 1547fcece8
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterAnimButton.hx
-4
View File
@@ -272,10 +272,6 @@ class CharacterAnimButton extends UIButton {
if (newOffsetX != null && newOffsetY != null && newOffsetX == animData.x && newOffsetY == animData.y)
return;
else {
if (newOffsetX != null && newOffsetX == animData.x) return;
if (newOffsetY != null && newOffsetY == animData.y) return;
}
if (newOffsetX != null) animData.x = newOffsetX;
if (newOffsetY != null) animData.y = newOffsetY;
source/funkin/editors/character/CharacterEditor.hx
+17 -19
View File
@@ -378,10 +378,8 @@ class CharacterEditor extends UIState {
if (FlxG.mouse.justReleased) {
draggingOffset.x /= character.scale.x;
draggingOffset.y /= character.scale.y;
characterAnimsWindow.animButtons.get(character.getAnimName()).changeOffset(
FlxMath.roundDecimal(character.animOffsets[character.getAnimName()].x - (draggingOffset.x * (character.isPlayer != character.playerOffsets ? -1 : 1)), 2),
FlxMath.roundDecimal(character.animOffsets[character.getAnimName()].y - (draggingOffset.y), 2)
);
_change_offset((draggingOffset.x * (character.isPlayer != character.playerOffsets ? -1 : 1)), draggingOffset.y);
draggingOffset.set(0, 0); draggingCharacter = false;
character.extraOffset = draggingOffset;
@@ -433,24 +431,24 @@ class CharacterEditor extends UIState {
function _edit_undo(_) {}
function _edit_redo(_) {}
function _offsets_left(_) {}
function _offsets_up(_) {}
function _offsets_down(_) {}
function _offsets_right(_) {}
function _offsets_extra_left(_) {}
function _offsets_extra_up(_) {}
function _offsets_extra_down(_) {}
function _offsets_extra_right(_) {}
function _offsets_left(_) _change_offset(-1, 0);
function _offsets_up(_) _change_offset(0, -1);
function _offsets_down(_) _change_offset(0, 1);
function _offsets_right(_) _change_offset(1, 0);
function _offsets_extra_left(_) _change_offset(-5, 0);
function _offsets_extra_up(_) _change_offset(0, -5);
function _offsets_extra_down(_) _change_offset(0, 5);
function _offsets_extra_right(_) _change_offset(5, 0);
function _offsets_clear(_) {}
function _change_offset(x:Float, y:Float) {
characterAnimsWindow.animButtons.get(character.getAnimName()).changeOffset(
FlxMath.roundDecimal(character.animOffsets[character.getAnimName()].x - x, 2),
FlxMath.roundDecimal(character.animOffsets[character.getAnimName()].y - y, 2)
);
}
function buildStagesUI() {
var stageTopButton:UITopMenuButton = topMenuSpr == null ? null : cast topMenuSpr.members[stageIndex];
var newChilds:Array<UIContextMenuOption> = [];