Merge pull request #1335 from actnwit/fix/fix2

Fix: test works
actnwit · May 18, 2024 · f1b9300 · f1b9300
2 parents ff21bd4 + e495a11
commit f1b9300
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/foundation/materials/core/Material.ts b/src/foundation/materials/core/Material.ts
@@ -284,6 +284,8 @@ export class Material extends RnObject {
     );
     this._shaderProgramUid = programUid;
 
+    Material.__stateVersion++;
+
     return programUid;
   }
 
@@ -302,6 +304,7 @@ export class Material extends RnObject {
     );
 
     this._shaderProgramUid = programUid;
+    Material.__stateVersion++;
   }
 
   /**
@@ -329,6 +332,7 @@ export class Material extends RnObject {
       // this.__updatedShaderSources = updatedShaderSources;
     }
 
+    Material.__stateVersion++;
     return programUid;
   }
 

diff --git a/src/foundation/math/MathClassUtil.ts b/src/foundation/math/MathClassUtil.ts
@@ -545,7 +545,7 @@ export class MathClassUtil {
     } else if (Array.isArray(objForDetectType)) {
       let isSame = true;
       for (let i = 0; i < objForDetectType.length; i++) {
-        if (objForDetectType[i] !== val[i]) {
+        if (objForDetectType[i] !== val._v[i]) {
           isSame = false;
           break;
         }

diff --git a/src/foundation/renderer/RenderPass.ts b/src/foundation/renderer/RenderPass.ts
@@ -451,7 +451,8 @@ export class RenderPass extends RnObject {
   getAppropriateMaterial(primitive: Primitive): Material {
     let material = this._getMaterialOf(primitive);
 
-    if (this.__material != null) {
+    if (material != null) {
+    } else if (this.__material != null) {
       material = this.__material;
     } else {
       material = primitive.material;