From 984f2c492c8ffd6bf6b4717557ccf835f240a592 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 29 Sep 2014 16:24:38 -0400 Subject: found some carats that should be Math.pow --- js/color.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/color.js b/js/color.js index 879a78b..5073e7f 100644 --- a/js/color.js +++ b/js/color.js @@ -16,11 +16,11 @@ function rgb2xyz(rgb){ 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 @@ -107,11 +107,11 @@ function cielab2xyz (lab){ var var_X = lab[1] / 500 + var_Y var var_Z = var_Y - lab[2] / 200 - if ( var_Y^3 > 0.008856 ) var_Y = Math.pow(var_Y, 3) + if ( Math.pow(var_Y, 3) > 0.008856 ) var_Y = Math.pow(var_Y, 3) else var_Y = ( var_Y - 16 / 116 ) / 7.787 - if ( var_X^3 > 0.008856 ) var_X = Math.pow(var_X, 3) + if ( Math.pow(var_X, 3) > 0.008856 ) var_X = Math.pow(var_X, 3) else var_X = ( var_X - 16 / 116 ) / 7.787 - if ( var_Z^3 > 0.008856 ) var_Z = Math.pow(var_Z, 3) + if ( Math.pow(var_Z, 3) > 0.008856 ) var_Z = Math.pow(var_Z, 3) else var_Z = ( var_Z - 16 / 116 ) / 7.787 var x = REF_X * var_X //ref_X = 95.047 Observer= 2°, Illuminant= D65 -- cgit v1.2.3-70-g09d2 From 1631cdf643283fc71bc9d70b5dcbce03ab9c2386 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 29 Sep 2014 16:25:22 -0400 Subject: sp --- js/color.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/color.js b/js/color.js index 5073e7f..215c3e6 100644 --- a/js/color.js +++ b/js/color.js @@ -16,11 +16,11 @@ function rgb2xyz(rgb){ 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 = Math.pow(( ( 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 = Math.pow(( ( 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 = Math.pow(( ( 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 -- cgit v1.2.3-70-g09d2 From 04537ed34d443d0610b77420d1dbef64bc05fbfa Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 22 Nov 2014 23:19:12 -0500 Subject: fix atan2 --- js/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/util.js b/js/util.js index 7bb1c78..1a1a0fe 100644 --- a/js/util.js +++ b/js/util.js @@ -30,7 +30,7 @@ function tan(n){ return Math.tan(n) } function acos(n){ return Math.cos(n) } function asin(n){ return Math.sin(n) } function atan(n){ return Math.atan(n) } -function atan2(n){ return Math.atan2(n) } +function atan2(a,b){ return Math.atan2(a,b) } function sec(n){ return 1/cos(n) } function csc(n){ return 1/sin(n) } function cot(n){ return 1/tan(n) } -- cgit v1.2.3-70-g09d2