From d47e8eb9991091799da66281baab2c5f300892ec Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Tue, 22 Mar 2016 17:39:57 +0100 Subject: [PATCH] Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays. --- examples/particle_explorer/particleExplorer.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/examples/particle_explorer/particleExplorer.js b/examples/particle_explorer/particleExplorer.js index 307e361ff1..4fd0978a84 100644 --- a/examples/particle_explorer/particleExplorer.js +++ b/examples/particle_explorer/particleExplorer.js @@ -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);