Merge pull request #174 from De-Panther/support_unity_2021_2

Added support for Unity 2021.2 (currently beta) and up

Author: De-Panther

.gitignore

@@ -4,9 +4,9 @@
 *[Ll]ogs/
 *[Tt]emp/
 *[Oo]bj/
+*[Uu]serSettings/
 *Assets/AssetStoreTools*
 *Build_*/
-**/UserSettings/EditorUserSettings.asset
 
 # Autogenerated VS/MD solution and project files
 ExportedObj/

Packages/webxr/CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Support for Unity 2021.2 (currently beta) and up.
+
 ### Changed
 - Actions to delegates in WebXRSubsystem.
 

Packages/webxr/Runtime/Plugins/WebGL/webxr.jslib

@@ -1,7 +1,7 @@
 /* functions called from unity */
 mergeInto(LibraryManager.library, {
   SetWebXRSettings: function(strJson) {
-    Module.WebXR.Settings = JSON.parse(Pointer_stringify(strJson));
+    Module.WebXR.Settings = JSON.parse(UTF8ToString(strJson));
     console.log(Module.WebXR.Settings);
   },
 

Packages/webxr/Runtime/Plugins/WebGL/webxr.jspre

@@ -307,7 +307,9 @@ setTimeout(function () {
 
       XRManager.prototype.onRequestARSession = function () {
         if (!this.isARSupported) return;
-        this.BrowserObject.pauseAsyncCallbacks();
+        if (this.BrowserObject.pauseAsyncCallbacks) {
+          this.BrowserObject.pauseAsyncCallbacks();
+        }
         this.BrowserObject.mainLoop.pause();
         var thisXRMananger = this;
         var tempRender = function () {
@@ -325,14 +327,18 @@ setTimeout(function () {
           thisXRMananger.xrSession = session;
           thisXRMananger.onSessionStarted(session);
         }).catch(function (error) {
-          thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          if (thisXRMananger.BrowserObject.resumeAsyncCallbacks) {
+            thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          }
           thisXRMananger.BrowserObject.mainLoop.resume();
         });
       }
 
       XRManager.prototype.onRequestVRSession = function () {
         if (!this.isVRSupported) return;
-        this.BrowserObject.pauseAsyncCallbacks();
+        if (this.BrowserObject.pauseAsyncCallbacks) {
+          this.BrowserObject.pauseAsyncCallbacks();
+        }
         this.BrowserObject.mainLoop.pause();
         var thisXRMananger = this;
         var tempRender = function () {
@@ -350,7 +356,9 @@ setTimeout(function () {
           thisXRMananger.xrSession = session;
           thisXRMananger.onSessionStarted(session);
         }).catch(function (error) {
-          thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          if (thisXRMananger.BrowserObject.resumeAsyncCallbacks) {
+            thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          }
           thisXRMananger.BrowserObject.mainLoop.resume();
         });
       }
@@ -397,14 +405,18 @@ setTimeout(function () {
         this.didNotifyUnity = false;
         this.canvas.width = this.canvas.parentElement.clientWidth * this.gameModule.asmLibraryArg._JS_SystemInfo_GetPreferredDevicePixelRatio();
         this.canvas.height = this.canvas.parentElement.clientHeight * this.gameModule.asmLibraryArg._JS_SystemInfo_GetPreferredDevicePixelRatio();
-        
-        this.BrowserObject.pauseAsyncCallbacks();
+
+        if (this.BrowserObject.pauseAsyncCallbacks) {
+          this.BrowserObject.pauseAsyncCallbacks();
+        }
         this.BrowserObject.mainLoop.pause();
         this.ctx.dontClearAlphaOnly = false;
         this.ctx.bindFramebuffer(this.ctx.FRAMEBUFFER);
         var thisXRMananger = this;
         window.setTimeout(function () {
-          thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          if (thisXRMananger.BrowserObject.resumeAsyncCallbacks) {
+            thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+          }
           thisXRMananger.BrowserObject.mainLoop.resume();
         });
       }
@@ -859,7 +871,9 @@ setTimeout(function () {
           var tempRaf = function (time, xrFrame) {
             if (thisXRMananger.animate(xrFrame))
             {
-              thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+              if (thisXRMananger.BrowserObject.resumeAsyncCallbacks) {
+                thisXRMananger.BrowserObject.resumeAsyncCallbacks();
+              }
               thisXRMananger.BrowserObject.mainLoop.resume();
             } else {
               // No XR session yet