Merge pull request #317 from De-Panther/fix_xri_related_bugs

Fix MRC, Webcam and HandMenu after XRI PR

Author: De-Panther

DebugProjects/Unity2020.3/ProjectSettings/ProjectSettings.asset

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 20
+  serializedVersion: 22
   productGUID: b27fd1ea3d9378f41813bacaf2f1736d
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: De-Panther
-  productName: Unity2020.3 WebXR Export
+  productName: Unity WebXR Export
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -119,6 +119,7 @@ PlayerSettings:
   stadiaTargetFramerate: 0
   vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
+  vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
   m_SupportedAspectRatios:
     4:3: 1
@@ -134,31 +135,6 @@ PlayerSettings:
   xboxOneDisableKinectGpuReservation: 1
   xboxOneEnable7thCore: 1
   vrSettings:
-    cardboard:
-      depthFormat: 0
-      enableTransitionView: 0
-    daydream:
-      depthFormat: 0
-      useSustainedPerformanceMode: 0
-      enableVideoLayer: 0
-      useProtectedVideoMemory: 0
-      minimumSupportedHeadTracking: 0
-      maximumSupportedHeadTracking: 1
-    hololens:
-      depthFormat: 1
-      depthBufferSharingEnabled: 1
-    lumin:
-      depthFormat: 0
-      frameTiming: 2
-      enableGLCache: 0
-      glCacheMaxBlobSize: 524288
-      glCacheMaxFileSize: 8388608
-    oculus:
-      sharedDepthBuffer: 1
-      dashSupport: 1
-      lowOverheadMode: 0
-      protectedContext: 0
-      v2Signing: 1
     enable360StereoCapture: 0
   isWsaHolographicRemotingEnabled: 0
   enableFrameTimingStats: 0
@@ -170,7 +146,11 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier: {}
-  buildNumber: {}
+  buildNumber:
+    Standalone: 0
+    iPhone: 0
+    tvOS: 0
+  overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 19
   AndroidTargetSdkVersion: 0
@@ -224,8 +204,8 @@ PlayerSettings:
   iOSLaunchScreeniPadFillPct: 100
   iOSLaunchScreeniPadSize: 100
   iOSLaunchScreeniPadCustomXibPath: 
-  iOSUseLaunchScreenStoryboard: 0
   iOSLaunchScreenCustomStoryboardPath: 
+  iOSLaunchScreeniPadCustomStoryboardPath: 
   iOSDeviceRequirements: []
   iOSURLSchemes: []
   iOSBackgroundModes: 0
@@ -243,9 +223,17 @@ PlayerSettings:
   iOSRequireARKit: 0
   iOSAutomaticallyDetectAndAddCapabilities: 1
   appleEnableProMotion: 0
+  shaderPrecisionModel: 0
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: [email protected]
   templateDefaultScene: Assets/Scenes/SampleScene.unity
+  useCustomMainManifest: 0
+  useCustomLauncherManifest: 0
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -327,7 +315,7 @@ PlayerSettings:
     m_Automatic: 1
   - m_BuildTarget: AppleTVSupport
     m_APIs: 10000000
-    m_Automatic: 0
+    m_Automatic: 1
   - m_BuildTarget: WebGLSupport
     m_APIs: 0b000000
     m_Automatic: 1
@@ -341,13 +329,16 @@ PlayerSettings:
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
   m_TemplateCustomTags:
-    DESCRIPTION: Unity 2020.3 WebXR demo
+    DESCRIPTION: Complete interactive 3D scene demo made in Unity and exported to
+      WebXR with the WebXR template of the Unity WebXR Export
+    WEBXR_POLYFILL_CONFIG: 
   mobileMTRendering:
     Android: 1
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality: []
   m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetNormalMapEncoding: []
   playModeTestRunnerEnabled: 0
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1
@@ -382,6 +373,7 @@ PlayerSettings:
   switchTitleNames_12: 
   switchTitleNames_13: 
   switchTitleNames_14: 
+  switchTitleNames_15: 
   switchPublisherNames_0: 
   switchPublisherNames_1: 
   switchPublisherNames_2: 
@@ -397,6 +389,7 @@ PlayerSettings:
   switchPublisherNames_12: 
   switchPublisherNames_13: 
   switchPublisherNames_14: 
