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

gfhxtf

Browse Source
This commit is contained in:
Frakits
2024-07-22 18:33:57 +03:00
parent 79ff4f8636
commit 6d889a4f59
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterAnimButton.hx
+3 -4
View File
@@ -69,7 +69,7 @@ class CharacterAnimButton extends UIButton {
members.push(animationDisplayBG);
foldableButtons.push(animationDisplayBG);
nameTextBox = new UITextBox(animationDisplayBG.x+126+16, animationDisplayBG.y, animData.name, 116, 22, false, true);
nameTextBox = new UITextBox(animationDisplayBG.x+126+16, animationDisplayBG.y, animData.name, 104, 22, false, true);
nameTextBox.onChange = (newName:String) -> {this.changeName(newName);};
members.push(nameTextBox);
foldableButtons.push(nameTextBox);
@@ -114,7 +114,6 @@ class CharacterAnimButton extends UIButton {
loopedCheckbox.onChecked = (newLooping:Bool) -> {this.changeLooping(newLooping);};
members.push(loopedCheckbox);
foldableButtons.push(loopedCheckbox);
addLabelOn(loopedCheckbox, "Looped", 12);
loopedCheckbox.x += 8; loopedCheckbox.y += 6;
@@ -193,8 +192,8 @@ class CharacterAnimButton extends UIButton {
positionYStepper.follow(this, 218, 118);
XYComma.follow(positionXStepper, 64-24, 6);
fpsStepper.follow(this, 280, 118);
loopedCheckbox.follow(this, 336, 124);
fpsStepper.follow(this, 290, 118);
loopedCheckbox.follow(this, 336, 122);
indicesTextBox.follow(this, 158, 164);
source/funkin/editors/character/CharacterEditor.hx
+2 -2
View File
@@ -264,7 +264,7 @@ class CharacterEditor extends UIState {
uiGroup.cameras = [uiCamera];
add(cameraHoverDummy = new CameraHoverDummy(uiGroup, FlxPoint.weak(0, 0)));
characterPropertiesWindow = new CharacterPropertiesWindow((FlxG.width-(532)), 23+12+10, character);
characterPropertiesWindow = new CharacterPropertiesWindow((FlxG.width-(456)), 23+12+10, character);
uiGroup.add(characterPropertiesWindow);
topMenuSpr = new UITopMenu(topMenu);
@@ -279,7 +279,7 @@ class CharacterEditor extends UIState {
animationText = new UIText(0, 0, 0, "");
uiGroup.add(animationText);
characterAnimsWindow = new CharacterAnimsWindow(characterPropertiesWindow.x, characterPropertiesWindow.y+224+16, character);
characterAnimsWindow = new CharacterAnimsWindow(characterPropertiesWindow.x - 44, characterPropertiesWindow.y+224+16, character);
uiGroup.add(characterAnimsWindow);
add(uiGroup);
source/funkin/editors/character/CharacterPropertiesWindow.hx
+8 -12
View File
@@ -17,7 +17,7 @@ class CharacterPropertiesWindow extends UISliceSprite {
public var designedAsDropDown:UIDropDown;
public function new(x:Float, y:Float, character:Character) @:privateAccess {
super(x, y, Std.int(500-16), 204+20, "editors/ui/inputbox");
super(x, y, 440, 204+20, "editors/ui/inputbox");
function addLabelOn(ui:UISprite, text:String)
members.push(new UIText(ui.x, ui.y - 24, 0, text));
@@ -39,7 +39,7 @@ class CharacterPropertiesWindow extends UISliceSprite {
};
members.push(positionYStepper);
scaleStepper = new UINumericStepper(positionYStepper.x+104-32+32, positionYStepper.y, character.scale.x, 0.001, 2, 0, null, 104);
scaleStepper = new UINumericStepper(positionYStepper.x+104+32, positionYStepper.y, character.scale.x, 0.001, 2, 0, null, 104);
scaleStepper.onChange = (text:String) -> {
@:privateAccess scaleStepper.__onChange(text);
this.changeScale(scaleStepper.value);
@@ -47,10 +47,9 @@ class CharacterPropertiesWindow extends UISliceSprite {
members.push(scaleStepper);
addLabelOn(scaleStepper, "Scale");
flipXCheckbox = new UICheckbox(scaleStepper.x+104-32+24, scaleStepper.y, "Flipped?", character.isPlayer ? !character.__baseFlipped : character.__baseFlipped);
flipXCheckbox = new UICheckbox(scaleStepper.x, scaleStepper.y+32+14, "Flipped?", character.isPlayer ? !character.__baseFlipped : character.__baseFlipped);
flipXCheckbox.onChecked = (checked:Bool) -> {this.changeFlipX(checked);};
members.push(flipXCheckbox);
addLabelOn(flipXCheckbox, "Flipped X");
cameraXStepper = new UINumericStepper(positionXStepper.x, positionXStepper.y+32+32+4, character.cameraOffset.x, 0.001, 2, null, null, 104);
cameraXStepper.onChange = (text:String) -> {
@@ -69,31 +68,28 @@ class CharacterPropertiesWindow extends UISliceSprite {
};
members.push(cameraYStepper);
antialiasingCheckbox = new UICheckbox(cameraYStepper.x+104-32+32+24, cameraYStepper.y, "Antialiased?", character.antialiasing);
antialiasingCheckbox = new UICheckbox(scaleStepper.x, flipXCheckbox.y+32, "Antialiased?", character.antialiasing);
antialiasingCheckbox.onChecked = (checked:Bool) -> {this.changeAntialiasing(checked);};
members.push(antialiasingCheckbox);
addLabelOn(antialiasingCheckbox, "Antialiasing");
testAsDropDown = new UIDropDown(cameraXStepper.x, cameraXStepper.y+32+32+4, 238, 32, ["BOYFRIEND", "DAD"], character.playerOffsets ? 0 : 1);
testAsDropDown = new UIDropDown(cameraXStepper.x, cameraXStepper.y+32+32+4, 170, 32, ["BOYFRIEND", "DAD"], character.playerOffsets ? 0 : 1);
testAsDropDown.onChange = (index:Int) -> {
CharacterEditor.instance.changeStagePosition(testAsDropDown.options[index]);
};
members.push(testAsDropDown);
addLabelOn(testAsDropDown, "Test Character As...");
testAsDropDown.bWidth = 170; //REFUSES TO FUCKING SET TO 170 PIECE OF SHIT!!
designedAsDropDown = new UIDropDown(testAsDropDown.x+238, testAsDropDown.y, 238, 32, ["BOYFRIEND", "DAD"], character.playerOffsets ? 0 : 1);
designedAsDropDown = new UIDropDown(scaleStepper.x, testAsDropDown.y, 170, 32, ["BOYFRIEND", "DAD"], character.playerOffsets ? 0 : 1);
designedAsDropDown.onChange = (index:Int) -> {
CharacterEditor.instance.changeCharacterDesginedAs(designedAsDropDown.options[index] == "BOYFRIEND");
};
members.push(designedAsDropDown);
addLabelOn(designedAsDropDown, "Char Desgined As...");
designedAsDropDown.bWidth = 170;
alpha = 0.7;
antialiasingCheckbox.x+=14;
for (checkbox in [flipXCheckbox, antialiasingCheckbox])
{checkbox.y += 3; checkbox.x += 12;}
this.character = character;
}