bugfix

Author: bandinopla

src/EditorNodes.ts

@@ -64,7 +64,7 @@ export const NodeTypes: NodeGroupType[] = [
         color: Theme.config.groupAnimation as string,
         nodes: [
             { TypeClass: TimeNode, name:"time", id:"timer" },
-            { TypeClass: AnimatedPixelNode, name:"Animated Pixel", id:"timer" },
+            { TypeClass: AnimatedPixelNode, name:"Animated Pixel", id:"animated-pixel" },
         ]
     },
     {

src/export/Script.ts

@@ -222,6 +222,8 @@ export class Script {
     ) {
         functionName = 'fn_' + functionName;
 
+        this.importModule("Fn");
+
         if (!this.isDefined(functionName, this.rootScope)) {
             this.rootScope.definitions.push([
                 functionName,

src/nodes/Node.ts

@@ -262,7 +262,7 @@ export class Node<MyEvents extends NodeEvents = NodeEvents>
      * specify what data type that reference will be expressed as.
      */
     get nodeDataType(): IDataType | undefined {
-        throw new Error(`Implement me...`);
+        //throw new Error(`Implement me...`);
     }
 
     /**

src/nodes/animation/AnimatedPixelNode.ts

@@ -1,7 +1,7 @@
 
 
 import { Theme } from "../../colors/Theme";
-import { DataType } from "../../core/IOutlet";
+import { DataType, IDataType } from "../../core/IOutlet";
 import { Script } from "../../export/Script";
 import { Output } from "../../properties/Output";
 import { ExecutableLogicNode } from "../logic/ExecutableLogicNode";
@@ -18,14 +18,18 @@ export class AnimatedPixelNode extends WinNode {
 
     constructor() {
         super("Animated Pixel", Theme.config.groupAnimation, [
-            new Output("color ( VAR )", DataType.vec3, "color" ), 
+            new Output("color ( VAR )", DataType.vec3, ()=>this.nodeName+".color" ), 
             new Output("on update", DataType.script),
             new Output("final color", DataType.vec3, "output" ),
         ]);
 
         this.scriptOutput = this.getChildOfType(Output,1)!;
     }  
 
+    override get nodeDataType(): IDataType | undefined {
+        return DataType.vec3
+    }
+
     protected override writeNodeScript( script: Script ): string {
         // this is where we write our ThreeJs TSL javascript node code...
         script.importModule("color");
@@ -42,8 +46,9 @@ export class AnimatedPixelNode extends WinNode {
             scope,
             this.nodeName+"Fn",
             false, 
+            colorVar
         );
 
-        return script.define( this.nodeName, `{ color:${colorVar}, output:${fn} }`);
+        return script.define( this.nodeName, `{ color:${colorVar}, output:${fn}() }`);
     } 
 }

src/properties/BaseColorProperty.ts

@@ -38,7 +38,7 @@ export class BaseColorProperty extends Input {
         let baseColor = `color(0x${this.colorPicker.color.getHexString()})`;
 
         if (this.connectedTo) {
-            const input = this.connectedTo.writeScript(script) + '.toVec3()';
+            const input = this.connectedTo.writeScript(script)  ;
             baseColor = this.multipliesInput
                 ? `${baseColor}.mul(${input})`
                 : input;

src/properties/OutletProperty.ts

@@ -38,7 +38,7 @@ export class OutletProperty
     /**
      * What property of the data we will read we must return? if undefined, the entire data will be returned.
      */
-    private _outputProp?: string;
+    private _outputProp?: string | (()=>string);
 
     private _type!: IDataType;
 
@@ -62,7 +62,7 @@ export class OutletProperty
      * @param prop
      * @returns
      */
-    outputProp(prop: string) {
+    outputProp(prop: string | ()=>string) {
         this._outputProp = prop;
         return this;
     }
@@ -185,6 +185,8 @@ export class OutletProperty
             }
         }
 
+        console.log("NEED TO CONVERT ", from, to)
+
         if (size === DataSize.vec2) return `${base}.toVec2()`;
         if (size === DataSize.vec3) return `${base}.toVec3()`;
         if (size === DataSize.vec4) return `${base}.toVec4()`;
@@ -347,10 +349,18 @@ export class OutletProperty
             else {
                 // if the scope of our cached owner is not reachabe from the script current scope, it means it is invalid, non reachable.
 
-                otherNameRef = this.owner.writeScript(script); ///script.getOrCacheNodeScript( this.owner ); // if this throws an error, it will be catche by the input outlet that called us.
+                 ///script.getOrCacheNodeScript( this.owner ); // if this throws an error, it will be catche by the input outlet that called us.
+                
 
-                if (this._outputProp) {
-                    otherNameRef += '.' + this._outputProp;
+                if (this._outputProp && typeof this._outputProp == "function") {
+                    otherNameRef = this._outputProp(); 
+                }
+                else 
+                {
+                    otherNameRef = this.owner.writeScript(script);
+                    if (this._outputProp) {
+                        otherNameRef += '.' + this._outputProp;
+                    }
                 }
 
                 if (this.owner.nodeDataType)

src/properties/Output.ts

@@ -10,7 +10,7 @@ export class Output extends OutletProperty {
     constructor(
         public label: string,
         size: IDataType,
-        ownerProp?: string,
+        ownerProp?: string | (()=>string),
     ) {
         super(false, size);