Reduce allocation of GameplayHitSampleInfo arrays

Author: Rian8337

src/ru/nsu/ccfit/zuev/osu/game/GameObjectListener.java

@@ -7,6 +7,7 @@
 import com.rian.osu.gameplay.GameplayHitSampleInfo;
 
 import java.util.BitSet;
+import java.util.List;
 
 public interface GameObjectListener {
 
@@ -41,5 +42,5 @@ void onSliderHit(int id, int score, PointF judgementPos,
 
     void onUpdatedAutoCursor(float pX, float pY);
 
-    void playHitSamples(GameplayHitSampleInfo[] samples);
+    void playHitSamples(List<GameplayHitSampleInfo> samples);
 }

src/ru/nsu/ccfit/zuev/osu/game/GameScene.java

@@ -2389,16 +2389,16 @@ public void onSpinnerHit(int id, final int score, final boolean endCombo, int to
     }
 
     @Override
-    public void playHitSamples(GameplayHitSampleInfo[] samples) {
+    public void playHitSamples(List<GameplayHitSampleInfo> samples) {
         float volume = 1;
         var muted = GameHelper.getMuted();
 
         if (muted != null && muted.affectsHitSounds()) {
             volume = muted.volumeAt(stat.getCombo());
         }
 
-        for (int i = 0; i < samples.length; ++i) {
-            var sample = samples[i];
+        for (int i = 0, size = samples.size(); i < size; ++i) {
+            var sample = samples.get(i);
             sample.setVolume(volume);
             sample.play();
         }

src/ru/nsu/ccfit/zuev/osu/game/GameplayHitCircle.java

@@ -15,6 +15,8 @@
 
 import org.anddev.andengine.entity.scene.Scene;
 
+import java.util.ArrayList;
+
 import ru.nsu.ccfit.zuev.osu.Config;
 import ru.nsu.ccfit.zuev.osu.ResourceManager;
 import ru.nsu.ccfit.zuev.osu.scoring.ResultType;
@@ -31,7 +33,7 @@ public class GameplayHitCircle extends GameObject {
     private float timePreempt;
     private boolean kiai;
     private boolean successfulHit;
-    private GameplayHitSampleInfo[] hitSamples;
+    private final ArrayList<GameplayHitSampleInfo> hitSamples = new ArrayList<>(5);
 
     /**
      * The circle piece that represents the circle body and overlay.
@@ -149,7 +151,7 @@ public void init(final GameObjectListener listener, final Scene pScene, final Hi
 
         // Initialize samples
         var parsedSamples = beatmapCircle.getSamples();
-        hitSamples = new GameplayHitSampleInfo[parsedSamples.size()];
+        hitSamples.ensureCapacity(parsedSamples.size());
 
         for (int i = 0, size = parsedSamples.size(); i < size; i++) {
             var gameplaySample = GameplayHitSampleInfo.pool.obtain();
@@ -159,7 +161,7 @@ public void init(final GameObjectListener listener, final Scene pScene, final Hi
                 gameplaySample.setFrequency(GameHelper.getSpeedMultiplier());
             }
 
-            hitSamples[i] = gameplaySample;
+            hitSamples.add(gameplaySample);
         }
 
         scene.attachChild(circlePiece, 0);
@@ -171,12 +173,14 @@ private void removeFromScene() {
             return;
         }
 
-        for (int i = 0; i < hitSamples.length; ++i) {
-            hitSamples[i].reset();
-            GameplayHitSampleInfo.pool.free(hitSamples[i]);
-        }
+        for (int i = hitSamples.size() - 1; i >= 0; --i) {
+            var sample = hitSamples.get(i);
 
-        hitSamples = null;
+            sample.reset();
+            GameplayHitSampleInfo.pool.free(sample);
+
+            hitSamples.remove(i);
+        }
 
         circlePiece.clearEntityModifiers();
         approachCircle.clearEntityModifiers();

src/ru/nsu/ccfit/zuev/osu/game/GameplaySlider.java

@@ -40,6 +40,7 @@
 import ru.nsu.ccfit.zuev.osu.scoring.StatisticV2;
 import ru.nsu.ccfit.zuev.skins.OsuSkin;
 
+import java.util.ArrayList;
 import java.util.BitSet;
 
 public class GameplaySlider extends GameObject {
@@ -66,7 +67,7 @@ public class GameplaySlider extends GameObject {
     private final boolean isSliderBallFlip;
     private boolean shouldSnakeOut;
 
-    private GameplayHitSampleInfo[][] nestedHitSamples;
+    private final ArrayList<ArrayList<GameplayHitSampleInfo>> nestedHitSamples = new ArrayList<>(10);
     private final GameplaySequenceHitSampleInfo sliderSlideSample;
     private final GameplaySequenceHitSampleInfo sliderWhistleSample;
 
@@ -606,14 +607,19 @@ private void removeFromScene() {
         listener.removeObject(this);
         stopSlidingSamples();
 
-        for (int i = 0; i < nestedHitSamples.length; ++i) {
-            for (int j = 0; j < nestedHitSamples[i].length; ++j) {
-                nestedHitSamples[i][j].reset();
-                GameplayHitSampleInfo.pool.free(nestedHitSamples[i][j]);
+        for (int i = 0, iSize = nestedHitSamples.size(); i < iSize; ++i) {
+            var hitSamples = nestedHitSamples.get(i);
+
+            for (int j = hitSamples.size() - 1; j >= 0; --j) {
+                var sample = hitSamples.get(j);
+
+                sample.reset();
+                GameplayHitSampleInfo.pool.free(sample);
+
+                hitSamples.remove(j);
             }
         }
 
-        nestedHitSamples = null;
         path = null;
         scene = null;
     }
@@ -1301,21 +1307,30 @@ private void applyBodyFadeAdjustments(float fadeInDuration) {
 
     private void reloadHitSounds() {
         var nestedObjects = beatmapSlider.getNestedHitObjects();
-        nestedHitSamples = new GameplayHitSampleInfo[nestedObjects.size()][];
+        nestedHitSamples.ensureCapacity(nestedObjects.size());
 
-        for (int i = 0; i < nestedHitSamples.length; ++i) {
+        for (int i = 0, size = nestedObjects.size(); i < size; ++i) {
             var nestedObjectSamples = nestedObjects.get(i).getSamples();
-            nestedHitSamples[i] = new GameplayHitSampleInfo[nestedObjectSamples.size()];
+            int nestedObjectSampleCount = nestedObjectSamples.size();
+
+            var nestedHitSample = i < nestedHitSamples.size() ? nestedHitSamples.get(i) : null;
+
+            if (nestedHitSample != null) {
+                nestedHitSample.ensureCapacity(nestedObjectSampleCount);
+            } else {
+                nestedHitSample = new ArrayList<>(Math.max(5, nestedObjectSampleCount));
+                nestedHitSamples.add(nestedHitSample);
+            }
 
-            for (int j = 0; j < nestedHitSamples[i].length; ++j) {
+            for (int j = 0; j < nestedObjectSampleCount; ++j) {
                 var gameplaySample = GameplayHitSampleInfo.pool.obtain();
                 gameplaySample.init(nestedObjectSamples.get(j));
 
                 if (GameHelper.isSamplesMatchPlaybackRate()) {
                     gameplaySample.setFrequency(GameHelper.getSpeedMultiplier());
                 }
 
-                nestedHitSamples[i][j] = gameplaySample;
+                nestedHitSample.add(gameplaySample);
             }
         }
 
@@ -1355,7 +1370,7 @@ private void reloadHitSounds() {
     }
 
     private void playCurrentNestedObjectHitSound() {
-        listener.playHitSamples(nestedHitSamples[currentNestedObjectIndex]);
+        listener.playHitSamples(nestedHitSamples.get(currentNestedObjectIndex));
     }
 
     @Override

src/ru/nsu/ccfit/zuev/osu/game/GameplaySpinner.java

@@ -16,6 +16,8 @@
 import org.anddev.andengine.opengl.texture.region.TextureRegion;
 import org.anddev.andengine.util.MathUtils;
 
+import java.util.ArrayList;
+
 import ru.nsu.ccfit.zuev.audio.serviceAudio.SongService;
 import ru.nsu.ccfit.zuev.osu.Config;
 import ru.nsu.ccfit.zuev.osu.Constants;
@@ -50,7 +52,7 @@ public class GameplaySpinner extends GameObject {
     protected boolean spinnable;
 
     protected final boolean isSpinnerFrequencyModulate;
-    protected GameplayHitSampleInfo[] hitSamples;
+    protected final ArrayList<GameplayHitSampleInfo> hitSamples = new ArrayList<>(5);
     protected final GameplaySequenceHitSampleInfo spinnerSpinSample;
     protected final GameplaySequenceHitSampleInfo spinnerBonusSample;
 
@@ -366,17 +368,17 @@ public void update(final float dt) {
 
     protected void reloadHitSounds() {
         var parsedSamples = beatmapSpinner.getSamples();
-        hitSamples = new GameplayHitSampleInfo[parsedSamples.size()];
+        hitSamples.ensureCapacity(parsedSamples.size());
 
-        for (int i = 0; i < hitSamples.length; ++i) {
+        for (int i = 0, size = parsedSamples.size(); i < size; ++i) {
             var gameplaySample = GameplayHitSampleInfo.pool.obtain();
             gameplaySample.init(parsedSamples.get(i));
 
             if (GameHelper.isSamplesMatchPlaybackRate()) {
                 gameplaySample.setFrequency(GameHelper.getSpeedMultiplier());
             }
 
-            hitSamples[i] = gameplaySample;
+            hitSamples.add(gameplaySample);
         }
 
         spinnerSpinSample.reset();
@@ -420,13 +422,13 @@ protected void playAndFreeHitSamples(int obtainedScore) {
             listener.playHitSamples(hitSamples);
         }
 
-        for (int i = 0; i < hitSamples.length; ++i) {
-            var sample = hitSamples[i];
+        for (int i = hitSamples.size() - 1; i >= 0; --i) {
+            var sample = hitSamples.get(i);
             sample.reset();
             GameplayHitSampleInfo.pool.free(sample);
-        }
 
-        hitSamples = null;
+            hitSamples.remove(i);
+        }
     }
 
     @Override