Browse Source

Updated builds.

Mr.doob 11 years ago
parent
commit
b7a6faffb8
2 changed files with 359 additions and 36993 deletions
  1. 29 27
      build/three.js
  2. 330 36966
      build/three.min.js

+ 29 - 27
build/three.js

@@ -6740,6 +6740,8 @@ THREE.EventDispatcher.prototype = {
 
 			event.target = this;
 
+			listenerArray = listenerArray.slice();
+
 			for ( var i = 0, l = listenerArray.length; i < l; i ++ ) {
 
 				listenerArray[ i ].call( this, event );
@@ -15723,18 +15725,22 @@ THREE.CanvasRenderer = function ( parameters ) {
 		if ( material instanceof THREE.SpriteMaterial ||
 			 material instanceof THREE.ParticleSystemMaterial ) { // Backwards compatibility
 
-			if ( material.map === null ) {
+			if ( material.map.image !== undefined ) {
 
-				scaleX = element.object.scale.x;
-				scaleY = element.object.scale.y;
+				bitmap = material.map.image;
+				bitmapWidth = bitmap.width >> 1;
+				bitmapHeight = bitmap.height >> 1;
 
-				// TODO: Be able to disable this
+				scaleX = element.scale.x * _canvasWidthHalf;
+				scaleY = element.scale.y * _canvasHeightHalf;
 
-				scaleX *= element.scale.x * _canvasWidthHalf;
-				scaleY *= element.scale.y * _canvasHeightHalf;
+				width = scaleX * bitmapWidth;
+				height = scaleY * bitmapHeight;
 
-				_elemBox.min.set( v1.x - scaleX, v1.y - scaleY );
-				_elemBox.max.set( v1.x + scaleX, v1.y + scaleY );
+				// TODO: Rotations break this...
+
+				_elemBox.min.set( v1.x - width, v1.y - height );
+				_elemBox.max.set( v1.x + width, v1.y + height );
 
 				if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
 
@@ -15743,31 +15749,27 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 				}
 
-				setFillStyle( material.color.getStyle() );
-
 				_context.save();
 				_context.translate( v1.x, v1.y );
 				_context.rotate( - element.rotation );
-				_context.scale( scaleX, scaleY );
-				_context.fillRect( -1, -1, 2, 2 );
+				_context.scale( scaleX, - scaleY );
+
+				_context.translate( - bitmapWidth, - bitmapHeight );
+				_context.drawImage( bitmap, 0, 0 );
 				_context.restore();
 
 			} else {
 
-				bitmap = material.map.image;
-				bitmapWidth = bitmap.width >> 1;
-				bitmapHeight = bitmap.height >> 1;
-
-				scaleX = element.scale.x * _canvasWidthHalf;
-				scaleY = element.scale.y * _canvasHeightHalf;
+				scaleX = element.object.scale.x;
+				scaleY = element.object.scale.y;
 
-				width = scaleX * bitmapWidth;
-				height = scaleY * bitmapHeight;
+				// TODO: Be able to disable this
 
-				// TODO: Rotations break this...
+				scaleX *= element.scale.x * _canvasWidthHalf;
+				scaleY *= element.scale.y * _canvasHeightHalf;
 
-				_elemBox.min.set( v1.x - width, v1.y - height );
-				_elemBox.max.set( v1.x + width, v1.y + height );
+				_elemBox.min.set( v1.x - scaleX, v1.y - scaleY );
+				_elemBox.max.set( v1.x + scaleX, v1.y + scaleY );
 
 				if ( _clipBox.isIntersectionBox( _elemBox ) === false ) {
 
@@ -15776,13 +15778,13 @@ THREE.CanvasRenderer = function ( parameters ) {
 
 				}
 
+				setFillStyle( material.color.getStyle() );
+
 				_context.save();
 				_context.translate( v1.x, v1.y );
 				_context.rotate( - element.rotation );
-				_context.scale( scaleX, - scaleY );
-
-				_context.translate( - bitmapWidth, - bitmapHeight );
-				_context.drawImage( bitmap, 0, 0 );
+				_context.scale( scaleX, scaleY );
+				_context.fillRect( -1, -1, 2, 2 );
 				_context.restore();
 
 			}

File diff suppressed because it is too large
+ 330 - 36966
build/three.min.js


Some files were not shown because too many files changed in this diff