TransformControls: Simplified intersectObjectWithRay.

mrdoob · Apr 25, 2020 · 327b63a · 327b63a
1 parent 22749d1
commit 327b63a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/examples/js/controls/TransformControls.js b/examples/js/controls/TransformControls.js
@@ -52,27 +52,23 @@ THREE.TransformControls = function ( camera, domElement ) {
 
 	var raycaster = new THREE.Raycaster();
 
-	var intersectObjectWithRay = function ( object, raycaster, includeInvisible ) {
+	function intersectObjectWithRay( object, raycaster, includeInvisible ) {
 
 		var allIntersections = raycaster.intersectObject( object, true );
 
-		var intersection = false;
-
 		for ( var i = allIntersections.length; i --; ) {
 
 			if ( allIntersections[ i ].object.visible || includeInvisible ) {
 
-				intersection = allIntersections[ i ];
-
-				continue;
+				return allIntersections[ i ];
 
 			}
 
 		}
 
-		return intersection;
+		return false;
 
-	};
+	}
 
 	var _tempVector = new THREE.Vector3();
 	var _tempVector2 = new THREE.Vector3();

diff --git a/examples/jsm/controls/TransformControls.js b/examples/jsm/controls/TransformControls.js
@@ -75,27 +75,23 @@ var TransformControls = function ( camera, domElement ) {
 
 	var raycaster = new Raycaster();
 
-	var intersectObjectWithRay = function ( object, raycaster, includeInvisible ) {
+	function intersectObjectWithRay( object, raycaster, includeInvisible ) {
 
 		var allIntersections = raycaster.intersectObject( object, true );
 
-		var intersection = false;
-
 		for ( var i = allIntersections.length; i --; ) {
 
 			if ( allIntersections[ i ].object.visible || includeInvisible ) {
 
-				intersection = allIntersections[ i ];
-
-				continue;
+				return allIntersections[ i ];
 
 			}
 
 		}
 
-		return intersection;
+		return false;
 
-	};
+	}
 
 	var _tempVector = new Vector3();
 	var _tempVector2 = new Vector3();