summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/LightControl.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-09-29 16:47:34 -0400
committerJules Laplace <jules@okfoc.us>2014-09-29 16:47:34 -0400
commitf80ca0ef62785cf72176598b695a1a291dd38e91 (patch)
treed3ea5651d9c02fd7b1b6c1e3b72392839dfa1974 /public/assets/javascripts/ui/editor/LightControl.js
parentadba61c0fa7231372864e742b9775ba0531ad046 (diff)
fix error in color picker
Diffstat (limited to 'public/assets/javascripts/ui/editor/LightControl.js')
-rw-r--r--public/assets/javascripts/ui/editor/LightControl.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index d975180..96f6942 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -247,11 +247,11 @@ var LabColorPicker = function (parent, w, h) {
var var_G = ( RGB[1] / 255 ) // G from 0 to 255
var var_B = ( RGB[2] / 255 ) // B from 0 to 255
- if ( var_R > 0.04045 ) var_R = ( ( var_R + 0.055 ) / 1.055 ) ^ 2.4
+ if ( var_R > 0.04045 ) var_R = Math.pow( ( var_R + 0.055 ) / 1.055, 2.4)
else var_R = var_R / 12.92
- if ( var_G > 0.04045 ) var_G = ( ( var_G + 0.055 ) / 1.055 ) ^ 2.4
+ if ( var_G > 0.04045 ) var_G = Math.pow( ( var_G + 0.055 ) / 1.055, 2.4)
else var_G = var_G / 12.92
- if ( var_B > 0.04045 ) var_B = ( ( var_B + 0.055 ) / 1.055 ) ^ 2.4
+ if ( var_B > 0.04045 ) var_B = Math.pow( ( var_B + 0.055 ) / 1.055, 2.4)
else var_B = var_B / 12.92
var_R = var_R * 100