Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7423 from thoys/20859

Browse source 
CR for Job #20859 - Fix particle color selection
This commit is contained in:
Philip Rosedale 2016-03-24 00:20:59 -07:00
commit 8e572ed635
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/particle_explorer/particleExplorer.js
View file

@ -198,6 +198,16 @@ function createColorPicker(key) {
settings[key] = colorArray;
var controller = gui.addColor(settings, key);
controller.onChange(function(value) {
// Handle hex colors
if(_.isString(value) && value[0] === '#') {
const BASE_HEX = 16;
var colorRegExResult = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(value);
value = [
parseInt(colorRegExResult[1], BASE_HEX),
parseInt(colorRegExResult[2], BASE_HEX),
parseInt(colorRegExResult[3], BASE_HEX)
];
}
var obj = {};
obj[key] = convertColorArrayToObject(value);
writeVec3ToInterface(obj);