CoderLearningCode
diff --git a/‎src/resources/parser/material/json-standard-material.js
Lines changed: 1 addition & 1 deletion b/‎src/resources/parser/material/json-standard-material.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/scene/materials/basic-material.js
Lines changed: 1 addition & 1 deletion b/‎src/scene/materials/basic-material.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/scene/materials/material.js
Lines changed: 1 addition & 1 deletion b/‎src/scene/materials/material.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/scene/materials/standard-material-options-builder.js
Lines changed: 23 additions & 31 deletions b/‎src/scene/materials/standard-material-options-builder.js
Lines changed: 23 additions & 31 deletions
@@ -48,7 +48,7 @@ class JsonStandardMaterialParser {
         }
 
         if (data.chunks) {
-            material.chunks.copy(data.chunks);
+            material.chunks = { ...data.chunks };
         }
 
         // initialize material values from the input data
 
@@ -56,7 +56,7 @@ class BasicMaterial extends Material {
         return clone;
     }
 
-    updateUniforms() {
+    updateUniforms(device, scene) {
         this.clearParameters();
 
         this.colorUniform[0] = this.color.r;
 
@@ -307,7 +307,7 @@ class Material {
         }
     }
 
-    updateUniforms() {
+    updateUniforms(device, scene) {
     }
 
     updateShader(device, scene, objDefs) {
 
@@ -273,7 +273,7 @@ StandardMaterialOptionsBuilder.prototype._updateTexOptions = function (options,
             if (stdMat[uname] === 1 && !hasUv1) allow = false;
             if (allow) {
                 options[mname] = !!stdMat[mname];
-                options[tname] = this._getMapTransformID(stdMat[tname], stdMat[uname]);
+                options[tname] = this._getMapTransformID(stdMat.getUniform(tname), stdMat[uname]);
                 options[cname] = stdMat[cname];
                 options[uname] = stdMat[uname];
             }
@@ -308,42 +308,34 @@ StandardMaterialOptionsBuilder.prototype._collectLights = function (lType, light
     }
 };
 
+const arraysEqual = (a, b) => {
+    if (a.length !== b.length) {
+        return false;
+    }
+    for (let i = 0; i < a.length; ++i) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+    return true;
+};
+
 StandardMaterialOptionsBuilder.prototype._getMapTransformID = function (xform, uv) {
     if (!xform) return 0;
-    if (!this._mapXForms[uv]) this._mapXForms[uv] = [];
-
-    var i, same;
-    for (i = 0; i < this._mapXForms[uv].length; i++) {
-        same = true;
-        if (this._mapXForms[uv][i][0] !== xform.x) {
-            same = false;
-            break;
-        }
-        if (this._mapXForms[uv][i][1] !== xform.y) {
-            same = false;
-            break;
-        }
-        if (this._mapXForms[uv][i][2] !== xform.z) {
-            same = false;
-            break;
-        }
-        if (this._mapXForms[uv][i][3] !== xform.w) {
-            same = false;
-            break;
-        }
-        if (same) {
+
+    let xforms = this._mapXForms[uv];
+    if (!xforms) {
+        xforms = [];
+        this._mapXForms[uv] = xforms;
+    }
+
+    for (let i = 0; i < xforms.length; i++) {
+        if (arraysEqual(xforms[i], xform)) {
             return i + 1;
         }
     }
-    var newID = this._mapXForms[uv].length;
-    this._mapXForms[uv][newID] = [];
-
-    this._mapXForms[uv][newID][0] = xform.x;
-    this._mapXForms[uv][newID][1] = xform.y;
-    this._mapXForms[uv][newID][2] = xform.z;
-    this._mapXForms[uv][newID][3] = xform.w;
 
-    return newID + 1;
+    return xforms.push(xform);
 };
 
 export { StandardMaterialOptionsBuilder };
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class JsonStandardMaterialParser {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if (data.chunks) {`
`51`		`- material.chunks.copy(data.chunks);`
	`51`	`+ material.chunks = { ...data.chunks };`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// initialize material values from the input data`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class BasicMaterial extends Material {`
`56`	`56`	`return clone;`
`57`	`57`	`}`
`58`	`58`
`59`		`- updateUniforms() {`
	`59`	`+ updateUniforms(device, scene) {`
`60`	`60`	`this.clearParameters();`
`61`	`61`
`62`	`62`	`this.colorUniform[0] = this.color.r;`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ class Material {`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`
`310`		`- updateUniforms() {`
	`310`	`+ updateUniforms(device, scene) {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`updateShader(device, scene, objDefs) {`