bug fixes relating opening and saving files + function node input/output node registration fix to register listeners correctly + plane primitive in test scene + change order of unserialize to parent first

Author: bandinopla

src/Editor.ts

@@ -13,7 +13,7 @@ import { LayoutElement } from "./layout/LayoutElement";
 import { onDoubleClick } from "./util/onDoubleClick";
 import { createNewNode } from "./ui/NodeSelectionModal";
 import { ConnectionsArray, OuletCandidate } from "./core/Connection";
-import { NodeGroupType, NodeTypes } from "./EditorNodes";
+import { newNodeById, NodeGroupType, NodeTypes } from "./EditorNodes";
 import { ScenePreviewNode } from "./nodes/preview/ScenePreview";
 import { Script } from "./export/Script";
 import { FunctionCallNode } from "./nodes/logic/FunctionCallNode";
@@ -543,18 +543,12 @@ export class Editor {
     }
 
     protected bingToTop(node: Node) {
-        const nodeIndexZ = this.zSortedObjs.indexOf(node);
-        const nodeIndex = this.objs.indexOf(node);
+        const nodeIndexZ = this.zSortedObjs.indexOf(node); 
 
         if (nodeIndexZ !== -1) {
             this.zSortedObjs.splice(nodeIndexZ, 1);
             this.zSortedObjs.push(node);
-        }
-
-        // if (nodeIndex !== -1) {
-        //     this.objs.splice(nodeIndex, 1);
-        //     this.objs.push(node);
-        // }
+        } 
     }
 
     /**
@@ -618,13 +612,7 @@ export class Editor {
 
     add(node: Node | string, nodeSetup?: (node: Node) => void) {
         if (typeof node == "string") {
-            const referencedNode = NodeTypes.flatMap((group) => group.nodes).find(
-                (n) => n.id == node,
-            );
-            if (!referencedNode) {
-                throw new Error(`Trying to create a node with id:${node} that doesn't exist.`);
-            }
-            node = new referencedNode.TypeClass();
+            node = newNodeById( node ); 
         }
 
         node.editor = this;

src/EditorNodes.ts

@@ -4,6 +4,7 @@ import { ColorNode } from './nodes/input/ColorNode';
 import { tslInputNodes } from './nodes/input/TslInputNode';
 import { UniformValueNode } from './nodes/input/UniformValueNode';
 import { ValueNode } from './nodes/input/ValueNode';
+import { ForNode } from './nodes/logic/ForNode';
 import { FunctionCallNode } from './nodes/logic/FunctionCallNode';
 import { FunctionInputNode } from './nodes/logic/FunctionInputNode';
 import { FunctionNode } from './nodes/logic/FunctionNode';
@@ -77,6 +78,7 @@ export const NodeTypes: NodeGroupType[] = [
                 hidden: true,
             },
             { TypeClass: IfNode, name: 'If / Conditional', id: 'if' },
+            { TypeClass:ForNode, name:"For loop", id:"foor-loop"},
             {
                 TypeClass: VariableDeclarationNode,
                 name: 'Variable declaration',
@@ -138,3 +140,24 @@ export const NodeTypes: NodeGroupType[] = [
 export function getNodeTypeById(id: string) {
     return NodeTypes.flatMap((g) => g.nodes).find((n) => n.id == id);
 }
+
+export function newNodeById( id:string ) {
+    const referencedNode = NodeTypes.flatMap((group) => group.nodes).find(
+        (n) => n.id == id,
+    );
+    if (!referencedNode) {
+        throw new Error(`Trying to create a node with id:${id} that doesn't exist.`);
+    }
+
+    const args = referencedNode.constructorArgs;
+
+    if (args) {
+        return new referencedNode.TypeClass(
+            ...(Array.isArray(args)
+                ? args
+                : [args]),
+        );
+    } else {
+        return new referencedNode.TypeClass();
+    } 
+}

src/ThreeScene.ts

@@ -18,7 +18,8 @@ export class ThreeScene extends THREE.EventDispatcher<SceneEvents> {
     private objs: THREE.Mesh[] = [];
     readonly pointLight: THREE.PointLight;
     private mouse: THREE.Vector2 = new THREE.Vector2();
-    rotationSpeed = 1;
+    rotationSpeed = 0;
+    rotation = 0;
     protected _currentObjectIndex = 1;
 
     private materialNotSet = new THREE.MeshStandardMaterial({
@@ -66,8 +67,7 @@ export class ThreeScene extends THREE.EventDispatcher<SceneEvents> {
     }
 
     protected buildScene() {
-        const material = this.materialNotSet;
-
+        const material = this.materialNotSet; 
         //
         // dummy objects
         //
@@ -102,6 +102,11 @@ export class ThreeScene extends THREE.EventDispatcher<SceneEvents> {
             },
         );
 
+        const plane = new THREE.Mesh(new THREE.PlaneGeometry(5,5), material)
+        plane.name="Plane";
+        this.objs.push(plane);
+        this.objHolder.add(plane);
+
         this.scene.add(this.objHolder);
 
         this.camera.position.z = 4;
@@ -155,7 +160,12 @@ export class ThreeScene extends THREE.EventDispatcher<SceneEvents> {
     render() {
         const delta = this.clock.getDelta();
         this.updateLightPosition();
-        this.objHolder.rotateY(delta * this.rotationSpeed);
+        //this.objHolder.rotateY(delta * this.rotationSpeed);
+        if( this.rotationSpeed )
+        {
+            this.rotation += delta * this.rotationSpeed;
+        }
+        this.objHolder.rotation.y = this.rotation;
         //this.objHolder.rotateX(-delta*this.rotationSpeed)
         this.renderer.render(this.scene, this.camera);
     }

src/components/ChangeNodeCustomNameButton.ts

@@ -1,4 +1,4 @@
-import { FunctionNode } from '../nodes/logic/FunctionNode';
+import { Node } from '../nodes/Node';
 import { WinNode } from '../nodes/WinNode';
 import { Button } from './Button';
 
@@ -21,13 +21,8 @@ export class ChangeNodeCustomNameButton extends Button {
             this.onNewGame(newName);
         }
         else {
-            newName = (
-                (this.root as WinNode).childOf as FunctionNode
-            )?.getValidParameterName(newName);
 
-            if (!newName) {
-                return;
-            }
+            newName = (this.root as WinNode).editor.getSafeName( this.root as Node, newName);
 
             node.customNodeName = newName;
             node.update();

src/nodes/WinNode.ts

@@ -143,8 +143,8 @@ export class WinNode<T extends WinNodeEvents = WinNodeEvents> extends Node<
     }
 
     override unserialize(data: Record<string, any>): void {
-        this.customNodeName = data.customName;
-        this._nodeName = data.name;
         super.unserialize(data);
+        this.customNodeName = data.customName;
+        this._nodeName = data.name; 
     }
 }

src/nodes/attribute/UVNode.ts

@@ -38,7 +38,8 @@ export class UVNode extends BaseAttributeNode {
     }
 
     override unserialize(data: Record<string, any>): void {
-        this.uvChannel.value = data.channel;
         super.unserialize(data);
+        this.uvChannel.value = data.channel;
+        
     }
 }

src/nodes/input/ColorNode.ts

@@ -41,7 +41,8 @@ export class ColorNode extends InputBaseNode {
     }
 
     override unserialize(data: Record<string, any>): void {
-        this.color.color = new Color(data.color);
         super.unserialize(data);
+        this.color.color = new Color(data.color);
+        
     }
 }

src/nodes/input/TslInputNode.ts

@@ -1,4 +1,3 @@
-import { string } from 'three/tsl';
 import { PropertiesNode } from './PropertiesNode';
 
 const tslInputs: [string, any][] = [
@@ -285,6 +284,11 @@ const tslInputs: [string, any][] = [
                 desc: 'Returns the viewport size in physical pixel units.',
                 type: 'vec2',
             },
+            {
+                name:"viewportResolution",
+                desc: 'The resolution node is a vec2 containing the render target’s width and height in pixels (e.g., vec2(window.innerWidth, window.innerHeight) for the default canvas).',
+                type: 'vec2',
+            }
         ],
     ],
 

src/nodes/input/ValueNode.ts

@@ -18,7 +18,7 @@ export class ValueNode extends InputBaseNode {
         );
 
         super('Value', [
-            new DataTypeComboBox((val) => (this.size = val)),
+            new DataTypeComboBox((val) => (this.size = val+1 )),
             ...inputs,
             new Output('value', DataType.wildcard),
         ]);
@@ -33,7 +33,7 @@ export class ValueNode extends InputBaseNode {
     }
     set size(n: number) {
         this.inputs.forEach((input, i) => {
-            input.enabled = i <= n;
+            input.enabled = i < n;
         });
 
         this.output.updateType();
@@ -45,9 +45,9 @@ export class ValueNode extends InputBaseNode {
 
     override get nodeDataType(): IDataType | undefined {
         const size = this.size;
-        return size == 1
+        return size <= 1
             ? DataType.float
-            : DataTypes.find((dt) => dt.name == 'vec' + size)!.type;
+            : DataTypes.find((dt) => dt.name == 'vec' +  size )!.type;
     }
 
     protected override writeNodeScript(script: Script): string {
@@ -75,10 +75,12 @@ export class ValueNode extends InputBaseNode {
     }
 
     override unserialize(data: Record<string, any>): void {
-        this.size = data.size ?? 1;
+        super.unserialize(data); 
         data.values?.forEach((value: number, i: number) => {
             this.inputs[i].value = value;
         });
-        super.unserialize(data);
+
+        this.size = data.size ?? 1;
+        
     }
 }

src/nodes/logic/ForNode.ts

@@ -0,0 +1,61 @@
+import { DataType, IDataType } from '../../core/IOutlet';
+import { Script } from '../../export/Script'; 
+import { InputOrValue } from '../../properties/InputOrValue'; 
+import { Output } from '../../properties/Output';
+import { ExecutableLogicNode } from './ExecutableLogicNode';
+
+/**
+ * A node that behaves like an IF statement
+ */
+export class ForNode extends ExecutableLogicNode {
+   
+    private count: InputOrValue; 
+    private loopIndex: Output; 
+    private execute: Output; 
+
+    constructor() {
+        const count = new InputOrValue("Count");
+        const loopIndex = new LoopIndexOutput();
+        const execute = new Output('Execute', DataType.script); 
+
+        super('Loop', [count, execute, loopIndex ]);
+ 
+        this.count = count;
+        this.execute = execute;
+        this.loopIndex = loopIndex;
+    }
+
+    override get nodeDataType(): IDataType | undefined {
+        return;
+    }
+
+    protected override writeNodeScript(script: Script): string {
+        script.importModule('Loop');
+ 
+        const count = this.count.writeScript(script);
+        const blockcope = script.newScope(true);
+
+        //execute
+        (this.execute.connectedTo?.owner as ExecutableLogicNode).writeBlockScript( script );
+
+        blockcope.exit();
+
+        //
+        // the actual TSL if...
+        // 
+        script.writeLine( `Loop(${ count }, ({ i:${ this.nodeName+"_i" } })=>{ ${ blockcope.toString() } })`);
+
+        return '';
+    }
+ 
+}
+
+class LoopIndexOutput extends Output {
+    constructor() {
+        super("i", DataType.uint);
+    }
+
+    override writeScript(): string {
+        return this.owner.nodeName+"_i";
+    }
+}