-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introducing loop support for NME (#15599)
* Initial loop components * Loop done
- Loading branch information
Showing
15 changed files
with
531 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
packages/dev/core/src/Materials/Node/Blocks/loopBlock.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { NodeMaterialBlock } from "../nodeMaterialBlock"; | ||
| import { NodeMaterialBlockConnectionPointTypes } from "../Enums/nodeMaterialBlockConnectionPointTypes"; | ||
| import type { NodeMaterialBuildState } from "../nodeMaterialBuildState"; | ||
| import { NodeMaterialConnectionPointDirection } from "../nodeMaterialBlockConnectionPoint"; | ||
| import type { NodeMaterialConnectionPoint } from "../nodeMaterialBlockConnectionPoint"; | ||
| import { NodeMaterialBlockTargets } from "../Enums/nodeMaterialBlockTargets"; | ||
| import { RegisterClass } from "../../../Misc/typeStore"; | ||
| import { editableInPropertyPage, PropertyTypeForEdition } from "core/Decorators/nodeDecorator"; | ||
| import type { Scene } from "core/scene"; | ||
| import { ShaderLanguage } from "core/Materials/shaderLanguage"; | ||
| import { NodeMaterialConnectionPointCustomObject } from "../nodeMaterialConnectionPointCustomObject"; | ||
| /** | ||
| * Block used to repeat code | ||
| */ | ||
| export class LoopBlock extends NodeMaterialBlock { | ||
| /** | ||
| * Gets or sets number of iterations | ||
| * Will be ignored if the iterations input is connected | ||
| */ | ||
| @editableInPropertyPage("Iterations", PropertyTypeForEdition.Int) | ||
| public iterations = 4; | ||
|
|
||
| /** | ||
| * Creates a new LoopBlock | ||
| * @param name defines the block name | ||
| */ | ||
| public constructor(name: string) { | ||
| super(name, NodeMaterialBlockTargets.Neutral); | ||
|
|
||
| this.registerInput("input", NodeMaterialBlockConnectionPointTypes.AutoDetect); | ||
| this.registerInput("iterations", NodeMaterialBlockConnectionPointTypes.Float, true); | ||
| this.registerOutput("output", NodeMaterialBlockConnectionPointTypes.BasedOnInput); | ||
| this.registerOutput("index", NodeMaterialBlockConnectionPointTypes.Float, NodeMaterialBlockTargets.Fragment); | ||
| this.registerOutput( | ||
| "loopID", | ||
| NodeMaterialBlockConnectionPointTypes.Object, | ||
| undefined, | ||
| new NodeMaterialConnectionPointCustomObject("loopID", this, NodeMaterialConnectionPointDirection.Output, LoopBlock, "LoopBlock") | ||
| ); | ||
|
|
||
| this._outputs[0]._typeConnectionSource = this._inputs[0]; | ||
| this._outputs[0]._forPostBuild = true; | ||
|
|
||
| this._outputs[2]._redirectedSource = this._inputs[0]; | ||
|
|
||
| this._outputs[1]._preventBubbleUp = true; | ||
| this._outputs[2]._preventBubbleUp = true; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the current class name | ||
| * @returns the class name | ||
| */ | ||
| public override getClassName() { | ||
| return "LoopBlock"; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the main input component | ||
| */ | ||
| public get input(): NodeMaterialConnectionPoint { | ||
| return this._inputs[0]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the iterations input component | ||
| */ | ||
| public get iterationsInput(): NodeMaterialConnectionPoint { | ||
| return this._inputs[1]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the output component | ||
| */ | ||
| public get output(): NodeMaterialConnectionPoint { | ||
| return this._outputs[0]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the index component which will be incremented at each iteration | ||
| */ | ||
| public get index(): NodeMaterialConnectionPoint { | ||
| return this._outputs[1]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the loop ID component | ||
| */ | ||
| public get loopID(): NodeMaterialConnectionPoint { | ||
| return this._outputs[2]; | ||
| } | ||
|
|
||
| protected override _buildBlock(state: NodeMaterialBuildState) { | ||
| super._buildBlock(state); | ||
|
|
||
| const output = this._outputs[0]; | ||
| const index = this._outputs[1]; | ||
|
|
||
| const indexName = state._getFreeVariableName("index"); | ||
|
|
||
| const decl = state.shaderLanguage === ShaderLanguage.WGSL ? "var" : "int"; | ||
| const castFloat = state.shaderLanguage === ShaderLanguage.WGSL ? "f32" : "float"; | ||
| const castInt = state.shaderLanguage === ShaderLanguage.WGSL ? "i32" : "int"; | ||
|
|
||
| // Declare storage variable and store initial value | ||
| state.compilationString += state._declareOutput(output) + ` = ${this.input.associatedVariableName};\n`; | ||
|
|
||
| // Iterations | ||
| const iterations = this.iterationsInput.isConnected ? `${castInt}(${this.iterationsInput.associatedVariableName})` : this.iterations; | ||
|
|
||
| // Loop | ||
| state.compilationString += `for (${decl} ${indexName} = 0; ${indexName} < ${iterations}; ${indexName}++){\n`; | ||
| state.compilationString += `${state._declareOutput(index)} = ${castFloat}(${indexName});\n`; | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| protected override _postBuildBlock(state: NodeMaterialBuildState) { | ||
| super._postBuildBlock(state); | ||
|
|
||
| state.compilationString += `}\n`; | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| protected override _dumpPropertiesCode() { | ||
| return super._dumpPropertiesCode() + `${this._codeVariableName}.iterations = ${this.iterations};\n`; | ||
| } | ||
|
|
||
| public override serialize(): any { | ||
| const serializationObject = super.serialize(); | ||
|
|
||
| serializationObject.iterations = this.iterations; | ||
|
|
||
| return serializationObject; | ||
| } | ||
|
|
||
| public override _deserialize(serializationObject: any, scene: Scene, rootUrl: string) { | ||
| super._deserialize(serializationObject, scene, rootUrl); | ||
|
|
||
| this.iterations = serializationObject.iterations; | ||
| } | ||
| } | ||
|
|
||
| RegisterClass("BABYLON.LoopBlock", LoopBlock); |
71 changes: 71 additions & 0 deletions
71
packages/dev/core/src/Materials/Node/Blocks/storageReadBlock.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import { NodeMaterialBlock } from "../nodeMaterialBlock"; | ||
| import { NodeMaterialBlockConnectionPointTypes } from "../Enums/nodeMaterialBlockConnectionPointTypes"; | ||
| import type { NodeMaterialBuildState } from "../nodeMaterialBuildState"; | ||
| import { NodeMaterialConnectionPointDirection, type NodeMaterialConnectionPoint } from "../nodeMaterialBlockConnectionPoint"; | ||
| import { NodeMaterialBlockTargets } from "../Enums/nodeMaterialBlockTargets"; | ||
| import { RegisterClass } from "../../../Misc/typeStore"; | ||
| import { LoopBlock } from "./loopBlock"; | ||
| import { NodeMaterialConnectionPointCustomObject } from "../nodeMaterialConnectionPointCustomObject"; | ||
| /** | ||
| * Block used to read from a variable within a loop | ||
| */ | ||
| export class StorageReadBlock extends NodeMaterialBlock { | ||
| /** | ||
| * Creates a new StorageReadBlock | ||
| * @param name defines the block name | ||
| */ | ||
| public constructor(name: string) { | ||
| super(name, NodeMaterialBlockTargets.Neutral); | ||
|
|
||
| this.registerInput( | ||
| "loopID", | ||
| NodeMaterialBlockConnectionPointTypes.Object, | ||
| false, | ||
| undefined, | ||
| new NodeMaterialConnectionPointCustomObject("loopID", this, NodeMaterialConnectionPointDirection.Input, LoopBlock, "LoopBlock") | ||
| ); | ||
| this.registerOutput("value", NodeMaterialBlockConnectionPointTypes.AutoDetect); | ||
|
|
||
| this._outputs[0]._linkedConnectionSource = this._inputs[0]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the current class name | ||
| * @returns the class name | ||
| */ | ||
| public override getClassName() { | ||
| return "StorageReadBlock"; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the loop link component | ||
| */ | ||
| public get loopID(): NodeMaterialConnectionPoint { | ||
| return this._inputs[0]; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the value component | ||
| */ | ||
| public get value(): NodeMaterialConnectionPoint { | ||
| return this._outputs[0]; | ||
| } | ||
|
|
||
| protected override _buildBlock(state: NodeMaterialBuildState) { | ||
| super._buildBlock(state); | ||
|
|
||
| const value = this.value; | ||
|
|
||
| if (!this.loopID.isConnected) { | ||
| return this; | ||
| } | ||
|
|
||
| const loopBlock = this.loopID.connectedPoint!.ownerBlock as LoopBlock; | ||
|
|
||
| state.compilationString += state._declareOutput(value) + ` = ${loopBlock.output.associatedVariableName};\n`; | ||
|
|
||
| return this; | ||
| } | ||
| } | ||
|
|
||
| RegisterClass("BABYLON.StorageReadBlock", StorageReadBlock); |
Oops, something went wrong.