Merge branch 'master' of https://github.com/JohannesDeml/UnityWebGL-LoadingTest into 6000.0

Author: JohannesDeml

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -21,6 +21,11 @@ namespace Supyrb
 	/// </summary>
 	public class CommonCommands : WebCommands
 	{
+		/// <summary>
+		/// List that stores allocated byte arrays to prevent them from being garbage collected
+		/// </summary>
+		private List<byte[]> byteArrayMemory = new List<byte[]>();
+
 		/// <summary>
 		/// Disable capturing all keyboard input, e.g. for using native html input fields
 		/// Browser Usage: <code>unityGame.SendMessage("WebGL","DisableCaptureAllKeyboardInput");</code>
@@ -58,6 +63,41 @@ public void LogMemory()
 			WebToolPlugins.LogMemory();
 		}
 
+		/// <summary>
+		/// Allocate memory to test memory usage and limits
+		/// The memory will be stored in a list to prevent it from being garbage collected
+		/// </summary>
+		/// <param name="mb">MB to allocate</param>
+		[WebCommand(Description = "Allocate memory to test memory usage and limits")]
+		public void AllocateByteArrayMemory(int mb)
+		{
+			byte[] memory = new byte[mb * 1024 * 1024];
+			byteArrayMemory.Add(memory);
+			Debug.Log($"Allocated {mb} MB of memory, total memory usage: {WebToolPlugins.GetTotalMemorySize():0.00}MB");
+		}
+
+		/// <summary>
+		/// Release all allocated byte array memory
+		/// </summary>
+		[WebCommand(Description = "Release all allocated byte array memory")]
+		[ContextMenu(nameof(ReleaseByteArrayMemory))]
+		public void ReleaseByteArrayMemory()
+		{
+			byteArrayMemory.Clear();
+			Debug.Log("Released all allocated byte array memory, it can now be garbage collected");
+		}
+
+		/// <summary>
+		/// Trigger garbage collection
+		/// </summary>
+		[WebCommand(Description = "Trigger garbage collection")]
+		[ContextMenu(nameof(TriggerGarbageCollection))]
+		public void TriggerGarbageCollection()
+		{
+			GC.Collect();
+			Debug.Log("Garbage collection triggered");
+		}
+
 		/// <summary>
 		/// Unloads all unused assets <see cref="Resources.UnloadUnusedAssets"/>
 		/// Browser Usage: <code>unityGame.SendMessage("WebGL","UnloadUnusedAssets");</code>
@@ -67,6 +107,7 @@ public void LogMemory()
 		public void UnloadUnusedAssets()
 		{
 			Resources.UnloadUnusedAssets();
+			Debug.Log("Unloaded unused assets");
 		}
 
 		/// <summary>
@@ -79,6 +120,7 @@ public void UnloadUnusedAssets()
 		public void SetApplicationRunInBackground(int runInBackground)
 		{
 			Application.runInBackground = runInBackground == 1;
+			Debug.Log($"Application.runInBackground: {Application.runInBackground}");
 		}
 
 		/// <summary>
@@ -90,6 +132,7 @@ public void SetApplicationRunInBackground(int runInBackground)
 		public void SetApplicationTargetFrameRate(int targetFrameRate)
 		{
 			Application.targetFrameRate = targetFrameRate;
+			Debug.Log($"Application.targetFrameRate: {Application.targetFrameRate}");
 		}
 
 		/// <summary>
@@ -101,6 +144,7 @@ public void SetApplicationTargetFrameRate(int targetFrameRate)
 		public void SetTimeFixedDeltaTime(float fixedDeltaTime)
 		{
 			Time.fixedDeltaTime = fixedDeltaTime;
+			Debug.Log($"Time.fixedDeltaTime: {Time.fixedDeltaTime}");
 		}
 
 		/// <summary>
@@ -113,6 +157,7 @@ public void SetTimeFixedDeltaTime(float fixedDeltaTime)
 		public void SetTimeTimeScale(float timeScale)
 		{
 			Time.timeScale = timeScale;
+			Debug.Log($"Time.timeScale: {Time.timeScale}");
 		}
 
 		/// <summary>
@@ -214,6 +259,7 @@ public void LogTextureSupport()
 		public void DeleteAllPlayerPrefs()
 		{
 			PlayerPrefs.DeleteAll();
+			Debug.Log("Deleted all player prefs");
 		}
 
 		/// <summary>
@@ -226,6 +272,7 @@ public void DeleteAllPlayerPrefs()
 		public void LogShaderCompilation(int enabled)
 		{
 			GraphicsSettings.logWhenShaderIsCompiled = enabled == 1;
+			Debug.Log($"GraphicsSettings.logWhenShaderIsCompiled: {GraphicsSettings.logWhenShaderIsCompiled}");
 		}
 	}
 }

Assets/Plugins/WebGL/WebTools/WebToolPlugins.jslib

@@ -88,41 +88,53 @@ var WebGlPlugins =
 
     _GetTotalMemorySize: function()
     {
-        if(typeof TOTAL_MEMORY !== 'undefined') {
+        if(typeof HEAP8 !== 'undefined') {
+            return HEAP8.length;
+        }
+        if(typeof TOTAL_MEMORY !== 'undefined') {  // Legacy support
             return TOTAL_MEMORY;
         }
 
-        console.warn("Problem with retrieving unity value. TOTAL_MEMORY: " + typeof TOTAL_MEMORY);
+        console.warn("Problem with retrieving total memory size");
         return -1;
     },
 
     _GetTotalStackSize: function()
     {
-        if(typeof TOTAL_STACK !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.STACK_SIZE !== 'undefined') {
+            return Module.STACK_SIZE;
+        }
+        if(typeof TOTAL_STACK !== 'undefined') {  // Legacy support
             return TOTAL_STACK;
         }
 
-        console.warn("Problem with retrieving unity value. TOTAL_STACK: " + typeof TOTAL_STACK);
+        console.warn("Problem with retrieving stack size");
         return -1;
     },
 
     _GetStaticMemorySize: function()
     {
-        if(typeof STATICTOP !== 'undefined' && typeof STATIC_BASE !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.staticAlloc !== 'undefined') {
+            return Module.staticAlloc;
+        }
+        if(typeof STATICTOP !== 'undefined' && typeof STATIC_BASE !== 'undefined') {  // Legacy support
             return STATICTOP - STATIC_BASE;
         }
 
-        console.warn("Problem with retrieving unity value. STATICTOP: " + typeof STATICTOP + ", STATIC_BASE: " + typeof STATIC_BASE);
+        console.warn("Problem with retrieving static memory size");
         return -1;
     },
 
     _GetDynamicMemorySize: function()
     {
-        if(typeof HEAP32 !== 'undefined' && typeof DYNAMICTOP_PTR !== 'undefined' && typeof DYNAMIC_BASE !== 'undefined') {
+        if(typeof Module !== 'undefined' && typeof Module.dynamicAlloc !== 'undefined') {
+            return Module.dynamicAlloc;
+        }
+        if(typeof HEAP32 !== 'undefined' && typeof DYNAMICTOP_PTR !== 'undefined' && typeof DYNAMIC_BASE !== 'undefined') {  // Legacy support
             return HEAP32[DYNAMICTOP_PTR >> 2] - DYNAMIC_BASE;
         }
 
-        console.warn("Problem with retrieving unity value. HEAP32: " + typeof HEAP32 + ", DYNAMICTOP_PTR: " + typeof DYNAMICTOP_PTR + ", DYNAMIC_BASE: " + typeof DYNAMIC_BASE);
+        console.warn("Problem with retrieving dynamic memory size");
         return -1;
     }
 };