Implement SDL3

Co-Authored-By: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
Co-Authored-By: Karim Akra <144803230+KarimAkra@users.noreply.github.com>

Author: 3 people

hmm.json

@@ -52,14 +52,14 @@
       "name": "flixel",
       "type": "git",
       "dir": null,
-      "ref": "c8e79d2a42f9c11c639519ef2a6fd7ef2379a8aa",
+      "ref": "ab6cc8c14878be3a1a918d85668efc3b6a6263f2",
       "url": "https://github.com/FunkinCrew/flixel"
     },
     {
       "name": "flixel-addons",
       "type": "git",
       "dir": null,
-      "ref": "6fa30b3f5209146c852c25f3d1003e08898083e2",
+      "ref": "60e3076e1ed8cc6ad0cad5e72fe3c3d5e91207b7",
       "url": "https://github.com/FunkinCrew/flixel-addons"
     },
     {
@@ -169,7 +169,7 @@
       "name": "lime",
       "type": "git",
       "dir": null,
-      "ref": "0125dc5dc1116b65e49c51cf8f2769577e668999",
+      "ref": "248ea4175a9150320243378107b3820e154f328b",
       "url": "https://github.com/FunkinCrew/lime"
     },
     {
@@ -183,7 +183,7 @@
       "name": "openfl",
       "type": "git",
       "dir": null,
-      "ref": "92d7607f309c6c0705456a2e943f1aa0f052463d",
+      "ref": "0600b18e624aa8054ea86fc795c4d8e5bc004fbe",
       "url": "https://github.com/FunkinCrew/openfl"
     },
     {

source/Main.hx

@@ -177,7 +177,9 @@ class Main extends Sprite
     // This allows the blend mode shader to work everywhere.
     untyped FlxG.cameras = new funkin.graphics.FunkinCameraFrontEnd();
 
-    var game:FlxGame = new FlxGame(gameWidth, gameHeight, initialState, Preferences.framerate, Preferences.framerate, skipSplash,
+    var framerate:Int = Preferences.unlockedFramerate ? 0 : Preferences.framerate;
+
+    var game:FlxGame = new FlxGame(gameWidth, gameHeight, initialState, framerate, framerate, skipSplash,
       (FlxG.stage.window.fullscreen || Preferences.autoFullscreen));
 
     // FlxG.game._customSoundTray wants just the class, it calls new from
@@ -251,28 +253,23 @@ class Main extends Sprite
   function repositionCounters(lerp:Bool):Void
   {
     // Calling this so it gets scaled based on the resolution of the game and device's resolution.
-    var scale:Float = Math.min(FlxG.stage.stageWidth / FlxG.width, FlxG.stage.stageHeight / FlxG.height);
-
-    #if android
-    scale = Math.max(scale, 1);
-    #else
-    scale = Math.min(scale, 1);
-    #end
-    final thypos:Float = Math.max(FullScreenScaleMode.notchSize.x, 10);
+    var scale:Float = Math.max(Math.min(FlxG.stage.stageWidth / FlxG.width, FlxG.stage.stageHeight / FlxG.height), 1);
 
     if (debugDisplay != null)
     {
       debugDisplay.scaleX = debugDisplay.scaleY = scale;
 
       if (FlxG.game != null)
       {
+        final thypos:Float = Math.max(FullScreenScaleMode.notchSize.x, 10);
+
         if (lerp)
         {
           debugDisplay.x = flixel.math.FlxMath.lerp(debugDisplay.x, FlxG.game.x + thypos, FlxG.elapsed * 3);
         }
         else
         {
-          debugDisplay.x = FlxG.game.x + FullScreenScaleMode.notchSize.x + 10;
+          debugDisplay.x = FlxG.game.x + thypos;
         }
 
         debugDisplay.y = FlxG.game.y + (3 * scale);

source/funkin/InitState.hx

@@ -311,19 +311,34 @@ class InitState extends FlxState
   #if FEATURE_LOST_FOCUS_VOLUME
   @:noCompletion var _lastFocusVolume:Null<Float>;
 
-  function onLostFocus()
+  function onLostFocus():Void
   {
     if (FlxG.sound.muted || FlxG.sound.volume == 0 || FlxG.autoPause) return;
     _lastFocusVolume = FlxG.sound.volume;
     FlxG.sound.volume *= Constants.LOST_FOCUS_VOLUME_MULTIPLIER;
   }
+  #end
 
-  function onGainFocus()
+  function onGainFocus():Void
   {
+    #if !mobile
+    if (Preferences.unlockedFramerate)
+    {
+      FlxG.updateFramerate = 0;
+      FlxG.drawFramerate = 0;
+    }
+    else
+    {
+      FlxG.updateFramerate = Preferences.framerate;
+      FlxG.drawFramerate = Preferences.framerate;
+    }
+    #end
+
+    #if FEATURE_LOST_FOCUS_VOLUME
     if (FlxG.sound.muted || FlxG.autoPause) return;
     if (_lastFocusVolume != null) FlxG.sound.volume = _lastFocusVolume;
+    #end
   }
-  #end
 
   /**
    * Start the game.

source/funkin/Preferences.hx

@@ -41,12 +41,23 @@ class Preferences
   {
     #if web
     return 60;
+    #elseif mobile
+    var refreshRate:Int = FlxG.stage.window.displayMode.refreshRate;
+
+    if (refreshRate < 60) refreshRate = 60;
+
+    return refreshRate;
     #else
     var save:Save = Save.instance;
     save.options.framerate = value;
     Save.system.flush();
-    FlxG.updateFramerate = value;
-    FlxG.drawFramerate = value;
+
+    if (!unlockedFramerate)
+    {
+      FlxG.updateFramerate = value;
+      FlxG.drawFramerate = value;
+    }
+
     return value;
     #end
   }
@@ -69,13 +80,13 @@ class Preferences
   static function set_naughtyness(value:Bool):Bool
   {
     #if NO_FEATURE_NAUGHTYNESS
-    value = false;
-    #end
-
+    return false;
+    #else
     var save:Save = Save.instance;
     save.options.naughtyness = value;
     Save.system.flush();
     return value;
+    #end
   }
 
   /**
@@ -146,8 +157,7 @@ class Preferences
   {
     #if NO_FEATURE_DEBUG_DISPLAY
     return DebugDisplayMode.Off;
-    #end
-
+    #else
     #if hl
     // Account for when debugDisplay used to be a boolean
     var options:Null<SaveDataOptions> = Save.instance?.options;
@@ -158,18 +168,22 @@ class Preferences
       Save.system.flush();
     }
     #end
-
     return Save?.instance?.options?.debugDisplay ?? 'Off';
+    #end
   }
 
   static function set_debugDisplay(value:DebugDisplayMode):DebugDisplayMode
   {
+    #if NO_FEATURE_DEBUG_DISPLAY
+    return DebugDisplayMode.Off;
+    #else
     if (value != Save.instance.options.debugDisplay) setDebugDisplayMode(value);
 
     var save = Save.instance;
     save.options.debugDisplay = value;
     Save.system.flush();
     return value;
+    #end
   }
 
   /**
@@ -264,18 +278,23 @@ class Preferences
   {
     #if mobile
     return false;
-    #end
+    #else
     return Save?.instance?.options?.autoPause ?? true;
+    #end
   }
 
   static function set_autoPause(value:Bool):Bool
   {
+    #if mobile
+    return false;
+    #else
     if (value != Save.instance.options.autoPause) FlxG.autoPause = value;
 
     var save:Save = Save.instance;
     save.options.autoPause = value;
     Save.system.flush();
     return value;
+    #end
   }
 
   /**
@@ -325,6 +344,9 @@ class Preferences
 
   static function get_vsyncMode():lime.ui.WindowVSyncMode
   {
+    #if mobile
+    return lime.ui.WindowVSyncMode.OFF;
+    #else
     var value = Save?.instance?.options?.vsyncMode ?? "Off";
 
     return switch (value)
@@ -338,10 +360,14 @@ class Preferences
       default:
         lime.ui.WindowVSyncMode.OFF;
     };
+    #end
   }
 
   static function set_vsyncMode(value:lime.ui.WindowVSyncMode):lime.ui.WindowVSyncMode
   {
+    #if mobile
+    return lime.ui.WindowVSyncMode.OFF;
+    #else
     var string;
 
     switch (value)
@@ -362,28 +388,35 @@ class Preferences
     save.options.vsyncMode = string;
     Save.system.flush();
     return value;
+    #end
   }
 
   public static var unlockedFramerate(get, set):Bool;
 
   static function get_unlockedFramerate():Bool
   {
+    #if mobile
+    return false;
+    #else
     return Save?.instance?.options?.unlockedFramerate ?? false;
+    #end
   }
 
   static function set_unlockedFramerate(value:Bool):Bool
   {
+    #if mobile
+    return false;
+    #else
     if (value != Save.instance.options.unlockedFramerate)
     {
-      #if web
       toggleFramerateCap(value);
-      #end
     }
 
     var save:Save = Save.instance;
     save.options.unlockedFramerate = value;
     Save.system.flush();
     return value;
+    #end
   }
 
   #if web
@@ -496,9 +529,7 @@ class Preferences
     setDebugDisplayMode(Preferences.debugDisplay);
     setDebugDisplayBGOpacity(Preferences.debugDisplayBGOpacity / 100);
 
-    #if web
     toggleFramerateCap(Preferences.unlockedFramerate);
-    #end
 
     #if mobile
     // Apply the allowScreenTimeout setting.
@@ -511,6 +542,9 @@ class Preferences
     #if web
     var framerateFunction = unlocked ? unlockedFramerateFunction : lockedFramerateFunction;
     untyped js.Syntax.code("window.requestAnimationFrame = framerateFunction;");
+    #else
+    FlxG.drawFramerate = unlocked ? 0 : framerate;
+    FlxG.updateFramerate = unlocked ? 0 : framerate;
     #end
   }
 

source/funkin/external/apple/project/src/ScreenUtil.mm

@@ -11,16 +11,18 @@ void Apple_ScreenUtil_GetSafeAreaInsets(double* top, double* bottom, double* lef
   #if TARGET_OS_IOS
   if (@available(iOS 11, *))
   {
-    UIWindow* window = [UIApplication sharedApplication].windows[0];
-    UIEdgeInsets safeAreaInsets = window.safeAreaInsets;
-    float scale = [UIScreen mainScreen].scale;
+    UIWindow *window = [UIApplication sharedApplication].windows[0];
+    if (window)
+    {
+      UIEdgeInsets insets = window.safeAreaInsets;
+      CGFloat scale = window.screen.nativeScale;
 
-    (*top) = safeAreaInsets.top * scale;
-    (*bottom) = safeAreaInsets.bottom * scale;
-    (*left) = safeAreaInsets.left * scale;
-    (*right) = safeAreaInsets.right * scale;
-
-    return;
+      (*top) = (double)(insets.top * scale);
+      (*bottom) = (double)(insets.bottom * scale);
+      (*left) = (double)(insets.left * scale);
+      (*right)  = (double)(insets.right * scale);
+      return;
+    }
   }
   #endif
 
@@ -33,13 +35,22 @@ void Apple_ScreenUtil_GetSafeAreaInsets(double* top, double* bottom, double* lef
 void Apple_ScreenUtil_GetScreenSize(double* width, double* height)
 {
   #if TARGET_OS_IOS
-  CGRect screenRect = [[UIScreen mainScreen] bounds];
-  float scale = [UIScreen mainScreen].scale;
+  if (@available(iOS 11, *))
+  {
+    UIWindow *window = [UIApplication sharedApplication].windows[0];
+    if (window && window.rootViewController)
+    {
+      UIView *view = window.rootViewController.view;
+      CGSize size = view.bounds.size;
+      CGFloat scale = window.screen.nativeScale;
 
-  (*width) = (double)screenRect.size.width  * scale;
-  (*height) = (double)screenRect.size.height * scale;
-  #else
-  (*width) = 0.0;
-  (*width) = 0.0;
+      (*width) = (double)((int)(size.width  * scale));
+      (*height) = (double)((int)(size.height * scale));
+      return;
+    }
+  }
   #endif
+
+  (*width) = 0.0;
+  (*height) = 0.0;
 }