more works on the style dialog

KoloInDaCrib · Nov 17, 2024 · be131cf · be131cf
1 parent 7fc51a0
commit be131cf
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 2 deletions.
diff --git a/source/funkin/ui/debug/char/components/dialogs/FreeplayStyleDialog.hx b/source/funkin/ui/debug/char/components/dialogs/FreeplayStyleDialog.hx
@@ -3,6 +3,8 @@ package funkin.ui.debug.char.components.dialogs;
 import funkin.data.freeplay.style.FreeplayStyleRegistry;
 import funkin.data.freeplay.player.PlayerRegistry;
 import haxe.ui.components.OptionBox;
+import flixel.graphics.frames.FlxAtlasFrames;
+import openfl.display.BitmapData;
 
 @:access(funkin.ui.debug.char.pages.CharCreatorFreeplayPage)
 @:xml('
@@ -11,16 +13,46 @@ import haxe.ui.components.OptionBox;
   <vbox width="100%" height="100%">
     <hbox width="100%" height="100%">
 
-      <vbox width="50%" height="100%">
+      <vbox width="65%" height="100%">
         <optionbox id="optionMakeNew" text="Use Custom" group="freepStypeGroup" selected="true"/>
         <scrollview width="100%" height="100%" contentWidth="100%">
             <vbox id="freeplayStyleNew" width="100%">
 
+              <section-header text="Asset Paths"/>
+              <hbox width="100%">
+                <textfield id="fieldBGAsset" placeholder="Background Asset Path" width="75%"/>
+                <button id="buttonBGAsset" text="Load" width="25%"/>
+              </hbox>
+              <hbox width="100%">
+                <textfield id="fieldArrow" placeholder="Arrows Asset Path" width="75%"/>
+                <button id="buttonArrow" text="Load" width="25%"/>
+              </hbox>
+              <hbox width="100%">
+                <textfield id="fieldNumbers" placeholder="Numbers Asset Path" width="75%"/>
+                <button id="buttonNumbers" text="Load" width="25%"/>
+              </hbox>
+              <hbox width="100%">
+                <textfield id="fieldCapsule" placeholder="Capsule Asset Path" width="75%"/>
+                <button id="buttonCapsule" text="Load" width="25%"/>
+              </hbox>
+
+               <section-header text="Capsule Colors"/>
+               <hbox width="100%">
+                  <label text="Select" width="35%" />
+                  <color-picker-popup id="selectPicker" width="65%"/>
+               </hbox>
+               <hbox width="100%">
+                  <label text="Deselect" width="35%" />
+                  <color-picker-popup id="deselectPicker" width="65%"/>
+               </hbox>
+
+                <section-header text="Start Delay"/>
+                <number-stepper id="delayStepper" pos="0" min="0"/>
             </vbox>
         </scrollview>
       </vbox>
 
-      <vbox width="50%" height="100%">
+      <vbox width="35%" height="100%">
         <optionbox id="optionUsePreset" text="Use Preset" group="freepStypeGroup"/>
         <scrollview width="100%" height="75%" contentWidth="100%">
             <vbox id="freeplayStylePresets" width="100%" disabled="true"/>
@@ -62,6 +94,9 @@ class FreeplayStyleDialog extends DefaultPageDialog
       freeplayStylePresets.disabled = optionMakeNew.selected;
     }
 
+    optionUsePreset.selected = (daPlayuh != null);
+    optionMakeNew.selected = (daPlayuh == null);
+
     buttonApplyStyle.onClick = function(_) {
       if (optionUsePreset.selected)
       {
@@ -77,6 +112,41 @@ class FreeplayStyleDialog extends DefaultPageDialog
 
         daPage.randomCapsule.applyStyle(daStyle);
       }
+      else if (optionMakeNew.selected)
+      {
+        var dadBitmap = BitmapData.fromBytes(CharCreatorUtil.gimmeTheBytes(fieldBGAsset.text));
+        var arrowBitmap = BitmapData.fromBytes(CharCreatorUtil.gimmeTheBytes(fieldArrow.text));
+        var capsuleBitmap = BitmapData.fromBytes(CharCreatorUtil.gimmeTheBytes(fieldCapsule.text));
+
+        var arrowXML = CharCreatorUtil.gimmeTheBytes(fieldArrow.text.replace(".png", ".xml"))?.toString() ?? "";
+        var capsuleXML = CharCreatorUtil.gimmeTheBytes(fieldCapsule.text.replace(".png", ".xml"))?.toString() ?? "";
+
+        daPage.bgDad.loadGraphic(dadBitmap != null ? dadBitmap : Paths.image('freeplay/freeplayBGdad'));
+
+        daPage.arrowLeft.frames = daPage.arrowRight.frames = (arrowBitmap != null && arrowXML != "") ? FlxAtlasFrames.fromSparrow(arrowBitmap,
+          arrowXML) : Paths.getSparrowAtlas('freeplay/freeplaySelector');
+
+        daPage.arrowLeft.animation.addByPrefix('shine', 'arrow pointer loop', 24);
+        daPage.arrowRight.animation.addByPrefix('shine', 'arrow pointer loop', 24);
+        daPage.arrowLeft.animation.play('shine');
+        daPage.arrowRight.animation.play('shine');
+
+        // overcomplicating capsule stuff
+        daPage.randomCapsule.capsule.frames = (capsuleBitmap != null && capsuleXML != "") ? FlxAtlasFrames.fromSparrow(capsuleBitmap,
+          capsuleXML) : Paths.getSparrowAtlas('freeplay/freeplayCapsule/capsule/freeplayCapsule');
+        daPage.randomCapsule.capsule.animation.addByPrefix('selected', 'mp3 capsule w backing0', 24);
+        daPage.randomCapsule.capsule.animation.addByPrefix('unselected', 'mp3 capsule w backing NOT SELECTED', 24);
+
+        @:privateAccess
+        {
+          trace(selectPicker.selectedItem);
+          daPage.randomCapsule.songText.glowColor = daPage.randomCapsule.songText.blurredText.color = flixel.util.FlxColor.fromRGB(selectPicker.selectedItem?.r ?? 0,
+            selectPicker.selectedItem?.g ?? 0, selectPicker.selectedItem?.b ?? 0);
+          daPage.randomCapsule.songText.whiteText.textField.filters = [
+            new openfl.filters.GlowFilter(daPage.randomCapsule.songText.glowColor, 1, 5, 5, 210, openfl.filters.BitmapFilterQuality.MEDIUM),
+          ];
+        }
+      }
     }
   }
 }
diff --git a/source/funkin/ui/debug/char/util/CharCreatorUtil.hx b/source/funkin/ui/debug/char/util/CharCreatorUtil.hx
@@ -23,6 +23,7 @@ class CharCreatorUtil
   public static function gimmeTheBytes(path:String):haxe.io.Bytes
   {
     if (openfl.Assets.exists(path)) return openfl.Assets.getBytes(path);
+    if (!funkin.util.FileUtil.doesFileExist(path)) return null;
     return funkin.util.FileUtil.readBytesFromPath(path);
   }