Merge branch 'master' into 2022.3

JohannesDeml · JohannesDeml · commit 3ca562375151 · 2024-02-25T13:42:44.000+01:00
diff --git a/Assets/Plugins/WebGL/WebBridge/WebBridge.cs b/Assets/Plugins/WebGL/WebBridge/WebBridge.cs
@@ -92,7 +92,9 @@ private static void SetGlobalVariables()
 
 		private void Start()
 		{
+#if (!UNITY_EDITOR && UNITY_WEBGL) || UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"Unity WebGL Bridge ready -> Run 'runUnityCommand(\"Help\")' in the browser console to see usage");
+#endif
 		}
 
 		[WebCommand(Description = "Log all available commands")]
diff --git a/Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs b/Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs
@@ -50,10 +50,12 @@ public static class WebToolPlugins
 		/// <param name="value">Value of the variable</param>
 		public static void SetVariable(string variableName, string value)
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			_SetStringVariable(variableName, value);
-			#endif
+			_AddTimeTrackingEvent(eventName);
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"<color=#00CCCC>{nameof(WebToolPlugins)}.{nameof(SetVariable)} set {variableName}: {value}</color>");
+#endif
 		}
 
 		/// <summary>
@@ -63,20 +65,20 @@ public static void SetVariable(string variableName, string value)
 		/// <param name="eventName">Name of the tracking event, e.g. "Awake"</param>
 		public static void AddTimeTrackingEvent(string eventName)
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			_AddTimeTrackingEvent(eventName);
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(AddTimeTrackingEvent)} called with {eventName}");
-			#endif
+#endif
 		}
 
 		public static void AddFpsTrackingEvent(float fps)
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			_AddFpsTrackingEvent(fps);
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(AddFpsTrackingEvent)} called with {fps:0.00}");
-			#endif
+#endif
 		}
 
 		/// <summary>
@@ -87,11 +89,11 @@ public static void AddFpsTrackingEvent(float fps)
 		public static void ShowInfoPanel()
 		{
 			_infoPanelVisible = true;
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			_ShowInfoPanel();
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(ShowInfoPanel)} called");
-			#endif
+#endif
 		}
 
 		/// <summary>
@@ -102,11 +104,11 @@ public static void ShowInfoPanel()
 		public static void HideInfoPanel()
 		{
 			_infoPanelVisible = false;
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			_HideInfoPanel();
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(HideInfoPanel)} called");
-			#endif
+#endif
 		}
 
 		/// <summary>
@@ -130,12 +132,12 @@ public static void ToggleInfoPanel()
 		/// <returns>navigator.userAgent</returns>
 		public static string GetUserAgent()
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			return _GetUserAgent();
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetUserAgent)} called");
+#endif
 			return "undefined";
-			#endif
 		}
 
 		/// <summary>
@@ -157,13 +159,13 @@ public static bool IsMobileDevice()
 		/// <returns>Size in MB</returns>
 		public static float GetTotalMemorySize()
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			var bytes = _GetTotalMemorySize();
 			return GetMegaBytes(bytes);
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetTotalMemorySize)} called");
+#endif
 			return -1f;
-			#endif
 		}
 
 		/// <summary>
@@ -176,7 +178,7 @@ public static void LogMemory()
 			var native = GetNativeMemorySize();
 			var total = GetTotalMemorySize();
 			Debug.Log($"Memory stats:\nManaged: {managed:0.00}MB\nNative: {native:0.00}MB\nTotal: {total:0.00}MB");
-#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(LogMemory)} called");
 #endif
 		}
@@ -187,13 +189,13 @@ public static void LogMemory()
 		/// <returns>Size in MB</returns>
 		public static float GetStaticMemorySize()
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			var bytes = _GetStaticMemorySize();
 			return GetMegaBytes(bytes);
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetStaticMemorySize)} called");
+#endif
 			return -1f;
-			#endif
 		}
 
 		/// <summary>
@@ -202,13 +204,13 @@ public static float GetStaticMemorySize()
 		/// <returns>Size in MB</returns>
 		public static float GetDynamicMemorySize()
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			var bytes = _GetStaticMemorySize();
 			return GetMegaBytes(bytes);
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetDynamicMemorySize)} called");
+#endif
 			return -1f;
-			#endif
 		}
 
 		/// <summary>
