Fixed bug in colour picker
This commit is contained in:
parent
637b327db5
commit
70247110f3
2
gui.js
2
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' ]);
|
||||
|
||||
4
main.js
4
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;
|
||||
|
||||
@ -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]);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user