Skip to content

[WIP] [REFACTOR] Recode Stage Editor State #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

[WIP] [REFACTOR] Recode Stage Editor State #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9128060
starting...
anysad Oct 3, 2025
71bf578
more starting
anysad Oct 4, 2025
e784d82
ids, renames and more stuff
anysad Oct 7, 2025
e27015b
Update menubar.xml
anysad Oct 8, 2025
088dcf8
Create glowPulse.frag
anysad Oct 10, 2025
8b53849
The Great Return
anysad Oct 21, 2025
2fe1d09
Dialogs & Toolboxes
anysad Oct 23, 2025
5246e33
Update stage-settings.xml
anysad Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions exclude/data/ui/stage-editor/components/bottom-bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@
<label id="bottomBarAngleStepText" text="15" styleName="infoText" verticalAlign="center" tooltip="Angle Step Level\nLeft Click to Increase\nRight Click to Decrease"/>
</hbox>

<hbox horizontalAlign="center">
</hbox>

<hbox horizontalAlign="right">
</hbox>
<spacer width="100%" />
</box>
25 changes: 14 additions & 11 deletions .../data/ui/stage-editor/components/menu.xml → ...ta/ui/stage-editor/components/menubar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,38 @@
<menu-separator />
<menu-item id="menubarItemClearAssets" text="Clear Assets" style="color: indianred" />
<menu-separator />
<menu-item id="menubarItemExit" text="Exit" shortcutText="Ctrl + Q" />
<menu-item id="menubarItemExit" text="Exit" shortcutText="Ctrl+Q" />
</menu>
<menu text="Edit" id="menubarMenuEdit">
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl + Z" />
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl + Y" />
<menu-separator />
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl + C" />
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl + X" />
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl + V" />
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl + Del" style="color: indianred" />
<menu-item id="menubarItemUndo" text="Undo" shortcutText="Ctrl+Z" />
<menu-item id="menubarItemRedo" text="Redo" shortcutText="Ctrl+Y" />
<menu-separator />
<menu-item id="menubarItemNewObj" text="New Object" />
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl + F" />
<menu-item id="menubarItemFindObj" text="Find Object" shortcutText="Ctrl+F" />
<menu-item id="menubarItemCopy" text="Copy Object" shortcutText="Ctrl+C" />
<menu-item id="menubarItemCut" text="Cut Object" shortcutText="Ctrl+X" />
<menu-item id="menubarItemPaste" text="Paste Object" shortcutText="Ctrl+V" />
<menu-item id="menubarItemFlipX" text="Flip Horizontally" shortcutText="Ctrl+H" />
<menu-item id="menubarItemFlipY" text="Flip Vertically" shortcutText="Ctrl+G" />
<menu-separator />
<menu-item id="menubarItemDelete" text="Delete Object" shortcutText="Ctrl+Del" style="color: indianred" />
<menu-separator />
</menu>
<menu text="View" id="menubarMenuView">
<menu text="Theme">
<menu-option-box id="menubarItemThemeLight" text="Light" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Light Mode." />
<menu-option-box id="menubarItemThemeDark" text="Dark" group="menubarItemThemeGroup" tooltip="Change the Background's Color Scheme to Dark Mode." />
</menu>
<menu-separator />
<menu-checkbox id="menubarItemViewChars" text="View Characters" selected="true" tooltip="Show Characters." />
<menu-checkbox id="menubarItemViewCharacters" text="View Characters" selected="true" tooltip="Show Characters." />
<menu-checkbox id="menubarItemViewNameText" text="View Name Text" selected="true" tooltip="Show the Text above Cursor with the Name of an Asset directly below Cursor." />
<menu-checkbox id="menubarItemViewFloorLines" text="View Floor Lines" tooltip="Show Lines that indicate the Floor of Characters." />
<menu-checkbox id="menubarItemViewPosMarkers" text="View Position Markers" tooltip="Show Circles that show the Feet Position of Characters." />
<menu-checkbox id="menubarItemViewCamBounds" text="View Camera Bounds" tooltip="Show Rectangles representing the Camera View upon being focused on a Character." />
</menu>
<menu text="Windows" id="menubarMenuWindow">
<menu-checkbox id="menubarItemWindowObjectGraphic" text="Object Graphic" />
<menu-checkbox id="menubarItemWindowObjectAnims" text="Object Animations" />
<menu-checkbox id="menubarItemWindowObjectAnimations" text="Object Animations" />
<menu-checkbox id="menubarItemWindowObjectProps" text="Object Properties" />
<menu-checkbox id="menubarItemWindowCharacter" text="Character Properties" />
<menu-checkbox id="menubarItemWindowStage" text="Stage Data Settings" />
Expand Down
1 change: 1 addition & 0 deletions exclude/data/ui/stage-editor/dialogs/about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<label text="Friday Night Funkin'" horizontalAlign="center" />
<label text="Stage Editor v1" horizontalAlign="center" />
<label text="Built by KoloInDaCrib" horizontalAlign="center" />
<label text="Additional cleanup by anysad" horizontalAlign="center"/>
<label text="HaxeUI by Ian Harrigan" horizontalAlign="center" />
</vbox>
</dialog>
2 changes: 1 addition & 1 deletion exclude/data/ui/stage-editor/dialogs/load-url.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<dialog width="300" title="Load from URL">
<grid width="100%">
<label text="URL:" verticalAlign="center"/>
<textfield id="urlField" width="100%"/>
<textfield id="inputURL" width="100%"/>
</grid>
</dialog>
2 changes: 1 addition & 1 deletion exclude/data/ui/stage-editor/dialogs/new-object.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<dialog width="300" title="New Object">
<grid width="100%">
<label text="Name:" verticalAlign="center"/>
<textfield id="field" width="100%"/>
<textfield id="inputField" width="100%"/>
</grid>
</dialog>
80 changes: 40 additions & 40 deletions exclude/data/ui/stage-editor/dialogs/user-guide.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<dialog width="500" height="600" title="Help">
<tabview width="100%" height="100%">
<box width="100%" text="Basics">
<label text="No Help yet...." />
</box>
<box width="100%" text="Hotkeys">
<tableview width="100%" height="510" contentWidth="100%">
<header width="100%">
<column id="action" text="Action" width="50%" />
<column id="keybind" text="Keybind" width="50%" />
</header>
<data>
<item action="Show User Guide" keybind="F1" />
<item action="Move Camera" keybind="W/A/S/D"/>
<item action="Zoom In/Out" keybind="Mouse Wheel"/>
<item action="Reset Camera" keybind="T"/>
<item action="Select Object/Character" keybind="Left Click"/>
<item action="Move Selected (Mouse)" keybind="Left Click + Drag Mouse"/>
<item action="Move Selected (Keys)" keybind="Up/Down/Left/Right"/>
<item action="Move Selected (Free)" keybind="Up/Down/Left/Right + Shift"/>
<item action="Switch Mode" keybind="Tab"/>
<item action="Lock Focus" keybind="Shift"/>
<item action="Undo Last" keybind="Ctrl + Z"/>
<item action="Redo Last" keybind="Ctrl + Y"/>
<item action="Copy Object" keybind="Ctrl + C"/>
<item action="Cut Object" keybind="Ctrl + X"/>
<item action="Paste Object" keybind="Ctrl + V"/>
<item action="Delete Object" keybind="Del"/>
<item action="Find Object" keybind="Ctrl + F"/>
<item action="Rotate Object" keybind="R + Left/Right"/>
<item action="Test Stage (In Editor)" keybind="Enter"/>
<item action="Save Stage" keybind="Ctrl + S"/>
<item action="Save Stage As" keybind="Ctrl + Shift + S"/>
<item action="Open Stage" keybind="Ctrl + O"/>
<item action="Exit" keybind="Esc"/>
</data>
</tableview>
</box>
<box width="100%" text="Even More Details">
<label text="No Details yet...." />
<tabview width="100%" height="100%">
<box width="100%" text="Basics">
<label text="No Help yet...." />
</box>
</tabview>
<box width="100%" text="Hotkeys">
<tableview width="100%" height="490" contentWidth="100%">
<header width="100%">
<column id="action" text="Action" width="50%" />
<column id="keybind" text="Keybind" width="50%" />
</header>
<data>
<item action="Show User Guide" keybind="F1" />
<item action="Move Camera" keybind="W/A/S/D/Middle Click" />
<item action="Zoom In/Out" keybind="Mouse Wheel" />
<item action="Reset Camera" keybind="T" />
<item action="Select Object/Character" keybind="Left Click" />
<item action="Move Selected (Mouse)" keybind="Left Click + Drag Mouse" />
<item action="Move Selected (Keys)" keybind="Up/Down/Left/Right" />
<item action="Move Selected (Free)" keybind="Up/Down/Left/Right + Shift" />
<item action="Switch Mode" keybind="Tab" />
<item action="Lock Focus" keybind="Shift" />
<item action="Undo Last" keybind="Ctrl + Z" />
<item action="Redo Last" keybind="Ctrl + Y" />
<item action="Copy Object" keybind="Ctrl + C" />
<item action="Cut Object" keybind="Ctrl + X" />
<item action="Paste Object" keybind="Ctrl + V" />
<item action="Delete Object" keybind="Del" />
<item action="Find Object" keybind="Ctrl + F" />
<item action="Rotate Object" keybind="R + Left/Right" />
<item action="Test Stage (In Editor)" keybind="Enter" />
<item action="Save Stage" keybind="Ctrl + S" />
<item action="Save Stage As" keybind="Ctrl + Shift + S" />
<item action="Open Stage" keybind="Ctrl + O" />
<item action="Exit" keybind="Esc" />
</data>
</tableview>
</box>
<box width="100%" text="Even More Details">
<label text="No Details yet...." />
</box>
</tabview>
</dialog>
14 changes: 3 additions & 11 deletions exclude/data/ui/stage-editor/dialogs/welcome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,13 @@
<vbox width="25%" height="100%">
<card width="100%" height="50%" text="Open Recent">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentRecent" width="100%" />
<vbox id="splashRecentContainer" width="100%" />
</scrollview>
</card>
<!--<card width="100%" height="50%" text="Import Chart">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentImport" width="100%">
<link id="splashImportStageLegacy" text="FNF Legacy"/>
<link id="splashImportStagePsych" text="Psych Engine" disabled="true"/>
</vbox>
</scrollview>
</card> -->
</vbox>
<card width="50%" height="500" text="Browse for Stage">
<vbox width="100%" height="100%">
<box id="boxDrag" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
<box id="stageBox" width="100%" height="85%" styleName="uploadBG" style="border: 2px dotted #DDDDDD; padding: 5px;">
<label text="Drag and drop a stage file (.fnfs) here, or click to browse." horizontalAlign="center" verticalAlign="center" textAlign="center" style="font-size: 18px" width="100%" />
</box>
<box width="100%" height="15%" style="spacing:0px;border:1px solid $normal-border-color;padding:1px;">
Expand All @@ -28,7 +20,7 @@
</card>
<card width="25%" height="500" text="Open from Presets">
<scrollview width="100%" height="100%" contentWidth="100%">
<vbox id="contentPresets" width="100%" />
<vbox id="splashTemplateContainer" width="100%" />
</scrollview>
</card>
</hbox>
Expand Down
2 changes: 1 addition & 1 deletion exclude/data/ui/stage-editor/main-view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<vbox width="100%" height="100%">
<import source="components/menu.xml" />
<import source="components/menubar.xml" />
<import source="components/style.xml" />
<spacer height="100%" />
<import source="components/bottom-bar.xml" />
Expand Down
53 changes: 28 additions & 25 deletions exclude/data/ui/stage-editor/toolboxes/character-properties.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<collapsible-dialog title="Character Properties" width="300" height="492">
<collapsible-dialog title="Character Properties" width="350" height="445">
<vbox width="100%" height="100%">
<frame text="Properties" width="100%" height="95%" horizontalAlign="center">
<frame text="Properties" width="100%" height="100%" horizontalAlign="center">
<vbox width="100%" height="100%">
<scrollview width="100%" height="100%" contentWidth="100%">
<grid columns="2" width="100%">
<label text="Position (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charPosX" step="5" pos="0" />
<label text="Position (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charPosY" step="5" pos="0" />
<label text="Z-Index" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charZIdx" />
<label text="Scale" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScale" step="0.05" pos="1" precision="2" min="0.05" />
<label text="Camera Offset (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charCamX" step="5" pos="0" />
<label text="Camera Offset (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charCamY" step="5" pos="0" />
<label text="Opacity" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charAlpha" pos="1" min="0" max="1" step="0.05" precision="2" />
<label text="Angle" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charAngle" pos="0" min="0" max="360" />
<label text="Scroll Factor (X)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScrollX" step="0.05" pos="1" precision="2" />
<label text="Scroll Factor (Y)" verticalAlign="center" horizontalAlign="center" />
<number-stepper id="charScrollY" step="0.05" pos="1" precision="2" />
<grid width="100%">
<label text="Position" verticalAlign="center" />
<hbox width="100%">
<number-stepper id="inputCharacterPositionX" step="5" pos="0" width="100%" />
<number-stepper id="inputCharacterPositionY" step="5" pos="0" width="100%" />
</hbox>
<label text="Scale" verticalAlign="center" />
<number-stepper id="inputCharacterScale" step="0.05" pos="1" precision="2" min="0.05" width="100%" />
<label text="Z-Index" verticalAlign="center" />
<number-stepper id="inputCharacterZIndex" width="100%" />
<label text="Camera Offsets " verticalAlign="center" />
<hbox width="100%">
<number-stepper id="inputCharacterCameraOffsetX" step="5" pos="0" width="100%" />
<number-stepper id="inputCharacterCameraOffsetY" step="5" pos="0" width="100%" />
</hbox>
<label text="Scroll Factor" verticalAlign="center" />
<hbox width="100%">
<number-stepper id="inputCharacterScrollX" step="0.05" pos="1" precision="2" width="100%" />
<number-stepper id="inputCharacterScrollY" step="0.05" pos="1" precision="2" width="100%" />
</hbox>
<label text="Opacity" verticalAlign="center" />
<number-stepper id="inputCharacterAlpha" pos="1" min="0" max="1" step="0.05" precision="2" width="100%" />
<label text="Angle" verticalAlign="center" />
<number-stepper id="inputCharacterAngle" pos="0" min="0" max="360" width="100%" />
</grid>
</scrollview>
</vbox>
</frame>
<section-header text="Test as Character" />
<button id="charType" width="70" height="70" padding="8" iconPosition="top" />
<section-header text="Test as Character" horizontalAlign="center" />
<button id="buttonCharacterSelection" width="70" height="70" padding="8" iconPosition="top" horizontalAlign="center" />
</vbox>
</collapsible-dialog>
28 changes: 14 additions & 14 deletions exclude/data/ui/stage-editor/toolboxes/object-anims.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,46 @@
<collapsible-dialog title="Object Animations" width="425" height="360">
<vbox width="100%" height="100%">
<hbox width="100%">
<dropdown id="objAnims" width="45%" text="Search Animation" searchable="true" searchPrompt="Search Animation">
<dropdown id="objectAnimations" width="45%" text="Search Animation" searchable="true" searchPrompt="Search Animation">
<data/> <!--fill with code-->
</dropdown>
<textfield id="objAnimName" width="55%" placeholder="Animation Name"/>
<textfield id="objectAnimationName" width="55%" placeholder="Animation Name"/>
</hbox>