@@ -217,12 +219,12 @@ public static float GetDynamicMemorySize()
 		/// <returns>Size in MB</returns>
 		public static float GetNativeMemorySize()
 		{
-			#if UNITY_WEBGL && !UNITY_EDITOR
+#if UNITY_WEBGL && !UNITY_EDITOR
 			return GetDynamicMemorySize() + GetStaticMemorySize();
-			#else
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
 			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(GetNativeMemorySize)} called");
+#endif
 			return -1f;
-			#endif
 		}
 
 		/// <summary>
@@ -231,7 +233,7 @@ public static float GetNativeMemorySize()
 		/// <returns>Size in MB</returns>
 		public static float GetManagedMemorySize()
 		{
-			var bytes = (uint) GC.GetTotalMemory(false);
+			var bytes = (uint)GC.GetTotalMemory(false);
 			return GetMegaBytes(bytes);
 		}
 
@@ -242,7 +244,7 @@ public static float GetManagedMemorySize()
 		/// <returns>bytes / (1024 * 1024)</returns>
 		private static float GetMegaBytes(uint bytes)
 		{
-			return (float) bytes / (1024 * 1024);
+			return (float)bytes / (1024 * 1024);
 		}
 	}
 }
diff --git a/Assets/WebGLTemplates/Release/pretty-console.js b/Assets/WebGLTemplates/Release/pretty-console.js
@@ -14,7 +14,7 @@ function setupConsoleLogPipe() {
   console.info = (message) => { handleLog(message, 'info', defaultConsoleInfo); };
   console.debug = (message) => { handleLog(message, 'debug', defaultConsoleDebug); };
   console.warn = (message) => { handleLog(message, 'warn', defaultConsoleWarn); };
-  console.error = (message) => { handleLog(message, 'error', defaultConsoleError); errorReceived(); };
+  console.error = (message) => { handleLog(message, 'error', defaultConsoleError); };
 
 
   handleLog = (message, logLevel, consoleLogFunction) => {
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -32,6 +32,16 @@
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0"
-  }
-}
+    "com.unity.modules.xr": "1.0.0",
+    "com.jd.guidresolver": "1.1.0"
+  },
+  "scopedRegistries": [
+    {
+      "name": "package.openupm.com",
+      "url": "https://package.openupm.com",
+      "scopes": [
+        "com.jd.guidresolver"
+      ]
+    }
+  ]
+}
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,5 +1,14 @@
 {
   "dependencies": {
+    "com.jd.guidresolver": {
+      "version": "1.1.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "3.0.2"
+      },
+      "url": "https://package.openupm.com"
+    },
     "com.unity.ai.navigation": {
       "version": "1.1.5",
       "depth": 0,
@@ -58,6 +67,13 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.settings-manager": {
       "version": "2.0.1",
       "depth": 1,
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
@@ -12,10 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
-  m_EnablePackageDependencies: 0
+  m_EnablePreReleasePackages: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
   oneTimeWarningShown: 0
   m_Registries:
   - m_Id: main
@@ -24,20 +25,20 @@ MonoBehaviour:
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
-  m_UserSelectedRegistryName: 
+    m_ConfigSource: 0
+  - m_Id: scoped:project:package.openupm.com
+    m_Name: package.openupm.com
+    m_Url: https://package.openupm.com
+    m_Scopes:
+    - com.jd.guidresolver
+    m_IsDefault: 0
+    m_Capabilities: 0
+    m_ConfigSource: 4
+  m_UserSelectedRegistryName: package.openupm.com
   m_UserAddingNewScopedRegistry: 0
   m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: 
-      m_Name: 
-      m_Url: 
-      m_Scopes: []
-      m_IsDefault: 0
-      m_Capabilities: 0
     m_Modified: 0
-    m_Name: 
-    m_Url: 
-    m_Scopes:
-    - 
-    m_SelectedScopeIndex: 0
+    m_ErrorMessage: 
+    m_UserModificationsInstanceId: -834
+    m_OriginalInstanceId: -836
+  m_LoadAssets: 0

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ private static void SetGlobalVariables()`
`92`	`92`
`93`	`93`	`private void Start()`
`94`	`94`	`{`
	`95`	`+#if (!UNITY_EDITOR && UNITY_WEBGL) \|\| UNITY_EDITOR && WEBTOOLS_LOG_CALLS`
`95`	`96`	`Debug.Log($"Unity WebGL Bridge ready -> Run 'runUnityCommand(\"Help\")' in the browser console to see usage");`
	`97`	`+#endif`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`[WebCommand(Description = "Log all available commands")]`