@babylonjs/core 8.11.0 → 8.12.0

package/Materials/Node/nodeMaterial.js

@@ -2,7 +2,6 @@ import { __decorate } from "../../tslib.es6.js";
 import { PushMaterial } from "../pushMaterial.js";
 import { Matrix, Vector2 } from "../../Maths/math.vector.js";
 import { Color3, Color4 } from "../../Maths/math.color.js";
-import { Mesh } from "../../Meshes/mesh.js";
 import { NodeMaterialBuildState } from "./nodeMaterialBuildState.js";
 import { Effect } from "../effect.js";
 import { Observable } from "../../Misc/observable.js";
@@ -574,8 +573,8 @@ export class NodeMaterial extends PushMaterial {
                 const className = node.getClassName();
                 for (const other of this.attachedBlocks) {
                     if (other.getClassName() === className) {
-                        // eslint-disable-next-line no-throw-literal
-                        throw `Cannot have multiple blocks of type ${className} in the same NodeMaterial`;
+                        this._sharedData.raiseBuildError(`Cannot have multiple blocks of type ${className} in the same NodeMaterial`);
+                        return;
                     }
                 }
             }
@@ -692,12 +691,14 @@ export class NodeMaterial extends PushMaterial {
         const engine = this.getScene().getEngine();
         const allowEmptyVertexProgram = this._mode === NodeMaterialModes.Particle || this._mode === NodeMaterialModes.SFE;
         if (this._vertexOutputNodes.length === 0 && !allowEmptyVertexProgram) {
-            // eslint-disable-next-line no-throw-literal
-            throw "You must define at least one vertexOutputNode";
+            this.onBuildErrorObservable.notifyObservers("You must define at least one vertexOutputNode");
+            this._buildIsInProgress = false;
+            return;
         }
         if (this._fragmentOutputNodes.length === 0) {
-            // eslint-disable-next-line no-throw-literal
-            throw "You must define at least one fragmentOutputNode";
+            this.onBuildErrorObservable.notifyObservers("You must define at least one fragmentOutputNode");
+            this._buildIsInProgress = false;
+            return;
         }
         // Compilation state
         this._vertexCompilationState = new NodeMaterialBuildState();
@@ -778,18 +779,18 @@ export class NodeMaterial extends PushMaterial {
         if (updateBuildId) {
             this._buildId = NodeMaterial._BuildIdGenerator++;
         }
-        // Errors
-        const noError = this._sharedData.emitErrors(this.onBuildErrorObservable);
         if (verbose) {
             Logger.Log("Vertex shader:");
             Logger.Log(this._vertexCompilationState.compilationString);
             Logger.Log("Fragment shader:");
             Logger.Log(this._fragmentCompilationState.compilationString);
         }
+        // Errors
+        const noError = this._sharedData.emitErrors();
         this._buildIsInProgress = false;
-        this._buildWasSuccessful = true;
         if (noError) {
             this.onBuildObservable.notifyObservers(this);
+            this._buildWasSuccessful = true;
         }
         // Wipe defines
         const meshes = this.getScene().meshes;
@@ -979,9 +980,8 @@ export class NodeMaterial extends PushMaterial {
     _createEffectForPostProcess(postProcess, camera, options = 1, samplingMode = 1, engine, reusable, textureType = 0, textureFormat = 5) {
         let tempName = this.name + this._buildId;
         const defines = new NodeMaterialDefines();
-        const dummyMesh = new Mesh(tempName + "PostProcess", this.getScene());
         let buildId = this._buildId;
-        this._processDefines(dummyMesh, defines);
+        this._processDefines(defines);
         // If no vertex shader emitted, fallback to default postprocess vertex shader
         const vertexCode = this._sharedData.checks.emitVertex ? this._vertexCompilationState._builtCompilationString : undefined;
         Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, vertexCode, this.shaderLanguage);
@@ -992,9 +992,6 @@ export class NodeMaterial extends PushMaterial {
             postProcess.updateEffect(defines.toString(), this._fragmentCompilationState.uniforms, this._fragmentCompilationState.samplers, { maxSimultaneousLights: this.maxSimultaneousLights }, undefined, undefined, tempName, tempName);
         }
         postProcess.nodeMaterialSource = this;
-        postProcess.onDisposeObservable.add(() => {
-            dummyMesh.dispose();
-        });
         postProcess.onApplyObservable.add((effect) => {
             if (buildId !== this._buildId) {
                 delete Effect.ShadersStore[tempName + "VertexShader"];
@@ -1003,7 +1000,7 @@ export class NodeMaterial extends PushMaterial {
                 defines.markAllAsDirty();
                 buildId = this._buildId;
             }
-            const result = this._processDefines(dummyMesh, defines);
+            const result = this._processDefines(defines);
             if (result) {
                 Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, this._vertexCompilationState._builtCompilationString);
                 TimingTools.SetImmediate(() => postProcess.updateEffect(defines.toString(), this._fragmentCompilationState.uniforms, this._fragmentCompilationState.samplers, { maxSimultaneousLights: this.maxSimultaneousLights }, undefined, undefined, tempName, tempName));
@@ -1025,12 +1022,8 @@ export class NodeMaterial extends PushMaterial {
         }
         let tempName = this.name + this._buildId;
         const proceduralTexture = new ProceduralTexture(tempName, size, null, scene);
-        const dummyMesh = new Mesh(tempName + "Procedural", this.getScene());
-        dummyMesh.reservedDataStore = {
-            hidden: true,
-        };
         const defines = new NodeMaterialDefines();
-        const result = this._processDefines(dummyMesh, defines);
+        const result = this._processDefines(defines);
         Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, this._vertexCompilationState._builtCompilationString, this.shaderLanguage);
         let effect = this.getScene().getEngine().createEffect({
             vertexElement: tempName,
@@ -1047,7 +1040,7 @@ export class NodeMaterial extends PushMaterial {
                 defines.markAllAsDirty();
                 buildId = this._buildId;
             }
-            const result = this._processDefines(dummyMesh, defines);
+            const result = this._processDefines(defines);
             if (result) {
                 Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, this._vertexCompilationState._builtCompilationString, this.shaderLanguage);
                 TimingTools.SetImmediate(() => {
@@ -1069,25 +1062,16 @@ export class NodeMaterial extends PushMaterial {
         });
         return proceduralTexture;
     }
-    _createEffectForParticles(particleSystem, blendMode, onCompiled, onError, effect, defines, dummyMesh, particleSystemDefinesJoined = "") {
+    _createEffectForParticles(particleSystem, blendMode, onCompiled, onError, effect, defines, particleSystemDefinesJoined = "") {
         let tempName = this.name + this._buildId + "_" + blendMode;
         if (!defines) {
             defines = new NodeMaterialDefines();
         }
-        if (!dummyMesh) {
-            dummyMesh = this.getScene().getMeshByName(this.name + "Particle");
-            if (!dummyMesh) {
-                dummyMesh = new Mesh(this.name + "Particle", this.getScene());
-                dummyMesh.reservedDataStore = {
-                    hidden: true,
-                };
-            }
-        }
         let buildId = this._buildId;
         const particleSystemDefines = [];
         let join = particleSystemDefinesJoined;
         if (!effect) {
-            const result = this._processDefines(dummyMesh, defines);
+            const result = this._processDefines(defines);
             Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, undefined, this.shaderLanguage);
             particleSystem.fillDefines(particleSystemDefines, blendMode, false);
             join = particleSystemDefines.join("\n");
@@ -1110,14 +1094,14 @@ export class NodeMaterial extends PushMaterial {
                 defines.markAllAsDirty();
                 join = particleSystemDefinesJoinedCurrent;
             }
-            const result = this._processDefines(dummyMesh, defines);
+            const result = this._processDefines(defines);
             if (result) {
                 Effect.RegisterShader(tempName, this._fragmentCompilationState._builtCompilationString, undefined, this.shaderLanguage);
                 effect = this.getScene()
                     .getEngine()
                     .createEffectForParticles(tempName, this._fragmentCompilationState.uniforms, this._fragmentCompilationState.samplers, defines.toString() + "\n" + join, result?.fallbacks, onCompiled, onError, particleSystem);
                 particleSystem.setCustomEffect(effect, blendMode);
-                this._createEffectForParticles(particleSystem, blendMode, onCompiled, onError, effect, defines, dummyMesh, particleSystemDefinesJoined); // add the effect.onBindObservable observer
+                this._createEffectForParticles(particleSystem, blendMode, onCompiled, onError, effect, defines, particleSystemDefinesJoined); // add the effect.onBindObservable observer
                 return;
             }
             this._checkInternals(effect);
@@ -1169,7 +1153,7 @@ export class NodeMaterial extends PushMaterial {
         }
         targetMaterial.shadowDepthWrapper = new BABYLON.ShadowDepthWrapper(this, this.getScene());
     }
-    _processDefines(mesh, defines, useInstances = false, subMesh) {
+    _processDefines(defines, mesh, useInstances = false, subMesh) {
         let result = null;
         // Global defines
         const scene = this.getScene();
@@ -1178,10 +1162,10 @@ export class NodeMaterial extends PushMaterial {
         }
         // Shared defines
         for (const b of this._sharedData.blocksWithDefines) {
-            b.initializeDefines(mesh, this, defines, useInstances);
+            b.initializeDefines(defines);
         }
         for (const b of this._sharedData.blocksWithDefines) {
-            b.prepareDefines(mesh, this, defines, useInstances, subMesh);
+            b.prepareDefines(defines, this, mesh, useInstances, subMesh);
         }
         // Need to recompile?
         if (defines.isDirty) {
@@ -1191,7 +1175,7 @@ export class NodeMaterial extends PushMaterial {
             this._vertexCompilationState.compilationString = this._vertexCompilationState._builtCompilationString;
             this._fragmentCompilationState.compilationString = this._fragmentCompilationState._builtCompilationString;
             for (const b of this._sharedData.repeatableContentBlocks) {
-                b.replaceRepeatableContent(this._vertexCompilationState, this._fragmentCompilationState, mesh, defines);
+                b.replaceRepeatableContent(this._vertexCompilationState, defines, mesh);
             }
             // Uniforms
             const uniformBuffers = [];
@@ -1215,7 +1199,7 @@ export class NodeMaterial extends PushMaterial {
             }
             const fallbacks = new EffectFallbacks();
             for (const b of this._sharedData.blocksWithFallbacks) {
-                b.provideFallbacks(mesh, fallbacks);
+                b.provideFallbacks(fallbacks, mesh);
             }
             result = {
                 lightDisposed,
@@ -1268,7 +1252,7 @@ export class NodeMaterial extends PushMaterial {
         if (this._sharedData.blockingBlocks.some((b) => !b.isReady(mesh, this, defines, useInstances))) {
             return false;
         }
-        const result = this._processDefines(mesh, defines, useInstances, subMesh);
+        const result = this._processDefines(defines, mesh, useInstances, subMesh);
         if (result) {
             const previousEffect = subMesh.effect;
             // Compilation
@@ -1347,7 +1331,9 @@ export class NodeMaterial extends PushMaterial {
         if (!this._buildWasSuccessful) {
             this.build();
         }
-        let processingDefines = "";
+        const defines = new NodeMaterialDefines();
+        this._processDefines(defines);
+        let processingDefines = defines.toString();
         if (this.mode === NodeMaterialModes.SFE) {
             processingDefines += `#define ${SfeModeDefine}\n`;
         }