input or value node should show input if no connection, And the output should be the right size repeating the input in each component. Also removed Xvec1 as a type...

Author: bandinopla

src/Editor.ts

@@ -490,6 +490,13 @@ export class Editor {
     }
 
     reset() {
+
+        
+        //call exitCurrentNode until we reach the root
+        while (this.weAreInsideOf.length) {
+            this.exitCurrentNode();
+        }
+
         this.aspectCorrection =
             (this.canvas.offsetWidth / this.canvas.offsetHeight) * this.canvasAspect;
 

src/components/DataTypeComboBox.ts

@@ -2,6 +2,6 @@ import { ComboBox } from './ComboBox';
 
 export class DataTypeComboBox extends ComboBox {
     constructor(onChange?: (i: number) => void) {
-        super('Type', ['vec1', 'vec2', 'vec3', 'vec4'], onChange);
+        super('Type', ['float', 'vec2', 'vec3', 'vec4'], onChange);
     }
 }

src/core/IOutlet.ts

@@ -62,22 +62,18 @@ export const DataType = {
     float: { size: 1 },
     bool: { size: 1, bool: true },
 
-    vec1: { size: 1 },
     vec2: { size: 2 },
     vec3: { size: 3 },
     vec4: { size: 4 },
 
-    uvec1: { size: 1, unsigned: true, int: true },
     uvec2: { size: 2, unsigned: true, int: true },
     uvec3: { size: 3, unsigned: true, int: true },
     uvec4: { size: 4, unsigned: true, int: true },
 
-    ivec1: { size: 1, unsigned: false, int: true },
     ivec2: { size: 2, unsigned: false, int: true },
     ivec3: { size: 3, unsigned: false, int: true },
     ivec4: { size: 4, unsigned: false, int: true },
 
-    bvec1: { size: 1, bool: true },
     bvec2: { size: 2, bool: true },
     bvec3: { size: 3, bool: true },
     bvec4: { size: 4, bool: true },

src/nodes/vector/BumpMapNode.ts

@@ -31,7 +31,7 @@ export class BumpMapNode extends WinNode {
                 defaultValue: 1,
             }),
             //new InputOrValue(1, { label:"Distance", step:0.01, defaultValue:0.1 }),
-            new BasicInputProperty(DataType.vec1, 'Height', () => 'float(0.1)'),
+            new BasicInputProperty(DataType.float, 'Height', () => 'float(0.1)'),
             new BasicInputProperty(DataType.vec2, 'Normal', () => ''),
         ]);
 

src/properties/InputOrValue.ts

@@ -1,5 +1,5 @@
 import { DraggableValue } from '../components/DraggableValue';
-import { IOutlet, DataType } from '../core/IOutlet';
+import { IOutlet, DataType, DataTypes } from '../core/IOutlet';
 import { Script } from '../export/Script';
 import { Layout, Row } from '../layout/Layout';
 import { BasicInputProperty } from './BasicInputProperty';
@@ -60,12 +60,10 @@ export class InputOrValue extends BasicInputProperty {
         this.valueSlider.value = valConfig.defaultValue;
 
         this.addEventListener('typeChange', (ev) => {
-            if (ev.newType?.size > 1) {
+            if (this.connectedTo) {
                 this.layout = undefined;
             } else {
-                if (!this.layout && !this.connectedTo) {
-                    this.layout = this.notConnectedContent;
-                }
+                this.layout = this.notConnectedContent;
             }
         });
     } 
@@ -109,7 +107,6 @@ export class InputOrValue extends BasicInputProperty {
 
     protected override onConnected(to: IOutlet): void {
         if (!this.multiplyInputWithValue) this.layout = undefined;
-
         this.onChange?.();
     }
 
@@ -120,10 +117,18 @@ export class InputOrValue extends BasicInputProperty {
         this.onChange?.(this.layout ? this.valueSlider.value : undefined);
     }
 
-    override writeScript(script: Script): string {
-        script.importModule('float');
+    override writeScript(script: Script): string { 
+
+        const typeName = DataTypes.find( dt => dt.type == this.type)!.name;
 
-        const val = `float(${this.valueSlider.stringValue})`;
+        script.importModule(typeName);
+        
+        const valValue = this.valueSlider.stringValue;
+ 
+        const values = new Array(this.type.size).fill(valValue); 
+        
+        const val = `${typeName}(${values.join(',')})`; 
+        
 
         if (this.connectedTo) {
             const inputValue = this.connectedTo.writeScript(script);

src/properties/Vector1Output.ts

@@ -3,6 +3,6 @@ import { Output } from './Output';
 
 export class Vector1Output extends Output {
     constructor(name: string) {
-        super(name, DataType.vec1);
+        super(name, DataType.float);
     }
 }