Merge remote-tracking branch 'origin/rewrite/master' into feature/play-state-note-polish

assets

@@ -1 +1 @@
-Subproject commit 9d305889f2e310afeddcda6a4be775eb630fb9ac
+Subproject commit 9b9baa6f2b38dc9bd3354b350084f548e1e16c0f

hmm.json

@@ -54,14 +54,14 @@
       "name": "haxeui-core",
       "type": "git",
       "dir": null,
-      "ref": "2561076c5abeee0a60f3a2a65a8ecb7832a6a62a",
+      "ref": "bb904f8b4b205755a310c23ff25219f9dcd62711",
       "url": "https://github.com/haxeui/haxeui-core"
     },
     {
       "name": "haxeui-flixel",
       "type": "git",
       "dir": null,
-      "ref": "9c8ab039524086f5a8c8f35b9fb14538b5bfba5d",
+      "ref": "1ec470c297afd7758a90dc9399aa1e3a4ea6ca0b",
       "url": "https://github.com/haxeui/haxeui-flixel"
     },
     {

source/funkin/audio/FunkinSound.hx

@@ -107,6 +107,26 @@ class FunkinSound extends FlxSound
     return this;
   }
 
+  /**
+   * Called when the user clicks to focus on the window.
+   */
+  override function onFocus():Void
+  {
+    if (!_alreadyPaused && this._shouldPlay)
+    {
+      resume();
+    }
+  }
+
+  /**
+   * Called when the user tabs away from the window.
+   */
+  override function onFocusLost():Void
+  {
+    _alreadyPaused = _paused;
+    pause();
+  }
+
   public override function resume():FunkinSound
   {
     if (this._time < 0)

source/funkin/audio/SoundGroup.hx

@@ -132,6 +132,12 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
     });
   }
 
+  public override function destroy()
+  {
+    stop();
+    super.destroy();
+  }
+
   /**
    * Remove all sounds from the group.
    */

source/funkin/play/character/MultiSparrowCharacter.hx

@@ -1,5 +1,6 @@
 package funkin.play.character;
 
+import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.graphics.frames.FlxFramesCollection;
 import funkin.modding.events.ScriptEvent;
 import funkin.util.assets.FlxAnimationUtil;
