@needle-tools/engine 4.6.2 → 4.7.0-next.4ec920e

package/lib/engine-components/export/usdz/extensions/NodeMaterialConverter.d.ts

@@ -0,0 +1,10 @@
+import { Texture, Vector4 } from "three";
+declare type TextureMap = {
+    [name: string]: {
+        texture: Texture;
+        scale?: Vector4;
+    };
+};
+type MeshPhysicalNodeMaterial = import("three/src/materials/nodes/MeshPhysicalNodeMaterial.js").default;
+declare function buildNodeMaterial(nodeMaterial: MeshPhysicalNodeMaterial, materialName: string, textures: TextureMap): string;
+export { buildNodeMaterial };

package/lib/engine-components/export/usdz/extensions/NodeMaterialConverter.js

@@ -0,0 +1,452 @@
+import { formatsWithAlphaChannel, makeNameSafeForUSD } from "../ThreeUSDZExporter.js";
+const materialRoot = '</StageRoot/Materials';
+function buildNodeMaterial(nodeMaterial, materialName, textures) {
+    const collectedNodeTypes = new Map();
+    const getUniqueNodeName = (node) => {
+        const type = node["type___needle"];
+        const typeMap = collectedNodeTypes.get(type) || new Map();
+        collectedNodeTypes.set(type, typeMap);
+        if (!typeMap.has(node)) {
+            const name = `${type}${typeMap.size ? `_${typeMap.size}` : ""}`;
+            typeMap.set(node, name);
+        }
+        return typeMap.get(node);
+    };
+    const colorNodesToBeExported = nodeMaterial.colorNode ? getNodesToExport(nodeMaterial.colorNode) : [];
+    const colorOutputString = nodeMaterial.colorNode
+        ? `color3f inputs:diffuseColor.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(colorNodesToBeExported.values().next().value)}.outputs:out>`
+        : "";
+    const roughnessNodesToBeExported = nodeMaterial.roughnessNode ? getNodesToExport(nodeMaterial.roughnessNode) : [];
+    const roughnessOutputString = nodeMaterial.roughnessNode
+        ? `float inputs:roughness.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(roughnessNodesToBeExported.values().next().value)}.outputs:out>`
+        : "";
+    const normalNodesToBeExported = nodeMaterial.normalNode ? getNodesToExport(nodeMaterial.normalNode) : [];
+    const normalOutputString = nodeMaterial.normalNode
+        ? `float3 inputs:normal.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(normalNodesToBeExported.values().next().value)}.outputs:out>`
+        : "";
+    const metallicNodesToBeExported = nodeMaterial.metalnessNode ? getNodesToExport(nodeMaterial.metalnessNode) : [];
+    const metallicOutputString = nodeMaterial.metalnessNode
+        ? `float inputs:metallic.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(metallicNodesToBeExported.values().next().value)}.outputs:out>`
+        : "";
+    const combinedSetOfAllNodesToExport = new Set([...colorNodesToBeExported, ...roughnessNodesToBeExported, ...normalNodesToBeExported, ...metallicNodesToBeExported]);
+    const shaderOutput = getShadersFromNodes(combinedSetOfAllNodesToExport, materialName, textures, getUniqueNodeName);
+    console.debug(shaderOutput);
+    return `
+
+	def Material "${materialName}" ${nodeMaterial.name ? `(
+		displayName = "${nodeMaterial.name}"
+	)` : ''}
+	{
+		token outputs:mtlx:surface.connect = ${materialRoot}/${materialName}/N_mtlxsurface.outputs:surface>
+
+		def Shader "N_mtlxsurface"
+		{
+			uniform token info:id = "ND_UsdPreviewSurface_surfaceshader"
+			${colorOutputString}
+			${roughnessOutputString}
+			${normalOutputString}
+			${metallicOutputString}
+			token outputs:surface
+		}
+		
+		${shaderOutput}
+		
+	}`;
+}
+function getNodesToExport(rootNode) {
+    const getNodeType = (node) => {
+        if (node.nodeType)
+            return node.nodeType;
+        switch (node.type) {
+            case "TimerNode": return "float";
+            case "TextureNode": return undefined;
+            case "ConvertNode": return node.convertTo;
+            default: return undefined;
+        }
+    };
+    const getSetOfAllNodes = (rootNode) => {
+        const setOfAllNodes = new Set();
+        const collectNode = (node) => {
+            if (!node.isNode || setOfAllNodes.has(node))
+                return;
+            if (!node["nodeType___needle"]) {
+                node["nodeType___needle"] = getNodeType(node);
+            }
+            if (node.shaderNode) {
+                node["type___needle"] = "ShaderCallNodeInternal";
+                node["shaderNodeLayoutName___needle"] = node.shaderNode.layout.name.slice(3);
+            }
+            else {
+                node["type___needle"] = node.type;
+            }
+            setOfAllNodes.add(node);
+            for (const key in node) {
+                if (node[key]?.isNode) {
+                    collectNode(node[key]);
+                    node["nodeType___needle"] ||= node[key]["nodeType___needle"];
+                }
+                if (Array.isArray(node[key])) {
+                    node[key].forEach(child => {
+                        if (child.isNode) {
+                            collectNode(child);
+                            node["nodeType___needle"] ||= child["nodeType___needle"];
+                        }
+                    });
+                }
+            }
+        };
+        collectNode(rootNode);
+        return setOfAllNodes;
+    };
+    const isSelfConversionNode = (node) => {
+        if (node.type === "ConvertNode") {
+            if (node.convertTo === node.node["nodeType___needle"]) {
+                return true;
+            }
+            else if (node.node.type === "ConstNode") {
+                if (node.convertTo === "vec4" && node.node.value.isVector4) {
+                    return true;
+                }
+                else if (node.convertTo === "vec3" && node.node.value.isVector3) {
+                    return true;
+                }
+                else if (node.convertTo === "vec2" && node.node.value.isVector2) {
+                    return true;
+                }
+                else if (node.convertTo === "color" && node.node.value.isColor) {
+                    return true;
+                }
+                else if (node.convertTo === "float" && typeof node.node.value === 'number') {
+                    return true;
+                }
+            }
+            else if (node.node.type == "SplitNode") {
+                if (node.convertTo == "float" && node.node.components.length === 1) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
+    const getNextValidNode = (node) => {
+        while (nodeShouldNotBeExported(node)) {
+            if (!node.node && node.shaderNode) {
+                node = node.inputNodes[0];
+            }
+            else {
+                node = node.node ?? node.aNode ?? node.bNode ?? node.cNode;
+            }
+        }
+        return node;
+    };
+    const nodeShouldNotBeExported = (node) => {
+        const ignorableNodeTypes = ["UniformNode", "UniformGroupNode", "ShaderNodeInternal"];
+        return !node || isSelfConversionNode(node) || ignorableNodeTypes.includes(node["type___needle"]) || node["type___needle"] === undefined;
+    };
+    const getParent = (currNode, nodeSet) => {
+        for (const node of nodeSet) {
+            for (const key in node) {
+                if (node[key]?.isNode && node[key] === currNode) {
+                    return { parent: node, label: key };
+                }
+                if (Array.isArray(node[key])) {
+                    const child = node[key].find(childNode => childNode.isNode && childNode === currNode);
+                    if (child)
+                        return { parent: node, label: key };
+                }
+            }
+        }
+        return null;
+    };
+    const updateNodeReferences = (node, refKeys) => {
+        if (node.shaderNode) {
+            node.inputNodes[0] = getNextValidNode(node.inputNodes[0]);
+        }
+        else if (Array.isArray(node.nodes)) {
+            for (let i = 0; i < node.nodes.length; i++) {
+                if (node.nodes[i] && nodeShouldNotBeExported(node.nodes[i])) {
+                    node.nodes[i] = getNextValidNode(node.nodes[i]);
+                }
+            }
+        }
+        else {
+            refKeys.forEach(key => {
+                if (node[key] && nodeShouldNotBeExported(node[key])) {
+                    node[key] = getNextValidNode(node[key]);
+                }
+            });
+        }
+    };
+    const setMixNodeMixToFloat = (node) => {
+        if (node.type === "MathNode" && node.method === "mix") {
+            node.cNode["nodeType___needle"] = "float";
+            if (node.cNode.type === "ConvertNode") {
+                node.cNode.convertTo = "float";
+            }
+        }
+    };
+    const setConstNodeTypeToParentType = (node, parentResponse) => {
+        if (!(parentResponse.label === 'cNode' && parentResponse.parent.type === "MathNode" && parentResponse.parent.method === "mix")) {
+            if (parentResponse.parent.type === "JoinNode") {
+                node["nodeType___needle"] = "float";
+            }
+            else {
+                node["nodeType___needle"] = parentResponse.parent["nodeType___needle"];
+            }
+        }
+    };
+    const isConvertVector4ToColorNode = (node) => (node?.type === "ConvertNode" && node["nodeType___needle"] === "color" && node.node["nodeType___needle"] === "vec4");
+    const createVec3ToColorConversionNode = (node, allNodes) => {
+        node.convertTo = "vec3";
+        node["nodeType___needle"] = "vec3";
+        const newNode = {
+            type: "ConvertNode",
+            convertTo: "color",
+            node: node,
+            isNode: true,
+            nodeType___needle: "color",
+            type___needle: "ConvertNode"
+        };
+        const parentInfo = getParent(node, allNodes);
+        if (parentInfo?.parent) {
+            parentInfo.parent[parentInfo.label] = newNode;
+        }
+        return newNode;
+    };
+    const isConvertFromTextureNode = (node) => (node?.type === "ConvertNode" && node.node.type === "TextureNode" && node["nodeType___needle"] !== node.node["nodeType___needle"]);
+    const pruneNodes = (allNodes) => {
+        const nodesToBeExported = new Set();
+        for (let node of allNodes) {
+            if (nodeShouldNotBeExported(node))
+                continue;
+            // Math mix nodes take a mix input that should always be a float, the typing gets messed up here because
+            // the other inputs that are being mixed can be anything and if we have a convert or a const that goes
+            // into the mix input, it gets set as whatever the output of the mix should be, not float. Here we make
+            // sure it will be float
+            setMixNodeMixToFloat(node);
+            if (node.type == "SplitNode") {
+                const parentResponse = getParent(node, allNodes);
+                if (node.components.length === 1) {
+                    node["nodeType___needle"] = "float";
+                }
+                else if (parentResponse) {
+                    // TODO: this may not be sufficient and it may be better to always count the component lengths
+                    node["nodeType___needle"] = parentResponse.parent["nodeType___needle"];
+                }
+                else
+                    throw new Error("SplitNode without parent found, this should not happen");
+            }
+            // Here we check child nodes to update the connections if they will be ignored later
+            updateNodeReferences(node, ["node", "aNode", "bNode", "cNode"]);
+            // Const nodes don't always have a type and sometimes they need to be converted from a value of 0 -> [0, 0, 0]
+            // this function does that conversion
+            if (node.type == "ConstNode" && node.nodeType == null) {
+                setConstNodeTypeToParentType(node, getParent(node, allNodes));
+            }
+            if (isConvertVector4ToColorNode(node)) {
+                nodesToBeExported.add(createVec3ToColorConversionNode(node, allNodes));
+            }
+            // We want Texture nodes to export the type they need, rather than something else and then convert
+            // here if we have a convert above a Texture that we missed on the first pass because there was
+            // some other node in between to prune, set the type on the Texture correctly and kill the convert
+            if (isConvertFromTextureNode(node)) {
+                node.node["nodeType___needle"] = node.convertTo;
+                const parentInfo = getParent(node, allNodes);
+                if (parentInfo?.parent) {
+                    parentInfo.parent[parentInfo.label] = node.node;
+                }
+                node = node.node;
+            }
+            nodesToBeExported.add(node);
+        }
+        return nodesToBeExported;
+    };
+    const setOfAllNodes = getSetOfAllNodes(rootNode);
+    const prunedNodes = pruneNodes(setOfAllNodes);
+    return prunedNodes;
+}
+function getConstValueString(value, type) {
+    switch (type) {
+        case "float4":
+            return value.isVector4
+                ? `(${value.x}, ${value.y}, ${value.z}, ${value.w})`
+                : `(${value}, ${value}, ${value}, ${value})`;
+        case "float3":
+            return value.isVector3
+                ? `(${value.x}, ${value.y}, ${value.z})`
+                : `(${value}, ${value}, ${value})`;
+        case "float2":
+            return value.isVector2
+                ? `(${value.x}, ${value.y})`
+                : `(${value}, ${value})`;
+        case "color3f":
+            return value.isColor
+                ? `(${value.r}, ${value.g}, ${value.b})`
+                : `(${value}, ${value}, ${value})`;
+        default:
+            return (value.isVector4 || value.isVector3 || value.isVector2)
+                ? `${value.x}`
+                : value.isColor
+                    ? `${value.r}`
+                    : `${value}`;
+    }
+}
+function TSLNodeToUsdShadeString(node, materialName, getUniqueNodeName, textures) {
+    const pad = '        ';
+    const getType = (nodeType) => {
+        const types = {
+            float: "float",
+            vec2: "vector2",
+            vec3: "vector3",
+            vec4: "vector4",
+            color: "color3"
+        };
+        return types[nodeType] || "float";
+    };
+    const getUsdType = (nodeType) => {
+        const usdTypes = {
+            float: "float",
+            vec2: "float2",
+            vec3: "float3",
+            vec4: "float4",
+            color: "color3f"
+        };
+        return usdTypes[nodeType] || "float";
+    };
+    const type = node["type___needle"];
+    const ndType = node["nodeType___needle"];
+    const mtlxNdType = getType(ndType);
+    let usdNdType = getUsdType(ndType);
+    let usdShadeNodeName = "";
+    const inputs = new Array();
+    switch (type) {
+        case "UniformGroupNode":
+        case "UniformNode":
+            // break out of node loop
+            return "";
+        case "TimerNode":
+            usdShadeNodeName = "time_float";
+            break;
+        case "ConstNode":
+            usdShadeNodeName = "constant_" + mtlxNdType;
+            inputs.push(`${usdNdType} inputs:value = ${getConstValueString(node.value, usdNdType)}`);
+            break;
+        case "JoinNode":
+            usdShadeNodeName = "combine" + node.nodes.length + "_" + mtlxNdType;
+            let i = 1;
+            for (const childNode of node.nodes) {
+                inputs.push(`float inputs:in${i++}.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(childNode)}.outputs:out>`);
+            }
+            break;
+        case "ConvertNode":
+            const inputType = getType(node.node["nodeType___needle"]);
+            usdShadeNodeName = "convert_" + inputType + "_" + mtlxNdType;
+            if (node.node)
+                inputs.push(`${getUsdType(node.node["nodeType___needle"])} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.node)}.outputs:out>`);
+            break;
+        case "MathNode":
+            usdShadeNodeName = node.method + "_" + mtlxNdType;
+            if (node.aNode && !node.bNode)
+                inputs.push(`${getUsdType(node.aNode["nodeType___needle"])} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+            if (node.aNode && node.bNode && !node.cNode) {
+                inputs.push(`${getUsdType(node.aNode["nodeType___needle"])} inputs:in1.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+                inputs.push(`${getUsdType(node.bNode["nodeType___needle"])} inputs:in2.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.bNode)}.outputs:out>`);
+            }
+            if (node.aNode && node.bNode && node.cNode && node.method == "clamp") {
+                inputs.push(`${getUsdType(node.aNode["nodeType___needle"])} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+                inputs.push(`${getUsdType(node.bNode["nodeType___needle"])} inputs:low.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.bNode)}.outputs:out>`);
+                inputs.push(`${getUsdType(node.cNode["nodeType___needle"])} inputs:high.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.cNode)}.outputs:out>`);
+            }
+            if (node.aNode && node.bNode && node.cNode && node.method == "mix") {
+                inputs.push(`${getUsdType(node.aNode["nodeType___needle"])} inputs:fg.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.bNode)}.outputs:out>`);
+                inputs.push(`${getUsdType(node.bNode["nodeType___needle"])} inputs:bg.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+                inputs.push(`float inputs:mix.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.cNode)}.outputs:out>`);
+            }
+            break;
+        case "OperatorNode":
+            let opName = "";
+            switch (node.op) {
+                case "*":
+                    opName = "multiply";
+                    break;
+                case "/":
+                    opName = "divide";
+                    break;
+                case "+":
+                    opName = "add";
+                    break;
+                case "-":
+                    opName = "subtract";
+                    break;
+            }
+            usdShadeNodeName = opName + "_" + mtlxNdType;
+            if (node.aNode && !node.bNode)
+                inputs.push(`${getUsdType(node.aNode["nodeType___needle"])} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+            if (node.aNode && node.bNode) {
+                const aNodeType = getUsdType(node.aNode["nodeType___needle"]);
+                const bNodeType = getUsdType(node.bNode["nodeType___needle"]);
+                // todo: make this more generic / support all combinations
+                if (aNodeType === 'color3f' && bNodeType === 'float' || bNodeType === 'float' && bNodeType === 'color3f') {
+                    usdShadeNodeName = opName + "_color3FA";
+                }
+                inputs.push(`${aNodeType} inputs:in1.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.aNode)}.outputs:out>`);
+                inputs.push(`${bNodeType} inputs:in2.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.bNode)}.outputs:out>`);
+            }
+            break;
+        case "TextureNode":
+            if (node.uvNode) {
+                usdShadeNodeName = "tiledimage_" + mtlxNdType;
+                inputs.push(`float2 inputs:texcoord.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.uvNode)}.outputs:out>`);
+            }
+            else {
+                usdShadeNodeName = "image_" + mtlxNdType;
+            }
+            const texture = node._value;
+            const isRGBA = formatsWithAlphaChannel.includes(texture.format);
+            const textureName = texName(texture);
+            inputs.push(`asset inputs:file = @textures/${textureName}.${isRGBA ? 'png' : 'jpg'}@`);
+            textures[textureName] = { texture, scale: undefined };
+            break;
+        case "NormalMapNode":
+            usdNdType = "float3";
+            usdShadeNodeName = "normalmap";
+            inputs.push(`${usdNdType} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.node)}.outputs:out>`);
+            break;
+        case "AttributeNode":
+            usdShadeNodeName = "geompropvalue_" + mtlxNdType;
+            inputs.push(`string inputs:geomprop = "st"`);
+            break;
+        case "ShaderCallNodeInternal":
+            usdShadeNodeName = node["shaderNodeLayoutName___needle"] + "_" + mtlxNdType;
+            inputs.push(`${usdNdType} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.inputNodes[0])}.outputs:out>`);
+            break;
+        case "SplitNode":
+            usdShadeNodeName = "swizzle_" + getType(node.node["nodeType___needle"]) + "_" + mtlxNdType;
+            inputs.push(`${getUsdType(node.node["nodeType___needle"])} inputs:in.connect = ${materialRoot}/${materialName}/${getUniqueNodeName(node.node)}.outputs:out>`);
+            inputs.push(`string inputs:channels = "${node.components}"`);
+            break;
+    }
+    // todo: better way to pad here for sure...
+    return `
+	${pad}def Shader "${getUniqueNodeName(node)}"
+	${pad}{
+		${pad}uniform token info:id = "ND_${usdShadeNodeName}"
+		${pad}${usdNdType} outputs:out
+		${pad}${inputs.length > 0 ? inputs.join("\n				") : ""}
+	${pad}}
+	`;
+}
+function getShadersFromNodes(nodes, materialName, textures, getUniqueNodeName) {
+    let shaderOutput = "";
+    for (const node of nodes) {
+        shaderOutput += TSLNodeToUsdShadeString(node, materialName, getUniqueNodeName, textures);
+    }
+    return shaderOutput;
+}
+function texName(tex) {
+    // If we have a source, we only want to use the source's id, not the texture's id
+    // to avoid exporting the same underlying data multiple times.
+    return makeNameSafeForUSD(tex.name) + '_' + (tex.source?.id ?? tex.id);
+}
+export { buildNodeMaterial };
+//# sourceMappingURL=NodeMaterialConverter.js.map

package/lib/engine-components/export/usdz/extensions/NodeMaterialConverter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeMaterialConverter.js","sourceRoot":"","sources":["../../../../../src/engine-components/export/usdz/extensions/NodeMaterialConverter.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/postprocessing/Effects/BloomEffect.js

@@ -4,7 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { EffectAttribute } from "postprocessing";
 import { MathUtils } from "three";
 import { MODULES } from "../../../engine/engine_modules.js";
 import { serializable } from "../../../engine/engine_serialization.js";
@@ -84,8 +83,6 @@ export class BloomEffect extends PostProcessingEffect {
                 radius: 0.85,
                 intensity: this.intensity.value,
             });
-            // @ts-ignore Well... it's protected but bloom needs this :(
-            bloom.setAttributes(EffectAttribute.CONVOLUTION);
         }
         this.intensity.onValueChanged = newValue => {
             bloom.intensity = newValue;

package/lib/engine-components/postprocessing/Effects/BloomEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"BloomEffect.js","sourceRoot":"","sources":["../../../../src/engine-components/postprocessing/Effects/BloomEffect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BloomEffect.js","sourceRoot":"","sources":["../../../../src/engine-components/postprocessing/Effects/BloomEffect.ts"],"names":[],"mappings":"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"}

package/lib/engine-components/postprocessing/PostProcessingHandler.js

@@ -138,6 +138,7 @@ export class PostProcessingHandler {
                         for (const effect of res) {
                             this._effects.push({
                                 effect,
+                                typeName: component.typeName,
                                 priority: component.order
                             });
                         }
@@ -145,6 +146,7 @@ export class PostProcessingHandler {
                     else {
                         this._effects.push({
                             effect: res,
+                            typeName: component.typeName,
                             priority: component.order
                         });
                     }
@@ -203,7 +205,11 @@ export class PostProcessingHandler {
                 const tonemapping = new MODULES.POSTPROCESSING.MODULE.ToneMappingEffect();
                 tonemapping.name = `ToneMapping (${renderer.toneMapping})`;
                 tonemapping.mode = threeToneMappingToEffectMode(renderer.toneMapping);
-                this._effects.push({ effect: tonemapping, priority: PostProcessingEffectOrder.ToneMapping });
+                this._effects.push({
+                    typeName: "ToneMapping",
+                    effect: tonemapping,
+                    priority: PostProcessingEffectOrder.ToneMapping
+                });
             }
         }
         // create composer and set active on context
@@ -308,7 +314,8 @@ export class PostProcessingHandler {
             }
             const effectsToMerge = [];
             let hasConvolutionEffectInArray = false;
-            for (const entry of this._effects) {
+            for (let i = 0; i < this._effects.length; i++) {
+                const entry = this._effects[i];
                 const ef = entry.effect;
                 if (ef instanceof MODULES.POSTPROCESSING.MODULE.SMAAEffect) {
                     this._hasSmaaEffect = true;
@@ -316,7 +323,7 @@ export class PostProcessingHandler {
                 else if (ef instanceof MODULES.POSTPROCESSING.MODULE.NormalPass) {
                     this._anyPassHasNormal = true;
                 }
-                // There can be only one tonemapping effect in the scene, so we can skip all others
+                // There can be only one tonemapping effect in the scene, so we skip all others
                 if (ef instanceof MODULES.POSTPROCESSING.MODULE.ToneMappingEffect && activeTonemappingEffect !== ef) {
                     // If we already have a tonemapping effect, we can skip this one
                     continue;
@@ -324,9 +331,9 @@ export class PostProcessingHandler {
                 // We can also not merge multiple effects of the same type in one pass
                 // So we first need to create a new pass with whatever effects we have so far
                 // TODO: this seems to work fine for some effects (like ColorAdjustments) and only caused issues with multiple Tonemapping effects so far which is handled above
-                // const constructor = ef.constructor as Constructor<Effect | Pass>;
-                // if(effectsToMerge.find(e => e.constructor === constructor)) {
-                //     // this.createPassForMergeableEffects(effectsToMerge, composer, cam, scene);
+                // const constructor = ef.constructor;
+                // if (effectsToMerge.find(e => e.constructor === constructor)) {
+                //     this.createPassForMergeableEffects(effectsToMerge, composer, cam, scene);
                 // }
                 if (ef instanceof MODULES.POSTPROCESSING.MODULE.Effect) {
                     const attributes = ef.getAttributes();
@@ -362,18 +369,29 @@ export class PostProcessingHandler {
         }
         catch (e) {
             console.error("Error while applying postprocessing effects", e);
+            composer.passes.forEach(p => p.dispose());
             composer.removeAllPasses();
         }
         // The last pass is the one that renders to the screen, so we need to set the gamma correction for it (and enable it for all others)
-        for (let i = 0; i < composer.passes.length; i++) {
+        let foundEnabled = false;
+        for (let i = composer.passes.length - 1; i >= 0; i--) {
             const pass = composer.passes[i];
-            const isLast = i === composer.passes.length - 1;
+            let gammaCorrect = false;
+            let renderToScreen = false;
+            if (pass.enabled) {
+                if (!foundEnabled) {
+                    gammaCorrect = true;
+                    renderToScreen = true;
+                }
+                foundEnabled = true;
+            }
+            pass.renderToScreen = renderToScreen;
             if (pass?.configuration !== undefined) {
-                pass.configuration.gammaCorrection = isLast;
+                pass.configuration.gammaCorrection = gammaCorrect;
             }
             else if ("autosetGamma" in pass) {
                 // Some effects have a autosetGamma property that we can use to set the gamma correction
-                pass.autosetGamma = isLast;
+                pass.autosetGamma = gammaCorrect;
             }
             this._anyPassHasDepth ||= pass.needsDepthTexture;
         }