From 70247110f379d204e1cbcce757d8e37d8e2a477c Mon Sep 17 00:00:00 2001 From: Mike Lynch Date: Tue, 20 Jan 2026 09:45:31 +1100 Subject: [PATCH] Fixed bug in colour picker --- gui.js | 2 +- main.js | 4 ---- taperedLink.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gui.js b/gui.js index 92fcc4c..9baa3fe 100644 --- a/gui.js +++ b/gui.js @@ -83,7 +83,7 @@ class FourDGUI { this.gui.add(this.params, 'linksize', 0, 2); this.gui.add(this.params, 'linkopacity', 0, 1).onChange((v) => funcs.setLinkOpacity(v, true)); this.gui.add(this.params, 'link2opacity', 0, 1).onChange((v) => funcs.setLinkOpacity(v, false)); - this.gui.addColor(this.params, 'colour').onChange(funcs.setColour); + this.gui.addColor(this.params, 'colour').onChange(funcs.setColours); this.gui.addColor(this.params, 'background').onChange(funcs.setBackground); this.gui.add(this.params, 'xRotate', [ 'YW', 'YZ', 'ZW' ]); this.gui.add(this.params, 'yRotate', [ 'XZ', 'XY', 'XW' ]); diff --git a/main.js b/main.js index 90d01c8..e24abc2 100644 --- a/main.js +++ b/main.js @@ -158,13 +158,11 @@ relnotes.addEventListener('click', releaseNotes); function setColours(c) { const nc = get_colours(c); for( let i = 0; i < node_ms.length; i++ ) { - console.log(`Setting base colour ${i} ${nc[i]}`); node_ms[i].color = new THREE.Color(nc[i]); link_ms[i].color = new THREE.Color(nc[i]); } if( shape ) { // taperedLink.set_color updates according to the link index - console.log("Setting link material colours"); shape.links.map((l) => l.object.set_colour(nc)); } } @@ -202,8 +200,6 @@ function changeShape() { } function setVisibility(option_name) { - console.log("setVisibility", option_name); - console.log(structure.options); const option = structure.options.filter((o) => o.name === option_name); if( option.length ) { node_show = option[0].nodes; diff --git a/taperedLink.js b/taperedLink.js index 75f4e01..737e5fb 100644 --- a/taperedLink.js +++ b/taperedLink.js @@ -57,7 +57,7 @@ class TaperedLink extends THREE.Group { } set_colour(colours) { - console.log(`set_colour {this.colour_i}`); + console.log(`taperedLink.set_colour {this.colour_i} {colours[this.colour_i]}`); this.material.color = new THREE.Color(colours[this.colour_i]); }