+  switchPublisherNames_15: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -412,6 +405,7 @@ PlayerSettings:
   switchIcons_12: {fileID: 0}
   switchIcons_13: {fileID: 0}
   switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
   switchSmallIcons_0: {fileID: 0}
   switchSmallIcons_1: {fileID: 0}
   switchSmallIcons_2: {fileID: 0}
@@ -427,6 +421,7 @@ PlayerSettings:
   switchSmallIcons_12: {fileID: 0}
   switchSmallIcons_13: {fileID: 0}
   switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
   switchManualHTML: 
   switchAccessibleURLs: 
   switchLegalInformation: 
@@ -489,6 +484,9 @@ PlayerSettings:
   switchSocketInitializeEnabled: 1
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
+  switchUseNewStyleFilepaths: 0
+  switchUseMicroSleepForYield: 1
+  switchMicroSleepForYieldTime: 25
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -584,6 +582,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols: {}
+  additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}
@@ -592,9 +591,12 @@ PlayerSettings:
   suppressCommonWarnings: 1
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
+  useReferenceAssemblies: 1
+  enableRoslynAnalyzers: 1
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1
+  assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform: {}
   m_RenderingPath: 1
@@ -643,6 +645,7 @@ PlayerSettings:
   XboxOneCapability: []
   XboxOneGameRating: {}
   XboxOneIsContentPackage: 0
+  XboxOneEnhancedXboxCompatibilityMode: 0
   XboxOneEnableGPUVariability: 1
   XboxOneSockets: {}
   XboxOneSplashScreen: {fileID: 0}
@@ -651,10 +654,7 @@ PlayerSettings:
   XboxOneXTitleMemory: 8
   XboxOneOverrideIdentityName: 
   XboxOneOverrideIdentityPublisher: 
-  vrEditorSettings:
-    daydream:
-      daydreamIconForeground: {fileID: 0}
-      daydreamIconBackground: {fileID: 0}
+  vrEditorSettings: {}
   cloudServicesEnabled:
     UNet: 1
   luminIcon:
@@ -669,12 +669,12 @@ PlayerSettings:
     m_VersionCode: 1
     m_VersionName: 
   apiCompatibilityLevel: 6
+  activeInputHandler: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0
+  qualitySettingsNames: []
   projectName: 
   organizationId: 
   cloudEnabled: 0
-  enableNativePlatformBackendsForNewInputSystem: 0
-  disableOldInputManagerSupport: 0
   legacyClampBlendShapeWeights: 0
   virtualTexturingSupportEnabled: 0

DebugProjects/Unity2020.3/ProjectSettings/UnityConnectSettings.asset

@@ -9,6 +9,7 @@ UnityConnectSettings:
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com

Packages/webxr-interactions/Runtime/InputSystem/HandMenu.cs

@@ -1,12 +1,15 @@
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
 using Unity.XR.CoreUtils.Bindings;
 using Unity.XR.CoreUtils.Bindings.Variables;
-using UnityEngine;
 using UnityEngine.Assertions;
 using UnityEngine.XR.Interaction.Toolkit.Inputs;
 using UnityEngine.XR.Interaction.Toolkit.Utilities;
 using UnityEngine.XR.Interaction.Toolkit.Utilities.Tweenables.Primitives;
 using UnityEngine.XR.Interaction.Toolkit.Utilities.Tweenables.SmartTweenableVariables;
 using UnityEngine.XR.Interaction.Toolkit.UI.BodyUI;
+#endif
+using UnityEngine;
+
 
 namespace WebXR.InputSystem
 {
@@ -25,6 +28,7 @@ namespace WebXR.InputSystem
     /// </remarks>
     public class HandMenu : MonoBehaviour
     {
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
         /// <summary>
         /// Enum dictating the up direction used in hand menu calculations.
         /// </summary>
@@ -717,5 +721,6 @@ static float AngleToDot(float angleDeg)
         {
             return Mathf.Cos(Mathf.Deg2Rad * angleDeg);
         }
+#endif
     }
 }

Packages/webxr-interactions/Runtime/Plugins/WebGL/FixWebCamWebGL.jslib

