fix soundTray layering

MaybeMaru · Dec 12, 2023 · dd62d6b · dd62d6b
1 parent 437cb27
commit dd62d6b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/source/FlxFunkGame.hx b/source/FlxFunkGame.hx
@@ -20,6 +20,7 @@ class FlxFunkGame extends FlxGame {
         super.create(_);
 
         addChild(Main.transition = transition = new Transition());
+        removeChild(soundTray); addChild(soundTray); // Correct layering
         addChild(Main.console = console = new ScriptConsole());
 
         #if !mobile
@@ -66,7 +67,7 @@ class FlxFunkSoundTray extends FlxSoundTray {
     }
 
     override function update(elapsed:Float) {
-        super.update(elapsed * 4);
+        super.update(elapsed * 4); // hack, sound tray is slow as fuck
     }
 
     override function show(up:Bool = false) {

diff --git a/source/funkin/objects/Character.hx b/source/funkin/objects/Character.hx
@@ -13,7 +13,7 @@ typedef CharacterJson = {
 } & SpriteJson;
 
 class Character extends FlxSpriteExt {
-	public static var DEFAULT_CHARACTER:CharacterJson = {
+	public static final DEFAULT_CHARACTER:CharacterJson = {
 		anims: [],
 		imagePath: "week1/BOYFRIEND",
 		icon: 'bf',

diff --git a/source/funkin/objects/note/Note.hx b/source/funkin/objects/note/Note.hx
@@ -28,19 +28,17 @@ class Note extends FlxSpriteExt implements INoteData {
     var refSprite:FlxSpriteExt;
 
     public function createGraphic(init:Bool = true) {
-        if (isSustainNote) {
-            if (init) { // Offset sustain
-                final _off = getPosMill(NoteUtil.swagHeight * 0.5, NotesGroup.songSpeed);
-                initSusLength += _off - (NoteUtil.swagHeight * 0.5 / NotesGroup.songSpeed);
-            }
-        } else {
+        if (!isSustainNote) {
             loadFromSprite(refSprite);
             updateAnims();
         }
 
         setScale(skinJson.scale, true);
         antialiasing = skinJson.antialiasing ? Preferences.getPref('antialiasing') : false;
 
+        if (init && isSustainNote) // Offset sustain half a strum height
+            initSusLength += FlxMath.remapToRange(NoteUtil.swagHeight * 0.475, 0, getMillPos(1, NotesGroup.songSpeed) / scale.y, 0, 1);
+
         if (!isSustainNote) {
             final _anim = 'scroll' + CoolUtil.directionArray[noteData];
             if (animOffsets.exists(_anim)) {

diff --git a/source/funkin/util/backend/UnZipper.hx b/source/funkin/util/backend/UnZipper.hx
@@ -11,6 +11,10 @@ import sys.io.File;
 */
 
 class UnZipper {
+    public static function unzipInPath(zipPath:String, destPath:String) {
+        unzipFiles(getZipEntries(zipPath), destPath);
+    }
+
     public static function getZipEntries(path:String) {
         var zipData = openZip(path);
 

diff --git a/source/funkin/util/frontend/ModchartManager.hx b/source/funkin/util/frontend/ModchartManager.hx
@@ -88,10 +88,10 @@ class ModchartManager extends EventHandler {
 
         if (sineStrums.length > 0 || cosineStrums.length > 0) {
             for (i in sineStrums)
-                i.y = (i._dynamic?.startY ?? 0) + (Math.sin(timeElapsed + (i._dynamic?.sineOff ?? 0)) * (i._dynamic?.sineSize ?? 50.0));
+                i.y = (i._dynamic?.startY ?? 0) + (FlxMath.fastSin(timeElapsed + (i._dynamic?.sineOff ?? 0)) * (i._dynamic?.sineSize ?? 50.0));
 
             for (i in cosineStrums)
-                i.x = (i._dynamic?.startX ?? 0) + (Math.cos(timeElapsed + (i._dynamic?.cosineOff ?? 0)) * (i._dynamic?.cosineSize ?? 50.0));
+                i.x = (i._dynamic?.startX ?? 0) + (FlxMath.fastCos(timeElapsed + (i._dynamic?.cosineOff ?? 0)) * (i._dynamic?.cosineSize ?? 50.0));
         }
     }
 }