Merge pull request #249 from De-Panther/fix_webcam_errors

Fixed errors when trying to play webcam stream

Author: De-Panther

Packages/webxr-interactions/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - No reference to controllers in SceneHitTest.
+- Errors when trying to play webcam stream.
 
 ## [0.16.0] - 2023-02-02
 ### Added

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

@@ -68,7 +68,7 @@ var LibraryFixWebCamWebGL = {
     }
     GLctx.bindTexture(GLctx.TEXTURE_2D, GL.textures[webcamBufferToTextureTable[buffer]]);
     GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, true);
-    GLctx.texImage2D(GLctx.TEXTURE_2D, 0, GLctx.RGBA, GLctx.RGBA, GLctx.UNSIGNED_BYTE, videoElement);
+    GLctx.texSubImage2D(GLctx.TEXTURE_2D, 0, 0, 0, GLctx.RGBA, GLctx.UNSIGNED_BYTE, videoElement);
     GLctx.pixelStorei(GLctx.UNPACK_FLIP_Y_WEBGL, false);
     disableNextSubImage = true;
     return 1;

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

@@ -35,9 +35,6 @@ public class PlayWebcam : MonoBehaviour
   private IntPtr latestWebcamPtr = IntPtr.Zero;
   private int lightingTexID = -1;
 
-  private int defaultWidth = 1280;
-  private int defaultHeight = 720;
-
   void Awake()
   {
     TrySetupRenderer();
@@ -86,18 +83,11 @@ void Play()
     if (webcamTexture == null)
     {
       var devices = WebCamTexture.devices;
-      var device = devices[0];
-      var resolutions = device.availableResolutions;
-      if (resolutions?.Length > 0)
-      {
-        webcamTexture = new WebCamTexture(device.name, resolutions[0].width, resolutions[0].height, resolutions[0].refreshRate);
-      }
-      else
+      if (devices == null || devices.Length == 0)
       {
-        webcamTexture = new WebCamTexture(device.name, defaultWidth, defaultHeight);
+        return;
       }
-      float ratio = (float)defaultWidth / (float)defaultHeight;
-      transform.localScale = new Vector3(ratio, 1f, 1f);
+      webcamTexture = new WebCamTexture(devices[0].name);
       material.mainTexture = webcamTexture;
     }
     latestWebcamPtr = webcamTexture.GetNativeTexturePtr();