@@ -1,30 +1,11 @@
 var LibraryFixWebCamWebGL = {
   $webcamBufferToTextureTable: {},
   $webcamLatestTextureId: 0,
-  $disableNextSubImage: false,
-  
-  glTexSubImage2D: function(target, level, xoffset, yoffset, width, height, format, type, pixels) {
-    if (disableNextSubImage) {
-      disableNextSubImage = false;
-      return;
-    }
-    if (GL.currentContext.supportsWebGL2EntryPoints) {
-      if (GLctx.currentPixelUnpackBufferBinding) {
-        GLctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels)
-      } else if (pixels != 0) {
-        GLctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, emscriptenWebGLGetHeapForType(type), pixels >> emscriptenWebGLGetShiftForType(type))
-      } else {
-        GLctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, null)
-      }
-      return
-    }
-    var pixelData = null;
-    if (pixels)
-      pixelData = emscriptenWebGLGetTexPixelData(type, format, width, height, pixels, 0);
-    GLctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixelData)
-  },
 
   JS_WebCamVideo_SetLatestTextureId: function(textureId) {
+    if (typeof _JS_WebCamVideo_Update !== "undefined") {
+      return;
+    }
     webcamLatestTextureId = textureId;
     // Webcam texture is created with texStorage2D so we have to recreate it
     GLctx.deleteTexture(GL.textures[textureId]);
@@ -37,6 +18,9 @@ var LibraryFixWebCamWebGL = {
   },
 
   JS_WebCamVideo_RemoveWhereTextureId: function(textureId) {
+    if (typeof _JS_WebCamVideo_Update !== "undefined") {
+      return;
+    }
     Object.entries(webcamBufferToTextureTable).forEach(function (pair) {
       if (pair[1] == textureId) {
         delete webcamBufferToTextureTable[pair[0]];
@@ -77,12 +61,21 @@ var LibraryFixWebCamWebGL = {
     GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, true);
     GLctx.texImage2D(GLctx.TEXTURE_2D, 0, GLctx.RGBA, GLctx.RGBA, GLctx.UNSIGNED_BYTE, videoElement);
     GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, false);
-    disableNextSubImage = true;
+    GLctx.disableNextSubImage = true;
+    if (!GLctx.webcamtexSubImage2D) {
+      GLctx.webcamtexSubImage2D = GLctx.texSubImage2D;
+      GLctx.texSubImage2D = function() {
+        if (this.disableNextSubImage) {
+          this.disableNextSubImage = false;
+          return;
+        }
+        this.webcamtexSubImage2D.apply(this, arguments);
+      }
+    }
     return 1;
   }
 };
 
 autoAddDeps(LibraryFixWebCamWebGL, '$webcamBufferToTextureTable');
 autoAddDeps(LibraryFixWebCamWebGL, '$webcamLatestTextureId');
-autoAddDeps(LibraryFixWebCamWebGL, '$disableNextSubImage');
 mergeInto(LibraryManager.library, LibraryFixWebCamWebGL);

Packages/webxr-interactions/Runtime/Scripts/MixedRealityCaptureController.cs

@@ -28,6 +28,7 @@ 18 Spectator
 using UnityEngine;
 #if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
 using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.Controls;
 #endif
 
 namespace WebXR.Interactions
@@ -321,21 +322,21 @@ private void Ended()
 
     private void SetPoint(Transform point, GameObject hint, ControllerState nextState, GameObject nextHint, Transform nextPoint)
     {
-      if (useInputSystem)
-      {
-        point.position = rightPosition.action.ReadValue<Vector3>();
-      }
-      else
-      {
-        point.position = rightController.transform.position;
-      }
-      if (GetControllersButtonDown())
+#if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
+      point.position = useInputSystem ?
+        rightPosition.action.ReadValue<Vector3>()
+        : rightController.transform.position;
+#else
+      point.position = rightController.transform.position;
+#endif
+      if (!GetControllersButtonDown())
       {
-        hint.SetActive(false);
-        nextHint.SetActive(true);
-        nextPoint.gameObject.SetActive(true);
-        state = nextState;
+        return;
       }
+      hint.SetActive(false);
+      nextHint.SetActive(true);
+      nextPoint.gameObject.SetActive(true);
+      state = nextState;
     }
 
     private void SetBottomPoint()
@@ -416,8 +417,8 @@ private bool GetControllersButtonDown()
 #if UNITY_INPUT_SYSTEM_1_4_4_OR_NEWER
       if (useInputSystem)
       {
-        return leftTrigger.action.phase == InputActionPhase.Performed
-          || rightTrigger.action.phase == InputActionPhase.Performed;
+        return ((ButtonControl)leftTrigger.action.activeControl).wasPressedThisFrame
+          || ((ButtonControl)rightTrigger.action.activeControl).wasPressedThisFrame;
       }
 #endif
       bool leftDown = (leftController.isHandActive || leftController.isControllerActive)