switch (rotation)

kniEngine · Feb 25, 2025 · 525ca49 · 525ca49
1 parent 4a6e1b0
commit 525ca49
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 39 deletions.
diff --git a/Platforms/Game/.Android/AndroidCompatibility.cs b/Platforms/Game/.Android/AndroidCompatibility.cs
@@ -66,33 +66,55 @@ private Orientation GetDeviceNaturalOrientation(Activity activity)
             {
                 case Orientation.Portrait:
                     {
-                        if (rotation == SurfaceOrientation.Rotation90 || rotation == SurfaceOrientation.Rotation270)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Landscape;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 case Orientation.Landscape:
                     {
-                        if (rotation == SurfaceOrientation.Rotation0  || rotation == SurfaceOrientation.Rotation180)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Landscape;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 default:
                     {
-                        return Orientation.Portrait;
+                        switch (rotation)
+                        {
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default: 
+                                return Orientation.Portrait;
+                        }
                     }
                     break;
             }

diff --git a/Platforms/Game/.CardboardLegacy/AndroidCompatibility.cs b/Platforms/Game/.CardboardLegacy/AndroidCompatibility.cs
@@ -66,33 +66,55 @@ private Orientation GetDeviceNaturalOrientation(Activity activity)
             {
                 case Orientation.Portrait:
                     {
-                        if (rotation == SurfaceOrientation.Rotation90 || rotation == SurfaceOrientation.Rotation270)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Landscape;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 case Orientation.Landscape:
                     {
-                        if (rotation == SurfaceOrientation.Rotation0  || rotation == SurfaceOrientation.Rotation180)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Landscape;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 default:
                     {
-                        return Orientation.Portrait;
+                        switch (rotation)
+                        {
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default: 
+                                return Orientation.Portrait;
+                        }
                     }
                     break;
             }

diff --git a/Platforms/Game/.Oculus/AndroidCompatibility.cs b/Platforms/Game/.Oculus/AndroidCompatibility.cs
@@ -66,33 +66,55 @@ private Orientation GetDeviceNaturalOrientation(Activity activity)
             {
                 case Orientation.Portrait:
                     {
-                        if (rotation == SurfaceOrientation.Rotation90 || rotation == SurfaceOrientation.Rotation270)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Landscape;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 case Orientation.Landscape:
                     {
-                        if (rotation == SurfaceOrientation.Rotation0  || rotation == SurfaceOrientation.Rotation180)
-                        {
-                            return Orientation.Landscape;
-                        }
-                        else
+                        switch (rotation)
                         {
-                            return Orientation.Portrait;
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Landscape;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default:
+                                return Orientation.Portrait;
                         }
                     }
                     break;
 
                 default:
                     {
-                        return Orientation.Portrait;
+                        switch (rotation)
+                        {
+                            case SurfaceOrientation.Rotation0:
+                            case SurfaceOrientation.Rotation180:
+                                return Orientation.Portrait;
+
+                            case SurfaceOrientation.Rotation90:
+                            case SurfaceOrientation.Rotation270:
+                                return Orientation.Portrait;
+
+                            default: 
+                                return Orientation.Portrait;
+                        }
                     }
                     break;
             }