Merge pull request #13339 from Popov72/nme-fix-inputtype

NME: Fix of input types allowed for some blocks
BabylonJS · Dec 12, 2022 · ae5d9a1 · ae5d9a1
2 parents ab9c235 + 9f608fd
commit ae5d9a1
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 13 deletions.
diff --git a/packages/dev/core/src/Materials/Node/Blocks/Dual/fogBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Dual/fogBlock.ts
@@ -38,8 +38,12 @@ export class FogBlock extends NodeMaterialBlock {
 
         this.registerOutput("output", NodeMaterialBlockConnectionPointTypes.Color3, NodeMaterialBlockTargets.Fragment);
 
-        this.input.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Color4);
-        this.fogColor.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Color4);
+        this.input.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Color4
+        );
+        this.fogColor.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Color4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Dual/reflectionTextureBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Dual/reflectionTextureBlock.ts
@@ -58,7 +58,9 @@ export class ReflectionTextureBlock extends ReflectionTextureBaseBlock {
         this.registerOutput("b", NodeMaterialBlockConnectionPointTypes.Float, NodeMaterialBlockTargets.Fragment);
         this.registerOutput("a", NodeMaterialBlockConnectionPointTypes.Float, NodeMaterialBlockTargets.Fragment);
 
-        this._inputs[0].addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this._inputs[0].addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/TBNBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/TBNBlock.ts
@@ -23,7 +23,9 @@ export class TBNBlock extends NodeMaterialBlock {
         super(name, NodeMaterialBlockTargets.Fragment, true);
 
         this.registerInput("normal", NodeMaterialBlockConnectionPointTypes.AutoDetect, false);
-        this.normal.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3);
+        this.normal.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color4 | NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3
+        );
         this.registerInput("tangent", NodeMaterialBlockConnectionPointTypes.Vector4, false);
         this.registerInput("world", NodeMaterialBlockConnectionPointTypes.Matrix, false);
 

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/fragmentOutputBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/fragmentOutputBlock.ts
@@ -32,7 +32,9 @@ export class FragmentOutputBlock extends NodeMaterialBlock {
         this.registerInput("rgb", NodeMaterialBlockConnectionPointTypes.AutoDetect, true);
         this.registerInput("a", NodeMaterialBlockConnectionPointTypes.Float, true);
 
-        this.rgb.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Float);
+        this.rgb.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Float
+        );
     }
 
     /** Gets or sets a boolean indicating if content needs to be converted to gamma space */

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/heightToNormalBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/heightToNormalBlock.ts
@@ -25,7 +25,9 @@ export class HeightToNormalBlock extends NodeMaterialBlock {
         this.registerOutput("output", NodeMaterialBlockConnectionPointTypes.Vector4);
         this.registerOutput("xyz", NodeMaterialBlockConnectionPointTypes.Vector3);
 
-        this._inputs[3].addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this._inputs[3].addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/screenSpaceBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/screenSpaceBlock.ts
@@ -25,7 +25,9 @@ export class ScreenSpaceBlock extends NodeMaterialBlock {
         this.registerOutput("x", NodeMaterialBlockConnectionPointTypes.Float);
         this.registerOutput("y", NodeMaterialBlockConnectionPointTypes.Float);
 
-        this.inputs[0].addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this.inputs[0].addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Fragment/shadowMapBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Fragment/shadowMapBlock.ts
@@ -21,7 +21,9 @@ export class ShadowMapBlock extends NodeMaterialBlock {
         this.registerInput("worldNormal", NodeMaterialBlockConnectionPointTypes.AutoDetect, true);
         this.registerOutput("depth", NodeMaterialBlockConnectionPointTypes.Vector3);
 
-        this.worldNormal.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this.worldNormal.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/PBR/clearCoatBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/PBR/clearCoatBlock.ts
@@ -46,7 +46,9 @@ export class ClearCoatBlock extends NodeMaterialBlock {
         this.registerInput("tintThickness", NodeMaterialBlockConnectionPointTypes.Float, true, NodeMaterialBlockTargets.Fragment);
         this.registerInput("worldTangent", NodeMaterialBlockConnectionPointTypes.Vector4, true);
         this.registerInput("worldNormal", NodeMaterialBlockConnectionPointTypes.AutoDetect, true);
-        this.worldNormal.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3);
+        this.worldNormal.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color4 | NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3
+        );
         this.registerInput(
             "TBN",
             NodeMaterialBlockConnectionPointTypes.Object,

diff --git a/packages/dev/core/src/Materials/Node/Blocks/PBR/reflectionBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/PBR/reflectionBlock.ts
@@ -103,7 +103,9 @@ export class ReflectionBlock extends ReflectionTextureBaseBlock {
             new NodeMaterialConnectionPointCustomObject("reflection", this, NodeMaterialConnectionPointDirection.Output, ReflectionBlock, "ReflectionBlock")
         );
 
-        this.position.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this.position.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**

diff --git a/packages/dev/core/src/Materials/Node/Blocks/Vertex/morphTargetsBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/Vertex/morphTargetsBlock.ts
@@ -31,7 +31,9 @@ export class MorphTargetsBlock extends NodeMaterialBlock {
         this.registerInput("position", NodeMaterialBlockConnectionPointTypes.Vector3);
         this.registerInput("normal", NodeMaterialBlockConnectionPointTypes.Vector3);
         this.registerInput("tangent", NodeMaterialBlockConnectionPointTypes.AutoDetect);
-        this.tangent.addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3);
+        this.tangent.addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color4 | NodeMaterialBlockConnectionPointTypes.Vector4 | NodeMaterialBlockConnectionPointTypes.Vector3
+        );
         this.registerInput("uv", NodeMaterialBlockConnectionPointTypes.Vector2);
         this.registerOutput("positionOutput", NodeMaterialBlockConnectionPointTypes.Vector3);
         this.registerOutput("normalOutput", NodeMaterialBlockConnectionPointTypes.Vector3);

diff --git a/packages/dev/core/src/Materials/Node/Blocks/triPlanarBlock.ts b/packages/dev/core/src/Materials/Node/Blocks/triPlanarBlock.ts
@@ -153,8 +153,12 @@ export class TriPlanarBlock extends NodeMaterialBlock {
 
         this.registerOutput("level", NodeMaterialBlockConnectionPointTypes.Float, NodeMaterialBlockTargets.Neutral);
 
-        this._inputs[0].addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
-        this._inputs[1].addExcludedConnectionPointFromAllowedTypes(NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4);
+        this._inputs[0].addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
+        this._inputs[1].addExcludedConnectionPointFromAllowedTypes(
+            NodeMaterialBlockConnectionPointTypes.Color3 | NodeMaterialBlockConnectionPointTypes.Vector3 | NodeMaterialBlockConnectionPointTypes.Vector4
+        );
     }
 
     /**