base color multiply input color by the base color + ignore alpha

Author: bandinopla

src/components/ColorPicker.ts

@@ -32,13 +32,14 @@ export class ColorPicker extends InteractiveLayoutElement  implements IOverlayRe
 
     private hsl:HSL = {h:0, s:0, l:0};
 
-    constructor( private onColorChange?:(color:Color, opacity:number)=>void ) {
+    constructor( private onColorChange?:(color:Color, opacity:number)=>void, transparent=true ) {
         super();
         this.backgroundColor = "black";
 
         this.colorWheel = new ColorWheel(this.onColorWheel.bind(this)); 
         this.colorSwatch = new ColorSwatch();
         this.alphaSlider = new DraggableValue("Alpha", true, 0, 1, 0.01, this.onAlphaSlider.bind(this));
+        this.alphaSlider.enabled = transparent;
 
         this.RGBSliders = ["R","G","B"].map((name,i)=>new DraggableValue(name, true, 0.001, 1, 0.01, this.onRGBSlider.bind(this, i)))
         this.HSLSliders = ["H","S","L"].map((name,i)=>new DraggableValue(name, true, 0.001, 1, 0.01, this.onHSLSlider.bind(this, i)))
@@ -85,7 +86,7 @@ export class ColorPicker extends InteractiveLayoutElement  implements IOverlayRe
         //
         this.opacity = 1;
         this.saturation = 1;
-        this.color = new Color("black");  
+        this.color = new Color("white");  
     }
 
     get opacity() { return this._opacity; }

src/properties/BaseColorProperty.ts

@@ -13,7 +13,7 @@ export class BaseColorProperty extends Input {
     constructor() {
         super(3); 
 
-        this.colorPicker = new ColorPicker(()=>this.root.update());
+        this.colorPicker = new ColorPicker(()=>this.root.update(), false); 
 
         this.layout = new Layout([
             new TextLabel("Base Color"), 
@@ -23,25 +23,20 @@ export class BaseColorProperty extends Input {
         }); 
 
         this.xPadding = 10; 
-    }
+    } 
 
-    protected override onConnected(to: IOutlet): void {
-        this.colorPicker.enabled = false
-    }
+    override writeScript(script: Script): string {
 
-    protected override onDisconnected(from: IOutlet): void {
-        this.colorPicker.enabled = true
-    }
+        let baseColor = `color(0x${ this.colorPicker.color.getHexString() })`;
 
-    override writeScript(script: Script): string {
         if( this.connectedTo )
         {
-            return super.writeScript(script);
+            baseColor = baseColor + `.mul(${ this.connectedTo.writeScript( script ) })`;
         }
 
         script.importModule("color");
 
-        return script.define( this.outletName, `color(0x${ this.colorPicker.color.getHexString() })` )
+        return script.define( this.outletName, baseColor )
     } 
 
 }