|
@@ -4,11 +4,7 @@
|
|
|
|
|
|
THREE.Color = function ( value ) {
|
|
|
|
|
|
- if ( value !== undefined ) {
|
|
|
-
|
|
|
- this.set( value );
|
|
|
-
|
|
|
- }
|
|
|
+ if ( value !== undefined ) this.set( value );
|
|
|
|
|
|
return this;
|
|
|
|
|
@@ -221,6 +217,30 @@ THREE.Color.prototype = {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ // #ff0000
|
|
|
+
|
|
|
+ if ( /^\#([0-9a-f]{6})$/i.test( style ) ) {
|
|
|
+
|
|
|
+ var color = /^\#([0-9a-f]{6})$/i.exec( style );
|
|
|
+
|
|
|
+ this.setHex( parseInt( color[ 1 ], 16 ) );
|
|
|
+
|
|
|
+ return this;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ // #f00
|
|
|
+
|
|
|
+ if ( /^\#([0-9a-f])([0-9a-f])([0-9a-f])$/i.test( style ) ) {
|
|
|
+
|
|
|
+ var color = /^\#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec( style );
|
|
|
+
|
|
|
+ this.setHex( parseInt( color[ 1 ] + color[ 1 ] + color[ 2 ] + color[ 2 ] + color[ 3 ] + color[ 3 ], 16 ) );
|
|
|
+
|
|
|
+ return this;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
// red
|
|
|
|
|
|
if ( /^(\w+)$/i.test( style ) ) {
|