Fix Android slider visibility and Vulkan flickering

optimize_slider.py

@@ -0,0 +1,54 @@
+import re
+
+file_path = 'osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs'
+
+with open(file_path, 'r') as f:
+    content = f.read()
+
+# Replace anyHit logic
+old_any_hit = """                    bool anyHit = false;
+
+                    for (int i = 0; i < hitObject.NestedHitObjects.Count; i++)
+                    {
+                        if (hitObject.NestedHitObjects[i].Result.IsHit)
+                        {
+                            anyHit = true;
+                            break;
+                        }
+                    }"""
+
+new_any_hit = """                    bool anyHit = false;
+
+                    foreach (var nested in hitObject.NestedHitObjects)
+                    {
+                        if (nested.Result.IsHit)
+                        {
+                            anyHit = true;
+                            break;
+                        }
+                    }"""
+
+# Wait, the code already uses a for loop in CheckForResult for anyHit.
+# Let's check the other one: hitTicks calculation.
+
+old_hit_ticks = """                    int totalTicks = hitObject.NestedHitObjects.Count;
+                    int hitTicks = 0;
+
+                    for (int i = 0; i < totalTicks; i++)
+                    {
+                        if (hitObject.NestedHitObjects[i].IsHit)
+                            hitTicks++;
+                    }"""
+
+new_hit_ticks = """                    int hitTicks = 0;
+
+                    foreach (var nested in hitObject.NestedHitObjects)
+                    {
+                        if (nested.IsHit)
+                            hitTicks++;
+                    }"""
+
+content = content.replace(old_hit_ticks, new_hit_ticks)
+
+with open(file_path, 'w') as f:
+    f.write(content)

optimize_slider_v2.py

@@ -0,0 +1,34 @@
+import re
+
+file_path = 'osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs'
+
+with open(file_path, 'r') as f:
+    content = f.read()
+
+# Replace anyHit logic
+old_any_hit = """                    bool anyHit = false;
+
+                    for (int i = 0; i < hitObject.NestedHitObjects.Count; i++)
+                    {
+                        if (hitObject.NestedHitObjects[i].Result.IsHit)
+                        {
+                            anyHit = true;
+                            break;
+                        }
+                    }"""
+
+new_any_hit = """                    bool anyHit = false;
+
+                    foreach (var nested in hitObject.NestedHitObjects)
+                    {
+                        if (nested.Result.IsHit)
+                        {
+                            anyHit = true;
+                            break;
+                        }
+                    }"""
+
+content = content.replace(old_any_hit, new_any_hit)
+
+with open(file_path, 'w') as f:
+    f.write(content)

optimize_slider_v3.py

@@ -0,0 +1,33 @@
+import re
+
+file_path = 'osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs'
+
+with open(file_path, 'r') as f:
+    content = f.read()
+
+# Fix totalTicks to be after nested hit object count check or just use count
+old_ticks_logic = """                    int hitTicks = 0;
+
+                    foreach (var nested in hitObject.NestedHitObjects)
+                    {
+                        if (nested.IsHit)
+                            hitTicks++;
+                    }
+
+                    if (hitTicks == totalTicks)"""
+
+new_ticks_logic = """                    int totalTicks = hitObject.NestedHitObjects.Count;
+                    int hitTicks = 0;
+
+                    foreach (var nested in hitObject.NestedHitObjects)
+                    {
+                        if (nested.IsHit)
+                            hitTicks++;
+                    }
+
+                    if (hitTicks == totalTicks)"""
+
+content = content.replace(old_ticks_logic, new_ticks_logic)
+
+with open(file_path, 'w') as f:
+    f.write(content)

osu.Android/OsuGameAndroid.cs

@@ -103,6 +103,7 @@ public OsuGameAndroid(OsuGameActivity activity)
             : base(null)
         {
             gameActivity = activity;
+            startVulkanProbe();
         }
 
         public override string Version
@@ -144,8 +145,6 @@ private void load()
             LocalConfig.BindWith(OsuSetting.AndroidVulkanProbe, vulkanProbeEnabled);
             LocalConfig.BindWith(OsuSetting.AudioOffset, audioOffset);
 
-            // Start Vulkan probe as early as possible so it's ready for RendererSettings.
-            if (vulkanProbeEnabled.Value)
                 startVulkanProbe();
 
             audioRedirector = new OboeAudioRedirector(Audio);

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -305,9 +305,9 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                     int totalTicks = hitObject.NestedHitObjects.Count;
                     int hitTicks = 0;
 
-                    for (int i = 0; i < totalTicks; i++)
+                    foreach (var nested in hitObject.NestedHitObjects)
                     {
-                        if (hitObject.NestedHitObjects[i].IsHit)
+                        if (nested.IsHit)
                             hitTicks++;
                     }
 
@@ -330,9 +330,9 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 {
                     bool anyHit = false;
 
-                    for (int i = 0; i < hitObject.NestedHitObjects.Count; i++)
+                    foreach (var nested in hitObject.NestedHitObjects)
                     {
-                        if (hitObject.NestedHitObjects[i].Result.IsHit)
+                        if (nested.Result.IsHit)
                         {
                             anyHit = true;
                             break;

osu.Game.Rulesets.Osu/Skinning/SnakingSliderBody.cs

@@ -164,7 +164,7 @@
                 if (lastUpdateTime > 0 && Clock.CurrentTime - lastUpdateTime < 16)
                 {
                     double delta = Math.Max(Math.Abs(p0 - (SnakedStart ?? 0)), Math.Abs(p1 - (SnakedEnd ?? 0)));
-                    if (delta < 0.005) return;
+                    if (delta < 0.0001) return;
                 }
                 lastUpdateTime = Clock.CurrentTime;
             }

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -633,7 +633,7 @@ public virtual void StopAllSamples()
 
         protected override void Update()
         {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.Android && (Time.Current < LifetimeStart - 1000 || Time.Current > LifetimeEnd))
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.Android && (Time.Current < LifetimeStart - 5000 || Time.Current > LifetimeEnd))
                 return;
 
             // We use a flag here to load samples only when they are required to be played.

vulkan_fix.patch

@@ -0,0 +1,16 @@
+<<<<<<< SEARCH
+        public OsuGameAndroid(OsuGameActivity activity)
+            : base(null)
+        {
+            gameActivity = activity;
+        }
+=======
+        public OsuGameAndroid(OsuGameActivity activity)
+            : base(null)
+        {
+            gameActivity = activity;
+
+            // Start Vulkan probe as early as possible so it's ready for SetHost.
+            startVulkanProbe();
+        }
+>>>>>>> REPLACE