瀏覽代碼

THREE.Color support for '#ff0000' and '#f00'.

Mr.doob 12 年之前
父節點
當前提交
62bb18f918
共有 1 個文件被更改,包括 25 次插入5 次删除
  1. 25 5
      src/core/Color.js

+ 25 - 5
src/core/Color.js

@@ -4,11 +4,7 @@
 
 
 THREE.Color = function ( value ) {
 THREE.Color = function ( value ) {
 
 
-	if ( value !== undefined ) {
-
-		this.set( value );
-
-	}
+	if ( value !== undefined ) this.set( value );
 
 
 	return this;
 	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
 		// red
 
 
 		if ( /^(\w+)$/i.test( style ) ) {
 		if ( /^(\w+)$/i.test( style ) ) {