Merge remote-tracking branch 'upstream/main' into src-function

Author: SaFrMo

package-lock.json

@@ -0,0 +1,8 @@
+export default function getSourceDimensions(source) {
+  if (!source) return [0, 0];
+
+  const tag = (source.tagName || '').toLowerCase();
+  if (tag === 'video') return [source.videoWidth, source.videoHeight];
+  if (tag === 'img') return [source.naturalWidth, source.naturalHeight];
+  return [source.width, source.height];
+}

src/utils/getSourceDimensions.js

@@ -1,4 +1,5 @@
 import Texture from './Texture.js';
+import getSourceDimensions from '../utils/getSourceDimensions.js';
 
 const IMAGE = 0;
 const VIDEO = 1;
@@ -77,7 +78,6 @@ export default function GeneralTexture(
       }
     } else if (source instanceof HTMLVideoElement) {
       type = VIDEO;
-      videoOnSetup();
     } else if (source instanceof HTMLCanvasElement) {
       type = CANVAS;
       imageOnload();
@@ -119,12 +119,13 @@ export default function GeneralTexture(
     source.crossOrigin = 'anonymous';
     source.src = src;
     addHiddenInDOM(source);
-
-    videoOnSetup();
     source.play();
   }
 
+  let hasVideoSetup = false;
   function videoOnSetup() {
+    if (hasVideoSetup) return;
+    hasVideoSetup = true;
     updateResolution();
     texture.setParameters([
       [gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE],
@@ -147,8 +148,6 @@ export default function GeneralTexture(
       source.autoplay = true;
       source.srcObject = stream;
       addHiddenInDOM(source);
-
-      videoOnSetup();
     };
 
     const initCam = () => {
@@ -171,8 +170,9 @@ export default function GeneralTexture(
 
   function updateResolution() {
     if (source) {
-      ustate[1].value[0] = source.width;
-      ustate[1].value[1] = source.height;
+      const [w, h] = getSourceDimensions(source);
+      ustate[1].value[0] = w;
+      ustate[1].value[1] = h;
     }
   }
 
@@ -189,6 +189,7 @@ export default function GeneralTexture(
     ustate.forEach(updateSingleUniform);
 
     if (shouldUpdate()) {
+      videoOnSetup();
       texture.update({ pixels: source });
     } else {
       texture.shallow();

src/webgl/GeneralTexture.js

@@ -1,3 +1,5 @@
+import getSourceDimensions from '../utils/getSourceDimensions.js';
+
 const PIXEL = new Uint8Array([0, 0, 0, 255]);
 
 const isPow2 = value => !(value & (value - 1)) && !!value;
@@ -99,10 +101,9 @@ export default function Texture(gl, textureUnit, optsParam = {}) {
     gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flipY);
 
     if (pixels) {
-      if (pixels.width === 0 || pixels.height === 0) {
-        console.warn(
-          `Texture size is invalid ${pixels.width} x ${pixels.height}. Update is skipped;`
-        );
+      const [w, h] = getSourceDimensions(pixels);
+      if (w === 0 || h === 0) {
+        console.warn(`Texture size is invalid ${w} x ${h}. Update is skipped;`);
 
         return;
       }