Skip to content

Commit 95b17a5

Browse files
mrdoobmrdoob
committed
Added style strings support THREE.Color.
So far these work: new THREE.Color( 'rgb(255,0,0)' ); new THREE.Color( 'purple' ); new THREE.Color( 0xff0000 );
1 parent f9f4483 commit 95b17a5

2 files changed

Lines changed: 44 additions & 9 deletions

File tree

‎src/core/Color.js‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
* @author mrdoob / http://mrdoob.com/
33
*/
44

5-
THREE.Color = function ( hex ) {
5+
THREE.Color = function ( value ) {
66

7-
if ( hex !== undefined ) this.setHex( hex );
7+
if ( value !== undefined ) {
8+
9+
this.set( value );
10+
11+
}
812

913
return this;
1014

@@ -68,6 +72,22 @@ THREE.Color.prototype = {
6872

6973
},
7074

75+
set: function ( value ) {
76+
77+
switch ( typeof value ) {
78+
79+
case "number":
80+
this.setHex( value );
81+
break;
82+
83+
case "string":
84+
this.setContextStyle( value );
85+
break;
86+
87+
}
88+
89+
},
90+
7191
setRGB: function ( r, g, b ) {
7292

7393
this.r = r;
@@ -173,13 +193,26 @@ THREE.Color.prototype = {
173193

174194
setContextStyle: function ( style ) {
175195

176-
var color = /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/i.exec( style );
196+
if ( /^rgb\((\d+),(\d+),(\d+)\)$/i.test( style ) ) {
177197

178-
this.r = parseInt( color[ 1 ], 10 ) / 255;
179-
this.g = parseInt( color[ 2 ], 10 ) / 255;
180-
this.b = parseInt( color[ 3 ], 10 ) / 255;
198+
var color = /^rgb\((\d+),(\d+),(\d+)\)$/i.exec( style );
199+
200+
this.r = parseInt( color[ 1 ], 10 ) / 255;
201+
this.g = parseInt( color[ 2 ], 10 ) / 255;
202+
this.b = parseInt( color[ 3 ], 10 ) / 255;
203+
204+
return this;
205+
206+
}
207+
208+
if ( /^(\w+)$/i.test( style ) ) {
209+
210+
this.setHex( THREE.ColorKeywords[ style ] );
211+
212+
return this;
213+
214+
}
181215

182-
return this;
183216

184217
},
185218

@@ -269,3 +302,5 @@ THREE.Color.prototype = {
269302
}
270303

271304
};
305+
306+
THREE.ColorKeywords = { "aliceblue": 0xF0F8FF, "antiquewhite": 0xFAEBD7, "aqua": 0x00FFFF, "aquamarine": 0x7FFFD4, "azure": 0xF0FFFF, "beige": 0xF5F5DC, "bisque": 0xFFE4C4, "black": 0x000000, "blanchedalmond": 0xFFEBCD, "blue": 0x0000FF, "blueviolet": 0x8A2BE2, "brown": 0xA52A2A, "burlywood": 0xDEB887, "cadetblue": 0x5F9EA0, "chartreuse": 0x7FFF00, "chocolate": 0xD2691E, "coral": 0xFF7F50, "cornflowerblue": 0x6495ED, "cornsilk": 0xFFF8DC, "crimson": 0xDC143C, "cyan": 0x00FFFF, "darkblue": 0x00008B, "darkcyan": 0x008B8B, "darkgoldenrod": 0xB8860B, "darkgray": 0xA9A9A9, "darkgreen": 0x006400, "darkgrey": 0xA9A9A9, "darkkhaki": 0xBDB76B, "darkmagenta": 0x8B008B, "darkolivegreen": 0x556B2F, "darkorange": 0xFF8C00, "darkorchid": 0x9932CC, "darkred": 0x8B0000, "darksalmon": 0xE9967A, "darkseagreen": 0x8FBC8F, "darkslateblue": 0x483D8B, "darkslategray": 0x2F4F4F, "darkslategrey": 0x2F4F4F, "darkturquoise": 0x00CED1, "darkviolet": 0x9400D3, "deeppink": 0xFF1493, "deepskyblue": 0x00BFFF, "dimgray": 0x696969, "dimgrey": 0x696969, "dodgerblue": 0x1E90FF, "firebrick": 0xB22222, "floralwhite": 0xFFFAF0, "forestgreen": 0x228B22, "fuchsia": 0xFF00FF, "gainsboro": 0xDCDCDC, "ghostwhite": 0xF8F8FF, "gold": 0xFFD700, "goldenrod": 0xDAA520, "gray": 0x808080, "green": 0x008000, "greenyellow": 0xADFF2F, "grey": 0x808080, "honeydew": 0xF0FFF0, "hotpink": 0xFF69B4, "indianred": 0xCD5C5C, "indigo": 0x4B0082, "ivory": 0xFFFFF0, "khaki": 0xF0E68C, "lavender": 0xE6E6FA, "lavenderblush": 0xFFF0F5, "lawngreen": 0x7CFC00, "lemonchiffon": 0xFFFACD, "lightblue": 0xADD8E6, "lightcoral": 0xF08080, "lightcyan": 0xE0FFFF, "lightgoldenrodyellow": 0xFAFAD2, "lightgray": 0xD3D3D3, "lightgreen": 0x90EE90, "lightgrey": 0xD3D3D3, "lightpink": 0xFFB6C1, "lightsalmon": 0xFFA07A, "lightseagreen": 0x20B2AA, "lightskyblue": 0x87CEFA, "lightslategray": 0x778899, "lightslategrey": 0x778899, "lightsteelblue": 0xB0C4DE, "lightyellow": 0xFFFFE0, "lime": 0x00FF00, "limegreen": 0x32CD32, "linen": 0xFAF0E6, "magenta": 0xFF00FF, "maroon": 0x800000, "mediumaquamarine": 0x66CDAA, "mediumblue": 0x0000CD, "mediumorchid": 0xBA55D3, "mediumpurple": 0x9370DB, "mediumseagreen": 0x3CB371, "mediumslateblue": 0x7B68EE, "mediumspringgreen": 0x00FA9A, "mediumturquoise": 0x48D1CC, "mediumvioletred": 0xC71585, "midnightblue": 0x191970, "mintcream": 0xF5FFFA, "mistyrose": 0xFFE4E1, "moccasin": 0xFFE4B5, "navajowhite": 0xFFDEAD, "navy": 0x000080, "oldlace": 0xFDF5E6, "olive": 0x808000, "olivedrab": 0x6B8E23, "orange": 0xFFA500, "orangered": 0xFF4500, "orchid": 0xDA70D6, "palegoldenrod": 0xEEE8AA, "palegreen": 0x98FB98, "paleturquoise": 0xAFEEEE, "palevioletred": 0xDB7093, "papayawhip": 0xFFEFD5, "peachpuff": 0xFFDAB9, "peru": 0xCD853F, "pink": 0xFFC0CB, "plum": 0xDDA0DD, "powderblue": 0xB0E0E6, "purple": 0x800080, "red": 0xFF0000, "rosybrown": 0xBC8F8F, "royalblue": 0x4169E1, "saddlebrown": 0x8B4513, "salmon": 0xFA8072, "sandybrown": 0xF4A460, "seagreen": 0x2E8B57, "seashell": 0xFFF5EE, "sienna": 0xA0522D, "silver": 0xC0C0C0, "skyblue": 0x87CEEB, "slateblue": 0x6A5ACD, "slategray": 0x708090, "slategrey": 0x708090, "snow": 0xFFFAFA, "springgreen": 0x00FF7F, "steelblue": 0x4682B4, "tan": 0xD2B48C, "teal": 0x008080, "thistle": 0xD8BFD8, "tomato": 0xFF6347, "turquoise": 0x40E0D0, "violet": 0xEE82EE, "wheat": 0xF5DEB3, "white": 0xFFFFFF, "whitesmoke": 0xF5F5F5, "yellow": 0xFFFF00, "yellowgreen": 0x9ACD32 };

‎src/materials/Material.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ THREE.Material.prototype.setValues = function ( values ) {
6262

6363
currentValue.copy( newValue );
6464

65-
} else if ( currentValue instanceof THREE.Color && typeof( newValue ) === "number" ) {
65+
} else if ( currentValue instanceof THREE.Color ) {
6666

67-
currentValue.setHex( newValue );
67+
currentValue.set( newValue );
6868

6969
} else if ( currentValue instanceof THREE.Vector3 && newValue instanceof THREE.Vector3 ) {
7070

0 commit comments

Comments
 (0)