Browse Source

Ray: Simplify

dubejf 10 years ago
parent
commit
399a7c740a
2 changed files with 5 additions and 9 deletions
  1. 3 7
      src/math/Ray.js
  2. 2 2
      src/objects/Sprite.js

+ 3 - 7
src/math/Ray.js

@@ -69,15 +69,11 @@ THREE.Ray.prototype = {
 
 
 	},
 	},
 
 
-	distanceToPoint: function () {
+	distanceToPoint: function ( point ) {
 
 
-		return function ( point ) {
-
-			return Math.sqrt( this.distanceSqToPoint( point ) );
-
-		};
+		return Math.sqrt( this.distanceSqToPoint( point ) );
 
 
-	}(),
+	},
 
 
 	distanceSqToPoint: function () {
 	distanceSqToPoint: function () {
 
 

+ 2 - 2
src/objects/Sprite.js

@@ -39,9 +39,9 @@ THREE.Sprite.prototype.raycast = ( function () {
 		matrixPosition.setFromMatrixPosition( this.matrixWorld );
 		matrixPosition.setFromMatrixPosition( this.matrixWorld );
 
 
 		var distanceSq = raycaster.ray.distanceSqToPoint( matrixPosition );
 		var distanceSq = raycaster.ray.distanceSqToPoint( matrixPosition );
-		var diag = ( this.scale.x + this.scale.y ) / 2;
+		var guessSizeSq = this.scale.x * this.scale.y;
 		
 		
-		if ( distanceSq > diag * diag ) {
+		if ( distanceSq > guessSizeSq ) {
 
 
 			return;
 			return;