Fixed device definition in the editor.

Author: RimuruDev

DeviceTypeDetector.cs

@@ -1,29 +1,29 @@
 // **************************************************************** //
 //
 //   Copyright (c) RimuruDev. All rights reserved.
-//   Contact me: 
-//          - Gmail:    [email protected]
+//   Contact me:
+//          - Gmail: [email protected]  
 //          - LinkedIn: https://www.linkedin.com/in/rimuru/
-//          - GitHub:   https://github.com/RimuruDev
+//          - GitHub: https://github.com/RimuruDev
 //
 // **************************************************************** //
 
 using System;
+using System.Linq;
 using UnityEngine;
 
 #if UNITY_EDITOR
 using UnityEditor;
-using UnityEditor.DeviceSimulation;
 #endif
 
 namespace RimuruDev
 {
-    [Flags]
     [Serializable]
     public enum CurrentDeviceType : byte
     {
-        WebPC = 0,
-        WebMobile = 2,
+        None = 0,
+        WebPC = 2,
+        WebMobile = 4,
     }
 
     [SelectionBase]
@@ -32,14 +32,31 @@ public enum CurrentDeviceType : byte
     [HelpURL("https://github.com/RimuruDev/Unity-WEBGL-DeviceTypeDetector")]
     public sealed class DeviceTypeDetector : MonoBehaviour
     {
+#if UNITY_EDITOR
+        private const string WINDOW_TITLE_SIMULATOR = "Simulator";
+        private const string WINDOW_TITLE_SIMULATOR_DEVICE = "Simulator Device";
+#endif
         [field: SerializeField] public CurrentDeviceType CurrentDeviceType { get; private set; }
 
 #if UNITY_2020_1_OR_NEWER
         [SerializeField] private bool enableDeviceSimulator = true;
 #endif
+
         private void Awake()
         {
-            if (IsMobile() && enableDeviceSimulator)
+#if UNITY_EDITOR
+            if (IsSimulatorWindowOpen() && enableDeviceSimulator)
+            {
+                Debug.Log("WEBGL -> Mobile");
+                CurrentDeviceType = CurrentDeviceType.WebMobile;
+            }
+            else
+            {
+                Debug.Log("WEBGL -> PC");
+                CurrentDeviceType = CurrentDeviceType.WebPC;
+            }
+#else
+            if (IsMobile())
             {
                 Debug.Log("WEBGL -> Mobile");
                 CurrentDeviceType = CurrentDeviceType.WebMobile;
@@ -49,36 +66,19 @@ private void Awake()
                 Debug.Log("WEBGL -> PC");
                 CurrentDeviceType = CurrentDeviceType.WebPC;
             }
+#endif
         }
 
 #if UNITY_EDITOR
-        public static bool IsMobile()
-        {
-#if UNITY_2020_1_OR_NEWER
-            if (DeviceSimulatorExists() && IsDeviceSimulationActive())
-                return true;
+        private static bool IsSimulatorWindowOpen() =>
+            Resources
+                .FindObjectsOfTypeAll<EditorWindow>()
+                .Any(window => window.titleContent.text
+                    is WINDOW_TITLE_SIMULATOR
+                    or WINDOW_TITLE_SIMULATOR_DEVICE);
 #endif
-            return false;
-        }
 
-        private static bool DeviceSimulatorExists()
-        {
-            var simulatorType = typeof(Editor).Assembly.GetType("UnityEditor.DeviceSimulation.DeviceSimulator");
-            return simulatorType != null;
-        }
-
-        private static bool IsDeviceSimulationActive()
-        {
-            var simulatorType = typeof(Editor).Assembly.GetType("UnityEditor.DeviceSimulation.DeviceSimulator");
-            if (simulatorType != null)
-            {
-                var simulatorInstance = simulatorType.GetProperty("instance", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public)?.GetValue(null);
-                var isDeviceActive = simulatorType.GetProperty("isDeviceActive", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.GetValue(simulatorInstance);
-                return (bool)isDeviceActive;
-            }
-            return false;
-        }
-#else
+#if !UNITY_EDITOR
         [System.Runtime.InteropServices.DllImport("__Internal")]
         public static extern bool IsMobile();
 #endif

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-webgl-device-type-detector",
-  "version": "1.0.1",
+  "version": "1.1.2",
   "description": "A Unity script to detect if a WebGL application is running on a mobile device or PC, with support for Unity's Device Simulator.",
   "author": "RimuruDev",
   "license": "MIT",