@babylonjs/core 7.26.0 → 7.26.2

package/Materials/Node/Blocks/storageWriteBlock.js

@@ -0,0 +1,62 @@
+import { NodeMaterialBlock } from "../nodeMaterialBlock.js";
+import { NodeMaterialBlockConnectionPointTypes } from "../Enums/nodeMaterialBlockConnectionPointTypes.js";
+import { NodeMaterialBlockTargets } from "../Enums/nodeMaterialBlockTargets.js";
+import { RegisterClass } from "../../../Misc/typeStore.js";
+import { LoopBlock } from "./loopBlock.js";
+import { NodeMaterialConnectionPointCustomObject } from "../nodeMaterialConnectionPointCustomObject.js";
+/**
+ * Block used to write to a variable within a loop
+ */
+export class StorageWriteBlock extends NodeMaterialBlock {
+    /**
+     * Creates a new StorageWriteBlock
+     * @param name defines the block name
+     */
+    constructor(name) {
+        super(name, NodeMaterialBlockTargets.Neutral);
+        this.registerInput("loopID", NodeMaterialBlockConnectionPointTypes.Object, false, undefined, new NodeMaterialConnectionPointCustomObject("loopID", this, 0 /* NodeMaterialConnectionPointDirection.Input */, LoopBlock, "LoopBlock"));
+        this.registerInput("value", NodeMaterialBlockConnectionPointTypes.AutoDetect);
+        this._linkConnectionTypes(0, 1);
+    }
+    /**
+     * Gets the current class name
+     * @returns the class name
+     */
+    getClassName() {
+        return "StorageWriteBlock";
+    }
+    /**
+     * Gets the loop link component
+     */
+    get loopID() {
+        return this._inputs[0];
+    }
+    /**
+     * Gets the value component
+     */
+    get value() {
+        return this._inputs[1];
+    }
+    /** Gets a boolean indicating that this connection will be used in the fragment shader
+     * @returns true if connected in fragment shader
+     */
+    isConnectedInFragmentShader() {
+        if (!this.loopID.isConnected) {
+            return false;
+        }
+        const loopBlock = this.loopID.connectedPoint.ownerBlock;
+        return loopBlock.output.isConnectedInFragmentShader;
+    }
+    _buildBlock(state) {
+        super._buildBlock(state);
+        const value = this.value;
+        if (!this.loopID.isConnected) {
+            return this;
+        }
+        const loopBlock = this.loopID.connectedPoint.ownerBlock;
+        state.compilationString += `${loopBlock.output.associatedVariableName} = ${value.associatedVariableName};\n`;
+        return this;
+    }
+}
+RegisterClass("BABYLON.StorageWriteBlock", StorageWriteBlock);
+//# sourceMappingURL=storageWriteBlock.js.map