@@ -7,35 +8,17 @@ import funkin.play.character.CharacterData.CharacterRenderType;
 
 /**
  * For some characters which use Sparrow atlases, the spritesheets need to be split
- * into multiple files. This character renderer handles by showing the appropriate sprite.
+ * into multiple files. This character renderer concatenates these together into a single sprite.
  *
  * Examples in base game include BF Holding GF (most of the sprites are in one file
  * but the death animation is in a separate file).
  * Only example I can think of in mods is Tricky (which has a separate file for each animation).
  *
- * BaseCharacter has game logic, SparrowCharacter has only rendering logic.
+ * BaseCharacter has game logic, MultiSparrowCharacter has only rendering logic.
  * KEEP THEM SEPARATE!
- *
- * TODO: Rewrite this to use a single frame collection.
- * @see https://github.com/HaxeFlixel/flixel/issues/2587#issuecomment-1179620637
  */
 class MultiSparrowCharacter extends BaseCharacter
 {
-  /**
-   * The actual group which holds all spritesheets this character uses.
-   */
-  var members:Map<String, FlxFramesCollection> = new Map<String, FlxFramesCollection>();
-
-  /**
-   * A map between animation names and what frame collection the animation should use.
-   */
-  var animAssetPath:Map<String, String> = new Map<String, String>();
-
-  /**
-   * The current frame collection being used.
-   */
-  var activeMember:String;
-
   public function new(id:String)
   {
     super(id, CharacterRenderType.MultiSparrow);
@@ -51,7 +34,7 @@ class MultiSparrowCharacter extends BaseCharacter
 
   function buildSprites():Void
   {
-    buildSpritesheets();
+    buildSpritesheet();
     buildAnimations();
 
     if (_data.isPixel)
@@ -66,95 +49,49 @@ class MultiSparrowCharacter extends BaseCharacter
     }
   }
 
-  function buildSpritesheets():Void
+  function buildSpritesheet():Void
   {
-    // TODO: This currently works by creating like 5 frame collections and switching between them.
-    // It would be better to refactor this to simply concatenate the frame collections together.
-
-    // Build the list of asset paths to use.
-    // Ignore nulls and duplicates.
-    var assetList = [_data.assetPath];
+    var assetList = [];
     for (anim in _data.animations)
     {
       if (anim.assetPath != null && !assetList.contains(anim.assetPath))
       {
         assetList.push(anim.assetPath);
       }
-      animAssetPath.set(anim.name, anim.assetPath);
     }
 
-    // Load the Sparrow atlas for each path and store them in the members map.
+    var texture:FlxAtlasFrames = Paths.getSparrowAtlas(_data.assetPath, 'shared');
+
+    if (texture == null)
+    {
+      trace('Multi-Sparrow atlas could not load PRIMARY texture: ${_data.assetPath}');
+    }
+    else
+    {
+      trace('Creating multi-sparrow atlas: ${_data.assetPath}');
+      texture.parent.destroyOnNoUse = false;
+    }
+
     for (asset in assetList)
     {
-      var texture:FlxFramesCollection = Paths.getSparrowAtlas(asset, 'shared');
+      var subTexture:FlxAtlasFrames = Paths.getSparrowAtlas(asset, 'shared');
       // If we don't do this, the unused textures will be removed as soon as they're loaded.
 
-      if (texture == null)
+      if (subTexture == null)
       {
-        trace('Multi-Sparrow atlas could not load texture: ${asset}');
+        trace('Multi-Sparrow atlas could not load subtexture: ${asset}');
       }
       else
       {
-        trace('Adding multi-sparrow atlas: ${asset}');
-        texture.parent.destroyOnNoUse = false;
-        members.set(asset, texture);
+        trace('Concatenating multi-sparrow atlas: ${asset}');
+        subTexture.parent.destroyOnNoUse = false;
       }
+
+      texture.addAtlas(subTexture);
     }
 
-    // Use the default frame collection to start.
-    loadFramesByAssetPath(_data.assetPath);
-  }
-
-  /**
-   * Replace this sprite's animation frames with the ones at this asset path.
-   */
-  function loadFramesByAssetPath(assetPath:String):Void
-  {
-    if (_data.assetPath == null)
-    {
-      trace('[ERROR] Multi-Sparrow character has no default asset path!');
-      return;
-    }
-    if (assetPath == null)
-    {
-      // trace('Asset path is null, falling back to default. This is normal!');
-      loadFramesByAssetPath(_data.assetPath);
-      return;
-    }
-
-    if (this.activeMember == assetPath)
-    {
-      // trace('Already using this asset path: ${assetPath}');
-      return;
-    }
-
-    if (members.exists(assetPath))
-    {
-      // Switch to a new set of sprites.
-      // trace('Loading frames from asset path: ${assetPath}');
-      this.frames = members.get(assetPath);
-      this.activeMember = assetPath;
-      this.setScale(_data.scale);
-    }
-    else
-    {
-      trace('[WARN] MultiSparrow character ${characterId} could not find asset path: ${assetPath}');
-    }
-  }
-
-  /**
-   * Replace this sprite's animation frames with the ones needed to play this animation.
-   */
-  function loadFramesByAnimName(animName)
-  {
-    if (animAssetPath.exists(animName))
-    {
-      loadFramesByAssetPath(animAssetPath.get(animName));
-    }
-    else
-    {
-      trace('[WARN] MultiSparrow character ${characterId} could not find animation: ${animName}');
-    }
+    this.frames = texture;
+    this.setScale(_data.scale);
   }
 
   function buildAnimations()
@@ -164,7 +101,6 @@ class MultiSparrowCharacter extends BaseCharacter
     // We need to swap to the proper frame collection before adding the animations, I think?
     for (anim in _data.animations)
     {
-      loadFramesByAnimName(anim.name);
       FlxAnimationUtil.addAtlasAnimation(this, anim);
 
       if (anim.offsets == null)
@@ -187,37 +123,6 @@ class MultiSparrowCharacter extends BaseCharacter
     // unless we're forcing a new animation.
     if (!this.canPlayOtherAnims && !ignoreOther) return;
 
-    loadFramesByAnimName(name);
     super.playAnimation(name, restart, ignoreOther, reverse);
   }
-
-  override function set_frames(value:FlxFramesCollection):FlxFramesCollection
-  {
-    // DISABLE THIS SO WE DON'T DESTROY OUR HARD WORK
-    // WE WILL MAKE SURE TO LOAD THE PROPER SPRITESHEET BEFORE PLAYING AN ANIM
-    // if (animation != null)
-    // {
-    // 	animation.destroyAnimations();
-    // }
-
-    if (value != null)
-    {
-      graphic = value.parent;
-      this.frames = value;
-      this.frame = value.getByIndex(0);
-      // this.numFrames = value.numFrames;
-      resetHelpers();
-      this.bakedRotationAngle = 0;
-      this.animation.frameIndex = 0;
-      graphicLoaded();
-    }
-    else
-    {
-      this.frames = null;
-      this.frame = null;
-      this.graphic = null;
-    }
-
-    return this.frames;
-  }
 }

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -5951,9 +5951,9 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     ChartEditorNoteSprite.noteFrameCollection = null;
 
     // Stop the music.
-    welcomeMusic.destroy();
-    audioInstTrack.destroy();
-    audioVocalTrackGroup.destroy();
+    if (welcomeMusic != null) welcomeMusic.destroy();
+    if (audioInstTrack != null) audioInstTrack.destroy();
+    if (audioVocalTrackGroup != null) audioVocalTrackGroup.destroy();
   }
 
   function applyCanQuickSave():Void

source/funkin/ui/debug/charting/contextmenus/ChartEditorEventContextMenu.hx

@@ -25,6 +25,10 @@ class ChartEditorEventContextMenu extends ChartEditorBaseContextMenu
 
   function initialize()
   {
+    contextmenuEdit.onClick = function(_) {
+      chartEditorState.showToolbox(ChartEditorState.CHART_EDITOR_TOOLBOX_EVENT_DATA_LAYOUT);
+    }
+
     contextmenuDelete.onClick = function(_) {
       chartEditorState.performCommand(new RemoveEventsCommand([data]));
     }

source/funkin/ui/freeplay/FreeplayState.hx

@@ -995,7 +995,7 @@ class FreeplayState extends MusicBeatSubState
     }
 
     // Set the difficulty star count on the right.
-    difficultyStars.difficulty = daSong.songRating;
+    difficultyStars.difficulty = daSong?.songRating ?? difficultyStars.difficulty; // yay haxe 4.3
   }
 
   // Clears the cache of songs, frees up memory, they' ll have to be loaded in later tho function clearDaCache(actualSongTho:String)