Browse Source

Color: Fixed hls(a) parsing. See #7336.

Mr.doob 9 years ago
parent
commit
a9c507640f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/math/Color.js

+ 2 - 2
src/math/Color.js

@@ -191,7 +191,7 @@ THREE.Color.prototype = {
 					if ( color = /^([0-9]*\.?[0-9]+)\s*,\s*(\d+)\%\s*,\s*(\d+)\%\s*$/.exec( components ) ) {
 					if ( color = /^([0-9]*\.?[0-9]+)\s*,\s*(\d+)\%\s*,\s*(\d+)\%\s*$/.exec( components ) ) {
 
 
 						// hsl(120,50%,50%)
 						// hsl(120,50%,50%)
-						var h = parseFloat( color[ 1 ] );
+						var h = parseFloat( color[ 1 ] ) / 360;
 						var s = parseInt( color[ 2 ], 10 ) / 100;
 						var s = parseInt( color[ 2 ], 10 ) / 100;
 						var l = parseInt( color[ 3 ], 10 ) / 100;
 						var l = parseInt( color[ 3 ], 10 ) / 100;
 
 
@@ -206,7 +206,7 @@ THREE.Color.prototype = {
 					if ( color = /^([0-9]*\.?[0-9]+)\s*,\s*(\d+)\%\s*,\s*(\d+)\%\s*,\s*([0-9]*\.?[0-9]+)\s*$/.exec( components ) ) {
 					if ( color = /^([0-9]*\.?[0-9]+)\s*,\s*(\d+)\%\s*,\s*(\d+)\%\s*,\s*([0-9]*\.?[0-9]+)\s*$/.exec( components ) ) {
 
 
 						// hsla(120,50%,50%,0.5)
 						// hsla(120,50%,50%,0.5)
-						var h = parseFloat( color[ 1 ] );
+						var h = parseFloat( color[ 1 ] ) / 360;
 						var s = parseInt( color[ 2 ], 10 ) / 100;
 						var s = parseInt( color[ 2 ], 10 ) / 100;
 						var l = parseInt( color[ 3 ], 10 ) / 100;
 						var l = parseInt( color[ 3 ], 10 ) / 100;
 						parseAlpha( color[ 4 ] );
 						parseAlpha( color[ 4 ] );