package/Materials/Node/Blocks/storageWriteBlock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storageWriteBlock.js","sourceRoot":"","sources":["../../../../../../dev/core/src/Materials/Node/Blocks/storageWriteBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qCAAqC,EAAE,MAAM,gDAAgD,CAAC;AAGvG,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uCAAuC,EAAE,MAAM,4CAA4C,CAAC;AACrG;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IACpD;;;OAGG;IACH,YAAmB,IAAY;QAC3B,KAAK,CAAC,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,aAAa,CACd,QAAQ,EACR,qCAAqC,CAAC,MAAM,EAC5C,KAAK,EACL,SAAS,EACT,IAAI,uCAAuC,CAAC,QAAQ,EAAE,IAAI,sDAA8C,SAAS,EAAE,WAAW,CAAC,CAClI,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,qCAAqC,CAAC,UAAU,CAAC,CAAC;QAE9E,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACa,YAAY;QACxB,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAW,KAAK;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED;;OAEG;IACa,2BAA2B;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC1B,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,UAAuB,CAAC;QAEtE,OAAO,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC;IACxD,CAAC;IAEkB,WAAW,CAAC,KAA6B;QACxD,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC1B,OAAO,IAAI,CAAC;SACf;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,UAAuB,CAAC;QAEtE,KAAK,CAAC,iBAAiB,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,sBAAsB,MAAM,KAAK,CAAC,sBAAsB,KAAK,CAAC;QAE7G,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAED,aAAa,CAAC,2BAA2B,EAAE,iBAAiB,CAAC,CAAC","sourcesContent":["import { NodeMaterialBlock } from \"../nodeMaterialBlock\";\r\nimport { NodeMaterialBlockConnectionPointTypes } from \"../Enums/nodeMaterialBlockConnectionPointTypes\";\r\nimport type { NodeMaterialBuildState } from \"../nodeMaterialBuildState\";\r\nimport { NodeMaterialConnectionPointDirection, type NodeMaterialConnectionPoint } from \"../nodeMaterialBlockConnectionPoint\";\r\nimport { NodeMaterialBlockTargets } from \"../Enums/nodeMaterialBlockTargets\";\r\nimport { RegisterClass } from \"../../../Misc/typeStore\";\r\nimport { LoopBlock } from \"./loopBlock\";\r\nimport { NodeMaterialConnectionPointCustomObject } from \"../nodeMaterialConnectionPointCustomObject\";\r\n/**\r\n * Block used to write to a variable within a loop\r\n */\r\nexport class StorageWriteBlock extends NodeMaterialBlock {\r\n    /**\r\n     * Creates a new StorageWriteBlock\r\n     * @param name defines the block name\r\n     */\r\n    public constructor(name: string) {\r\n        super(name, NodeMaterialBlockTargets.Neutral);\r\n\r\n        this.registerInput(\r\n            \"loopID\",\r\n            NodeMaterialBlockConnectionPointTypes.Object,\r\n            false,\r\n            undefined,\r\n            new NodeMaterialConnectionPointCustomObject(\"loopID\", this, NodeMaterialConnectionPointDirection.Input, LoopBlock, \"LoopBlock\")\r\n        );\r\n        this.registerInput(\"value\", NodeMaterialBlockConnectionPointTypes.AutoDetect);\r\n\r\n        this._linkConnectionTypes(0, 1);\r\n    }\r\n\r\n    /**\r\n     * Gets the current class name\r\n     * @returns the class name\r\n     */\r\n    public override getClassName() {\r\n        return \"StorageWriteBlock\";\r\n    }\r\n\r\n    /**\r\n     * Gets the loop link component\r\n     */\r\n    public get loopID(): NodeMaterialConnectionPoint {\r\n        return this._inputs[0];\r\n    }\r\n\r\n    /**\r\n     * Gets the value component\r\n     */\r\n    public get value(): NodeMaterialConnectionPoint {\r\n        return this._inputs[1];\r\n    }\r\n\r\n    /** Gets a boolean indicating that this connection will be used in the fragment shader\r\n     * @returns true if connected in fragment shader\r\n     */\r\n    public override isConnectedInFragmentShader() {\r\n        if (!this.loopID.isConnected) {\r\n            return false;\r\n        }\r\n        const loopBlock = this.loopID.connectedPoint!.ownerBlock as LoopBlock;\r\n\r\n        return loopBlock.output.isConnectedInFragmentShader;\r\n    }\r\n\r\n    protected override _buildBlock(state: NodeMaterialBuildState) {\r\n        super._buildBlock(state);\r\n\r\n        const value = this.value;\r\n\r\n        if (!this.loopID.isConnected) {\r\n            return this;\r\n        }\r\n\r\n        const loopBlock = this.loopID.connectedPoint!.ownerBlock as LoopBlock;\r\n\r\n        state.compilationString += `${loopBlock.output.associatedVariableName} = ${value.associatedVariableName};\\n`;\r\n\r\n        return this;\r\n    }\r\n}\r\n\r\nRegisterClass(\"BABYLON.StorageWriteBlock\", StorageWriteBlock);\r\n"]}

package/Materials/Node/nodeMaterial.d.ts

@@ -370,6 +370,7 @@ export declare class NodeMaterial extends PushMaterial {
      */
     needAlphaTesting(): boolean;
     private _processInitializeOnLink;
+    private _attachBlock;
     private _initializeBlock;
     private _resetDualBlocks;
     /**

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