Use dynCall to notify on events from JavaScript to C#. (Removed webxr.c)

Author: De-Panther

Packages/webxr/CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed
-- How hands, controllers, hit-test and views data sent from JavaScript to C#.
+- How the interoperability between JavaScript and C# works.
 
 ## [0.11.0] - 2021-06-06
 ### Added

Packages/webxr/Runtime/Plugins/WebGL/webxr.c

@@ -5,6 +5,17 @@ mergeInto(LibraryManager.library, {
     console.log(Module.WebXR.Settings);
   },
 
+  SetWebXREvents: function(onStartARPtr,
+      onStartVRPtr, onVisibilityChangePtr, onEndXRPtr,
+      onXRCapabilitiesPtr, onInputProfilesPtr) {
+    Module.WebXR.onStartARPtr = onStartARPtr;
+    Module.WebXR.onStartVRPtr = onStartVRPtr;
+    Module.WebXR.onVisibilityChangePtr = onVisibilityChangePtr;
+    Module.WebXR.onEndXRPtr = onEndXRPtr;
+    Module.WebXR.onXRCapabilitiesPtr = onXRCapabilitiesPtr;
+    Module.WebXR.onInputProfilesPtr = onInputProfilesPtr;
+  },
+
   InitXRSharedArray: function(byteOffset) {
     Module.XRSharedArrayOffset = byteOffset / 4;
     Module.WebXR.onUnityLoaded({detail: {state: 'Ready', module: Module}});

Packages/webxr/Runtime/Plugins/WebGL/webxr.c.meta

@@ -604,12 +604,7 @@ setTimeout(function () {
 
       XRManager.prototype.UpdateXRCapabilities = function() {
         // Send browser capabilities to Unity.
-        this.gameModule.WebXR.OnXRCapabilities(
-          JSON.stringify({
-            canPresentAR: this.isARSupported,
-            canPresentVR: this.isVRSupported
-          })
-        );
+        this.gameModule.WebXR.OnXRCapabilities(this.isARSupported, this.isVRSupported);
       }
 
       // http://answers.unity.com/answers/11372/view.html
@@ -1064,47 +1059,41 @@ Module['WebXR'].GetJSEventsObject = function () {
 
 Module['WebXR'].OnStartAR = function (views_count, left_rect, right_rect) {
   Module.WebXR.isInXR = true;
-  this.OnStartARInternal = this.OnStartARInternal || Module.cwrap("on_start_ar", null, ["number",
-                                                                  "number", "number", "number", "number",
-                                                                  "number", "number", "number", "number"]);
-  this.OnStartARInternal(views_count,
+  Module.dynCall_viffffffff(Module.WebXR.onStartARPtr, views_count,
                           left_rect.x, left_rect.y, left_rect.w, left_rect.h,
                           right_rect.x, right_rect.y, right_rect.w, right_rect.h);
 }
 
 Module['WebXR'].OnStartVR = function (views_count, left_rect, right_rect) {
   Module.WebXR.isInXR = true;
-  this.OnStartVRInternal = this.OnStartVRInternal || Module.cwrap("on_start_vr", null, ["number",
-                                                                  "number", "number", "number", "number",
-                                                                  "number", "number", "number", "number"]);
-  this.OnStartVRInternal(views_count,
+  Module.dynCall_viffffffff(Module.WebXR.onStartVRPtr, views_count,
                           left_rect.x, left_rect.y, left_rect.w, left_rect.h,
                           right_rect.x, right_rect.y, right_rect.w, right_rect.h);
 }
 
 Module['WebXR'].OnVisibilityChange = function (visibility_state) {
-  this.OnVisibilityChangeInternal = this.OnVisibilityChangeInternal || Module.cwrap("on_visibility_change", null, ["number"]);
   var visibility_state_int = 0;
   if (visibility_state == "visible-blurred") {
     visibility_state_int = 1;
   } else if (visibility_state == "hidden") {
     visibility_state_int = 2;
   }
-  this.OnVisibilityChangeInternal(visibility_state_int);
+  Module.dynCall_vi(Module.WebXR.onVisibilityChangePtr, visibility_state_int);
 }
 
 Module['WebXR'].OnEndXR = function () {
   Module.WebXR.isInXR = false;
-  this.OnEndXRInternal = this.OnEndXRInternal || Module.cwrap("on_end_xr", null, []);
-  this.OnEndXRInternal();
+  Module.dynCall_v(Module.WebXR.onEndXRPtr);
 }
 
-Module['WebXR'].OnXRCapabilities = function (display_capabilities) {
-  this.OnXRCapabilitiesInternal = this.OnXRCapabilitiesInternal || Module.cwrap("on_xr_capabilities", null, ["string"]);
-  this.OnXRCapabilitiesInternal(display_capabilities);
+Module['WebXR'].OnXRCapabilities = function (isARSupported, isVRSupported) {
+  Module.dynCall_vii(Module.WebXR.onXRCapabilitiesPtr, isARSupported, isVRSupported);
 }
 
 Module['WebXR'].OnInputProfiles = function (input_profiles) {
-  this.OnInputProfilesInternal = this.OnInputProfilesInternal || Module.cwrap("on_input_profiles", null, ["string"]);
-  this.OnInputProfilesInternal(input_profiles);
+  var strBufferSize = lengthBytesUTF8(input_profiles) + 1;
+  var strBuffer = Module._malloc(strBufferSize);
+  stringToUTF8(input_profiles, strBuffer, strBufferSize);
+  Module.dynCall_vi(Module.WebXR.onInputProfilesPtr, strBuffer);
+  Module._free(strBuffer);
 }

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

@@ -169,7 +169,7 @@ private void UpdateXRCameras()
     private void InternalStart()
     {
 #if UNITY_WEBGL
-      Native.set_webxr_events(OnStartAR, OnStartVR, UpdateVisibilityState, OnEndXR, OnXRCapabilities, OnInputProfiles);
+      Native.SetWebXREvents(OnStartAR, OnStartVR, UpdateVisibilityState, OnEndXR, OnXRCapabilities, OnInputProfiles);
       Native.InitControllersArray(controllersArray);
       Native.InitHandsArray(handsArray);
       Native.InitViewerHitTestPoseArray(viewerHitTestPoseArray);
@@ -205,11 +205,11 @@ private static class Native
       public static extern void ControllerPulse(int controller, float intensity, float duration);
 
       [DllImport("__Internal")]
-      public static extern void set_webxr_events(Action<int, float, float, float, float, float, float, float, float> on_start_ar,
+      public static extern void SetWebXREvents(Action<int, float, float, float, float, float, float, float, float> on_start_ar,
           Action<int, float, float, float, float, float, float, float, float> on_start_vr,
           Action<int> on_visibility_change,
           Action on_end_xr,
-          Action<string> on_xr_capabilities,
+          Action<bool, bool> on_xr_capabilities,
           Action<string> on_input_profiles);
     }
 #endif
@@ -292,11 +292,12 @@ public delegate void HeadsetUpdate(
     internal WebXRDisplayCapabilities capabilities = new WebXRDisplayCapabilities();
 
     // Handles WebXR capabilities from browser
-    [MonoPInvokeCallback(typeof(Action<string>))]
-    public static void OnXRCapabilities(string json)
+    [MonoPInvokeCallback(typeof(Action<bool, bool>))]
+    public static void OnXRCapabilities(bool isARSupported, bool isVRSupported)
     {
-      WebXRDisplayCapabilities capabilities = JsonUtility.FromJson<WebXRDisplayCapabilities>(json);
-      Instance.OnXRCapabilities(capabilities);
+      Instance.capabilities.canPresentAR = isARSupported;
+      Instance.capabilities.canPresentVR = isVRSupported;
+      Instance.OnXRCapabilities(Instance.capabilities);
     }
 
     [MonoPInvokeCallback(typeof(Action<string>))]