@babylonjs/core 7.25.2 → 7.26.1

package/Materials/Node/nodeMaterial.js

@@ -530,12 +530,7 @@ export class NodeMaterial extends PushMaterial {
         }
         this._initializeBlock(block, state, nodesToProcessForOtherBuildState, autoConfigure);
     }
-    _initializeBlock(node, state, nodesToProcessForOtherBuildState, autoConfigure = true) {
-        node.initialize(state);
-        if (autoConfigure) {
-            node.autoConfigure(this);
-        }
-        node._preparationId = this._buildId;
+    _attachBlock(node) {
         if (this.attachedBlocks.indexOf(node) === -1) {
             if (node.isUnique) {
                 const className = node.getClassName();
@@ -548,18 +543,41 @@ export class NodeMaterial extends PushMaterial {
             }
             this.attachedBlocks.push(node);
         }
+    }
+    _initializeBlock(node, state, nodesToProcessForOtherBuildState, autoConfigure = true) {
+        node.initialize(state);
+        if (autoConfigure) {
+            node.autoConfigure(this);
+        }
+        node._preparationId = this._buildId;
+        this._attachBlock(node);
         for (const input of node.inputs) {
             input.associatedVariableName = "";
             const connectedPoint = input.connectedPoint;
-            if (connectedPoint) {
+            if (connectedPoint && !connectedPoint._preventBubbleUp) {
                 const block = connectedPoint.ownerBlock;
                 if (block !== node) {
                     this._processInitializeOnLink(block, state, nodesToProcessForOtherBuildState, autoConfigure);
                 }
             }
         }
-        // Teleportation
-        if (node.isTeleportOut) {
+        // Loop
+        if (node.isLoop) {
+            // We need to keep the storage write block in the active blocks
+            const loopBlock = node;
+            if (loopBlock.loopID.hasEndpoints) {
+                for (const endpoint of loopBlock.loopID.endpoints) {
+                    const block = endpoint.ownerBlock;
+                    if (block.outputs.length !== 0) {
+                        continue;
+                    }
+                    state._terminalBlocks.add(block); // Attach the storage write only
+                    this._processInitializeOnLink(block, state, nodesToProcessForOtherBuildState, autoConfigure);
+                }
+            }
+        }
+        else if (node.isTeleportOut) {
+            // Teleportation
             const teleport = node;
             if (teleport.entryPoint) {
                 this._processInitializeOnLink(teleport.entryPoint, state, nodesToProcessForOtherBuildState, autoConfigure);
@@ -573,9 +591,9 @@ export class NodeMaterial extends PushMaterial {
         if (node.target === NodeMaterialBlockTargets.VertexAndFragment) {
             node.buildId = id;
         }
-        for (const inputs of node.inputs) {
-            const connectedPoint = inputs.connectedPoint;
-            if (connectedPoint) {
+        for (const input of node.inputs) {
+            const connectedPoint = input.connectedPoint;
+            if (connectedPoint && !connectedPoint._preventBubbleUp) {
                 const block = connectedPoint.ownerBlock;
                 if (block !== node) {
                     this._resetDualBlocks(block, id);
@@ -589,6 +607,19 @@ export class NodeMaterial extends PushMaterial {
                 this._resetDualBlocks(teleportOut.entryPoint, id);
             }
         }
+        else if (node.isLoop) {
+            // Loop
+            const loopBlock = node;
+            if (loopBlock.loopID.hasEndpoints) {
+                for (const endpoint of loopBlock.loopID.endpoints) {
+                    const block = endpoint.ownerBlock;
+                    if (block.outputs.length !== 0) {
+                        continue;
+                    }
+                    this._resetDualBlocks(block, id);
+                }
+            }
+        }
     }
     /**
      * Remove a block from the current node material
@@ -1416,6 +1447,7 @@ export class NodeMaterial extends PushMaterial {
         this._vertexOutputNodes.length = 0;
         this._fragmentOutputNodes.length = 0;
         this.attachedBlocks.length = 0;
+        this._buildIsInProgress = false;
     }
     /**
      * Clear the current material and set it to a default state