Merge pull request #250 from De-Panther/fix_webcam_errors_vers

Fixed webcam errors in different versions of Unity

Author: De-Panther

Build/Build/Build.data

@@ -36,7 +36,7 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.de-panther.webxr": "0.15.0-preview"
+        "com.de-panther.webxr": "0.16.0-preview"
       }
     },
     "com.unity.burst": {

Build/Build/Build.framework.js

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Webcam errors in different versions of Unity.
+
 ## [0.16.1] - 2023-02-03
 ### Fixed
 - No reference to controllers in SceneHitTest.

Build/Build/Build.wasm

@@ -51,8 +51,7 @@ var LibraryFixWebCamWebGL = {
         webcamDevice.nextFrameAvailableTime = timeNow + webcamDevice.frameLengthInMsecs
       }
       videoElement = webcamDevice.video;
-    }
-    if (typeof MediaDevices !== "undefined") {
+    } else if (!typeof MediaDevices !== "undefined") {
       if (!MediaDevices[deviceId].video) {
         console.error("WebCam not initialized.");
         return;

DebugProjects/Unity2019.4/Packages/packages-lock.json

@@ -35,6 +35,8 @@ public class PlayWebcam : MonoBehaviour
   private IntPtr latestWebcamPtr = IntPtr.Zero;
   private int lightingTexID = -1;
 
+  private int webcamIndex = 0;
+
   void Awake()
   {
     TrySetupRenderer();
@@ -80,16 +82,20 @@ void Start()
 
   void Play()
   {
+    var devices = WebCamTexture.devices;
+    if (devices == null || devices.Length == 0)
+    {
+      return;
+    }
     if (webcamTexture == null)
     {
-      var devices = WebCamTexture.devices;
-      if (devices == null || devices.Length == 0)
-      {
-        return;
-      }
-      webcamTexture = new WebCamTexture(devices[0].name);
+      webcamTexture = new WebCamTexture(devices[Mathf.Clamp(webcamIndex, 0, devices.Length-1)].name);
       material.mainTexture = webcamTexture;
     }
+    else
+    {
+      webcamTexture.deviceName = devices[Mathf.Clamp(webcamIndex, 0, devices.Length - 1)].name;
+    }
     latestWebcamPtr = webcamTexture.GetNativeTexturePtr();
     #if UNITY_WEBGL && !UNITY_EDITOR
     JS_WebCamVideo_RemoveWhereTextureId(latestWebcamPtr);
@@ -98,6 +104,16 @@ void Play()
     StartCoroutine(SetScale());
   }
 
+  void Stop()
+  {
+    if (webcamTexture == null)
+    {
+      return;
+    }
+    StopAllCoroutines();
+    webcamTexture.Stop();
+  }
+
   IEnumerator SetScale()
   {
     while (webcamTexture.GetNativeTexturePtr() == latestWebcamPtr)
@@ -121,8 +137,7 @@ void OnEnable()
 
   void OnDisable()
   {
-    StopAllCoroutines();
-    webcamTexture.Stop();
+    Stop();
   }
 
   private void TrySetColor(string value, ref Color color, int propertyID, int colorLetter)
@@ -211,4 +226,14 @@ public void TrySetLightingTexture(Texture texture)
     }
     material.SetTexture(lightingTexID, texture);
   }
+
+  public void TrySetWebcamIndex(string value)
+  {
+    if (int.TryParse(value, out webcamIndex) 
+        && isActiveAndEnabled && started)
+    {
+      Stop();
+      Play();
+    }
+  }
 }

Packages/webxr-interactions/CHANGELOG.md

@@ -27,11 +27,11 @@ void Start()
         {
           if (controllers[i].hand == WebXRControllerHand.LEFT)
           {
-            leftController ??= controllers[i];
+            leftController = leftController ?? controllers[i];
           }
           else if (controllers[i].hand == WebXRControllerHand.RIGHT)
           {
-            rightController ??= controllers[i];
+            rightController = leftController ?? controllers[i];
           }
           if (leftController != null && rightController != null)
           {