Fix tiny issues #6012

BabylonJS · Sep 10, 2019 · 75b1acb · 75b1acb
1 parent 0b4e25c
commit 75b1acb
Show file tree

Hide file tree

Showing 22 changed files with 234 additions and 125 deletions.
diff --git a/dist/preview release/babylon.js b/dist/preview release/babylon.js
diff --git a/dist/preview release/babylon.max.js b/dist/preview release/babylon.max.js
diff --git a/dist/preview release/babylon.max.js.map b/dist/preview release/babylon.max.js.map
diff --git a/dist/preview release/babylon.module.d.ts b/dist/preview release/babylon.module.d.ts
@@ -54556,6 +54556,7 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/reflectionTextureBlock" {
     import { Mesh } from "babylonjs/Meshes/mesh";
     import { Nullable } from "babylonjs/types";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/reflectionFunction";
     /**
      * Block used to read a reflection texture from a sampler
      */
@@ -55763,6 +55764,8 @@ declare module "babylonjs/Materials/Node/Blocks/Vertex/bonesBlock" {
     import { Effect, EffectFallbacks } from "babylonjs/Materials/effect";
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/bonesDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/bonesVertex";
     /**
      * Block used to add support for vertex skinning (bones)
      */
@@ -55871,6 +55874,8 @@ declare module "babylonjs/Materials/Node/Blocks/Vertex/morphTargetsBlock" {
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
+    import "babylonjs/Shaders/ShadersInclude/morphTargetsVertexDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/morphTargetsVertexGlobalDeclaration";
     /**
      * Block used to add morph targets support to vertex shader
      */
@@ -56027,6 +56032,9 @@ declare module "babylonjs/Materials/Node/Blocks/Fragment/imageProcessingBlock" {
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
+    import "babylonjs/Shaders/ShadersInclude/helperFunctions";
+    import "babylonjs/Shaders/ShadersInclude/imageProcessingDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/imageProcessingFunctions";
     /**
      * Block used to add image processing support to fragment shader
      */
@@ -56069,6 +56077,8 @@ declare module "babylonjs/Materials/Node/Blocks/Fragment/perturbNormalBlock" {
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/bumpFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/bumpFragment";
     /**
      * Block used to pertub normals based on a normal map
      */
@@ -56135,6 +56145,7 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/fogBlock" {
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/fogFragmentDeclaration";
     /**
      * Block used to add support for scene fog
      */
@@ -56188,6 +56199,13 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/lightBlock" {
     import { Light } from "babylonjs/Lights/light";
     import { Nullable } from "babylonjs/types";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/lightFragmentDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/lightUboDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/lightFragment";
+    import "babylonjs/Shaders/ShadersInclude/helperFunctions";
+    import "babylonjs/Shaders/ShadersInclude/lightsFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/shadowsFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/shadowsVertex";
     /**
      * Block used to add light in the fragment shader
      */
@@ -57002,6 +57020,7 @@ declare module "babylonjs/Materials/Node/Blocks/fresnelBlock" {
     import { NodeMaterialBuildState } from "babylonjs/Materials/Node/nodeMaterialBuildState";
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { NodeMaterial } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/fresnelFunction";
     /**
      * Block used to compute fresnel value
      */

diff --git a/dist/preview release/gui/babylon.gui.js b/dist/preview release/gui/babylon.gui.js
diff --git a/dist/preview release/gui/babylon.gui.js.map b/dist/preview release/gui/babylon.gui.js.map
diff --git a/dist/preview release/nodeEditor/babylon.nodeEditor.js b/dist/preview release/nodeEditor/babylon.nodeEditor.js
diff --git a/dist/preview release/nodeEditor/babylon.nodeEditor.max.js b/dist/preview release/nodeEditor/babylon.nodeEditor.max.js
diff --git a/dist/preview release/nodeEditor/babylon.nodeEditor.max.js.map b/dist/preview release/nodeEditor/babylon.nodeEditor.max.js.map
diff --git a/dist/preview release/viewer/babylon.module.d.ts b/dist/preview release/viewer/babylon.module.d.ts
@@ -54556,6 +54556,7 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/reflectionTextureBlock" {
     import { Mesh } from "babylonjs/Meshes/mesh";
     import { Nullable } from "babylonjs/types";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/reflectionFunction";
     /**
      * Block used to read a reflection texture from a sampler
      */
@@ -55763,6 +55764,8 @@ declare module "babylonjs/Materials/Node/Blocks/Vertex/bonesBlock" {
     import { Effect, EffectFallbacks } from "babylonjs/Materials/effect";
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/bonesDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/bonesVertex";
     /**
      * Block used to add support for vertex skinning (bones)
      */
@@ -55871,6 +55874,8 @@ declare module "babylonjs/Materials/Node/Blocks/Vertex/morphTargetsBlock" {
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
+    import "babylonjs/Shaders/ShadersInclude/morphTargetsVertexDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/morphTargetsVertexGlobalDeclaration";
     /**
      * Block used to add morph targets support to vertex shader
      */
@@ -56027,6 +56032,9 @@ declare module "babylonjs/Materials/Node/Blocks/Fragment/imageProcessingBlock" {
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
+    import "babylonjs/Shaders/ShadersInclude/helperFunctions";
+    import "babylonjs/Shaders/ShadersInclude/imageProcessingDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/imageProcessingFunctions";
     /**
      * Block used to add image processing support to fragment shader
      */
@@ -56069,6 +56077,8 @@ declare module "babylonjs/Materials/Node/Blocks/Fragment/perturbNormalBlock" {
     import { Effect } from "babylonjs/Materials/effect";
     import { Mesh } from "babylonjs/Meshes/mesh";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/bumpFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/bumpFragment";
     /**
      * Block used to pertub normals based on a normal map
      */
@@ -56135,6 +56145,7 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/fogBlock" {
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { AbstractMesh } from "babylonjs/Meshes/abstractMesh";
     import { NodeMaterial, NodeMaterialDefines } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/fogFragmentDeclaration";
     /**
      * Block used to add support for scene fog
      */
@@ -56188,6 +56199,13 @@ declare module "babylonjs/Materials/Node/Blocks/Dual/lightBlock" {
     import { Light } from "babylonjs/Lights/light";
     import { Nullable } from "babylonjs/types";
     import { Scene } from "babylonjs/scene";
+    import "babylonjs/Shaders/ShadersInclude/lightFragmentDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/lightUboDeclaration";
+    import "babylonjs/Shaders/ShadersInclude/lightFragment";
+    import "babylonjs/Shaders/ShadersInclude/helperFunctions";
+    import "babylonjs/Shaders/ShadersInclude/lightsFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/shadowsFragmentFunctions";
+    import "babylonjs/Shaders/ShadersInclude/shadowsVertex";
     /**
      * Block used to add light in the fragment shader
      */
@@ -57002,6 +57020,7 @@ declare module "babylonjs/Materials/Node/Blocks/fresnelBlock" {
     import { NodeMaterialBuildState } from "babylonjs/Materials/Node/nodeMaterialBuildState";
     import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
     import { NodeMaterial } from "babylonjs/Materials/Node/nodeMaterial";
+    import "babylonjs/Shaders/ShadersInclude/fresnelFunction";
     /**
      * Block used to compute fresnel value
      */

diff --git a/dist/preview release/viewer/babylon.viewer.js b/dist/preview release/viewer/babylon.viewer.js
diff --git a/dist/preview release/viewer/babylon.viewer.max.js b/dist/preview release/viewer/babylon.viewer.max.js
diff --git a/nodeEditor/src/components/preview/previewManager.ts b/nodeEditor/src/components/preview/previewManager.ts
@@ -65,6 +65,7 @@ export class PreviewManager {
         this._camera.lowerRadiusLimit = 3;
         this._camera.upperRadiusLimit = 10;
         this._camera.wheelPrecision = 20;
+        this._camera.minZ = 0.1;
         this._camera.attachControl(targetCanvas, false);
 
         this._refreshPreviewMesh();

diff --git a/nodeEditor/src/graphEditor.tsx b/nodeEditor/src/graphEditor.tsx
@@ -393,7 +393,7 @@ export class GraphEditor extends React.Component<IGraphEditorProps> {
                             }
                         }
                     } else {
-                        if (!e.link.targetPort && e.link.sourcePort && (e.link.sourcePort as DefaultPortModel).position === "input") {
+                        if (!e.link.targetPort && e.link.sourcePort && (e.link.sourcePort as DefaultPortModel).position === "input" && !(e.link.sourcePort as DefaultPortModel).connection!.isConnected) {
                             // Drag from input port, we are going to build an input for it                            
                             let input = e.link.sourcePort as DefaultPortModel;
 

diff --git a/src/Materials/Node/Blocks/Dual/fogBlock.ts b/src/Materials/Node/Blocks/Dual/fogBlock.ts
@@ -12,6 +12,8 @@ import { NodeMaterial, NodeMaterialDefines } from '../../nodeMaterial';
 import { InputBlock } from '../Input/inputBlock';
 import { _TypeStore } from '../../../../Misc/typeStore';
 
+import "../../../../Shaders/ShadersInclude/fogFragmentDeclaration";
+
 /**
  * Block used to add support for scene fog
  */

diff --git a/src/Materials/Node/Blocks/Dual/lightBlock.ts b/src/Materials/Node/Blocks/Dual/lightBlock.ts
@@ -15,6 +15,14 @@ import { Nullable } from '../../../../types';
 import { _TypeStore } from '../../../../Misc/typeStore';
 import { Scene } from '../../../../scene';
 
+import "../../../../Shaders/ShadersInclude/lightFragmentDeclaration";
+import "../../../../Shaders/ShadersInclude/lightUboDeclaration";
+import "../../../../Shaders/ShadersInclude/lightFragment";
+import "../../../../Shaders/ShadersInclude/helperFunctions";
+import "../../../../Shaders/ShadersInclude/lightsFragmentFunctions";
+import "../../../../Shaders/ShadersInclude/shadowsFragmentFunctions";
+import "../../../../Shaders/ShadersInclude/shadowsVertex";
+
 /**
  * Block used to add light in the fragment shader
  */

diff --git a/src/Materials/Node/Blocks/Dual/reflectionTextureBlock.ts b/src/Materials/Node/Blocks/Dual/reflectionTextureBlock.ts
@@ -16,6 +16,8 @@ import { InputBlock } from '../Input/inputBlock';
 import { NodeMaterialSystemValues } from '../../nodeMaterialSystemValues';
 import { Constants } from '../../../../Engines/constants';
 
+import "../../../../Shaders/ShadersInclude/reflectionFunction";
+
 /**
  * Block used to read a reflection texture from a sampler
  */

diff --git a/src/Materials/Node/Blocks/Fragment/imageProcessingBlock.ts b/src/Materials/Node/Blocks/Fragment/imageProcessingBlock.ts
@@ -9,6 +9,10 @@ import { Effect } from '../../../effect';
 import { Mesh } from '../../../../Meshes/mesh';
 import { _TypeStore } from '../../../../Misc/typeStore';
 
+import "../../../../Shaders/ShadersInclude/helperFunctions";
+import "../../../../Shaders/ShadersInclude/imageProcessingDeclaration";
+import "../../../../Shaders/ShadersInclude/imageProcessingFunctions";
+
 /**
  * Block used to add image processing support to fragment shader
  */

diff --git a/src/Materials/Node/Blocks/Fragment/perturbNormalBlock.ts b/src/Materials/Node/Blocks/Fragment/perturbNormalBlock.ts
@@ -11,6 +11,9 @@ import { Effect } from '../../../effect';
 import { Mesh } from '../../../../Meshes/mesh';
 import { Scene } from '../../../../scene';
 
+import "../../../../Shaders/ShadersInclude/bumpFragmentFunctions";
+import "../../../../Shaders/ShadersInclude/bumpFragment";
+
 /**
  * Block used to pertub normals based on a normal map
  */
@@ -136,7 +139,8 @@ export class PerturbNormalBlock extends NodeMaterialBlock {
             replaceStrings: [
                 { search: /vBumpInfos.y/g, replace: `1.0 / ${this.strength.associatedVariableName}`},
                 { search: /vTangentSpaceParams/g, replace: this._tangentSpaceParameterName},
-                { search: /vPositionW/g, replace: worldPosition.associatedVariableName + ".xyz"}
+                { search: /vPositionW/g, replace: worldPosition.associatedVariableName + ".xyz"},
+                { search: /defined\(TANGENT\)/g, replace: "defined(IGNORE)" }
             ]
         });
         state.compilationString += this._declareOutput(this.output, state) + " = vec4(0.);\r\n";
@@ -147,7 +151,8 @@ export class PerturbNormalBlock extends NodeMaterialBlock {
                 { search: /vBumpUV/g, replace: uv.associatedVariableName},
                 { search: /vPositionW/g, replace: worldPosition.associatedVariableName + ".xyz"},
                 { search: /normalW=/g, replace: this.output.associatedVariableName + ".xyz = " },
-                { search: /normalW/g, replace: worldNormal.associatedVariableName + ".xyz" }
+                { search: /normalW/g, replace: worldNormal.associatedVariableName + ".xyz" },
+                { search: /defined\(TANGENT\)/g, replace: "defined(IGNORE)" }
             ]
         });
 

diff --git a/src/Materials/Node/Blocks/Vertex/bonesBlock.ts b/src/Materials/Node/Blocks/Vertex/bonesBlock.ts
@@ -12,6 +12,9 @@ import { NodeMaterial, NodeMaterialDefines } from '../../nodeMaterial';
 import { InputBlock } from '../Input/inputBlock';
 import { _TypeStore } from '../../../../Misc/typeStore';
 
+import "../../../../Shaders/ShadersInclude/bonesDeclaration";
+import "../../../../Shaders/ShadersInclude/bonesVertex";
+
 /**
  * Block used to add support for vertex skinning (bones)
  */

diff --git a/src/Materials/Node/Blocks/Vertex/morphTargetsBlock.ts b/src/Materials/Node/Blocks/Vertex/morphTargetsBlock.ts
@@ -12,6 +12,9 @@ import { VertexBuffer } from '../../../../Meshes/buffer';
 import { InputBlock } from '../Input/inputBlock';
 import { _TypeStore } from '../../../../Misc/typeStore';
 
+import "../../../../Shaders/ShadersInclude/morphTargetsVertexDeclaration";
+import "../../../../Shaders/ShadersInclude/morphTargetsVertexGlobalDeclaration";
+
 /**
  * Block used to add morph targets support to vertex shader
  */

diff --git a/src/Materials/Node/Blocks/fresnelBlock.ts b/src/Materials/Node/Blocks/fresnelBlock.ts
@@ -7,6 +7,8 @@ import { _TypeStore } from '../../../Misc/typeStore';
 import { InputBlock } from './Input/inputBlock';
 import { NodeMaterial } from '../nodeMaterial';
 
+import "../../../Shaders/ShadersInclude/fresnelFunction";
+
 /**
  * Block used to compute fresnel value
  */