bug fixes + exposing label prop of inputorvalue prop

Author: bandinopla

src/Editor.ts

@@ -1362,7 +1362,7 @@ export class Editor {
 
             reader.onload = () => {
                 const content = reader.result as string;
-                const reg = /\*\*LAYOUT\*\*(.*)\*\*LAYOUT\*\*/m;
+                const reg = /\*\*LAYOUT\*\*(.*)\*\*LAYOUT\*\*/s;
                 const match = content.match(reg);
                 if (match) {
                     let data: any;
@@ -1412,12 +1412,15 @@ export class Editor {
             layoutMatrix.f,
         );
 
+        console.log("LOAD", data)
         //
         // recreate nodes
         //
         data.layout.forEach((nodeData: any, i: number) => {
             const node = this.objs[i];
 
+            console.log("LOADED NODE:", nodeData)
+
             if (node) {
                 node.unserialize(nodeData);
             } else {
@@ -1429,6 +1432,8 @@ export class Editor {
         // create connections
         //
         data.connections?.forEach((connection: any) => {
+            if(!connection) return;
+
             const [fromNodeIndex, fromOutletIndex, toNodeIndex, toOutletIndex] = connection;
 
             const fromNode = this.objs[fromNodeIndex];

src/nodes/attribute/UVNode.ts

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

src/nodes/vector/BumpMapNode.ts

@@ -49,7 +49,7 @@ export class BumpMapNode extends WinNode {
         const bumpTexture =
             this.bumpHeight.writeScript(script) + this.invert.value;
 
-        let output = `bumpMap( ${bumpTexture}, ${bumpStrength})`;
+        const output = `bumpMap( ${bumpTexture}, ${bumpStrength})`;
 
         const normal = this.normal.writeScript(script);
 
@@ -130,4 +130,18 @@ return ${perturbNormalArb}( {
             return script.define(this.nodeName, output);
         }
     }
+
+    override serialize(): Record<string, any> {
+        return {
+            ...super.serialize(),
+            invert: this.invert.value,
+            strength: this.strength.value, 
+        }
+    }
+
+    override unserialize(data: Record<string, any>): void {
+        super.unserialize(data);
+        this.invert.value = data.invert;
+        this.strength.value = data.strength;
+    }
 }

src/nodes/vector/NormalMapNode.ts

@@ -6,7 +6,7 @@ import { InputOrValue } from '../../properties/InputOrValue';
 import { WinNode } from '../WinNode';
 import { Script } from '../../export/Script';
 import { Output } from '../../properties/Output';
-import { DataType } from '../../core/IOutlet';
+import { DataType, IDataType } from '../../core/IOutlet';
 
 export class NormalMapNode extends WinNode {
     protected typeCombo: ComboBox;
@@ -47,11 +47,15 @@ export class NormalMapNode extends WinNode {
         this.update();
     }
 
+    override get nodeDataType(): IDataType | undefined {
+        return DataType.vec2;
+    }
+
     protected override writeNodeScript(script: Script): string {
         script.importModule('normalMap');
 
-        let map = this.color.writeScript(script);
-        let strength = this.strength.value;
+        const map = this.color.writeScript(script);
+        const strength = this.strength.value;
 
         let node = `
 const normalNode = normalMap( ${map}, ${strength});
@@ -73,4 +77,20 @@ normalNode.normalMapType = THREE.ObjectSpaceNormalMap;
             true,
         );
     }
+
+    override serialize(): Record<string, any> {
+        return {
+            ...super.serialize(),
+            normalType: this.typeCombo.index,
+            strength: this.strength.value,
+            color: this.color.baseColor.getHex() 
+        }
+    }
+
+    override unserialize(data: Record<string, any>): void {
+        super.unserialize(data);
+        this.typeCombo.index = data.normalType;
+        this.strength.value = data.strength;
+        this.color.baseColor = new Color(data.color);
+    }
 }

src/properties/BaseColorProperty.ts

@@ -10,15 +10,15 @@ export class BaseColorProperty extends Input {
     protected colorPicker: ColorPicker;
 
     constructor(
-        title = 'Base Color',
+        readonly label = 'Base Color',
         defaultColor?: Color,
         protected multipliesInput = true,
     ) {
         super(DataType.uvec3);
 
         this.colorPicker = new ColorPicker(() => this.root.update(), false);
 
-        this.layout = new Layout([new TextLabel(title), this.colorPicker], {
+        this.layout = new Layout([new TextLabel(label), this.colorPicker], {
             justify: 'space-between',
         });
 

src/properties/InputOrValue.ts

@@ -70,6 +70,9 @@ export class InputOrValue extends BasicInputProperty {
         });
     } 
 
+    override get label() {
+        return this.valueSlider.name;
+    }
     override set label(str: string) {
         this.valueSlider.name = str;
     }