<hbox width="100%">
<listview id="objFrameList" width="45%" height="100%">
<listview id="objectFrameList" width="45%" height="100%">
<item-renderer width="100%" allowHover="true">
<label id="name" horizontalAlign="left"/>
</item-renderer>
<data /> <!-- fill with code-->
</listview>

<vbox width="55%">
<textfield id="objAnimPrefix" placeholder="Frame Prefix" width="100%"/>
<textfield id="objAnimIndices" placeholder="Frame Indices (Optional)" width="100%"/>
<textfield id="objectAnimationPrefix" placeholder="Frame Prefix" width="100%"/>
<textfield id="objectAnimationIndices" placeholder="Frame Indices (Optional)" width="100%"/>
<grid width="100%" columns="2">
<label text="Loop" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimLooped" text="Enabled"/>
<checkbox id="objectAnimationLoop" text="Enabled"/>
<label text="Flip Horizontally" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimFlipX" text="Enabled"/>
<checkbox id="objectAnimationFlipX" text="Enabled"/>
<label text="Flip Vertically" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimFlipY" text="Enabled"/>
<checkbox id="objectAnimationFlipY" text="Enabled"/>
<label text="Plays on Init" verticalAlign="center" horizontalAlign="center"/>
<checkbox id="objAnimStart" text="Enabled"/>
<checkbox id="objectPlayAnimation" text="Enabled"/>
<label text="Framerate" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimFramerate" min="1" step="1" pos="24"/>
<number-stepper id="objectAnimationFramerate" min="1" step="1" pos="24"/>
<label text="Offset (X)" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimOffsetX" step="1" pos="0"/>
<number-stepper id="objectAnimationOffsetX" step="1" pos="0"/>
<label text="Offset (Y)" verticalAlign="center" horizontalAlign="center"/>
<number-stepper id="objAnimOffsetY" step="1" pos="0"/>
<number-stepper id="objectAnimationOffsetY" step="1" pos="0"/>
</grid>
</vbox>
</hbox>

<hbox width="100%">
<spacer width="100%" />
<button id="objAnimSave" text="Save"/>
<button id="objAnimDelete" text="Remove"/>
<button id="objectAnimationSave" text="Save"/>
<button id="objectAnimationRemove" text="Remove"/>
</hbox>
</vbox>
</collapsible-dialog>
1 change: 0 additions & 1 deletion exclude/data/ui/stage-editor/toolboxes/object-graphic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<button id="objLoad" text="Load Image"/>
<button id="objLoadNet" text="Load From Internet"/>
<button id="objReset" text="Reset Image"/>
<spacer height="100%"/>
<button id="objResetFrames" text="Reset Frames"/>
</vbox>
</hbox>
Expand Down
Loading