浏览代码

TransformControls: Simplified intersectObjectWithRay.

Mr.doob 5 年之前
父节点
当前提交
327b63a4f9
共有 2 个文件被更改,包括 8 次插入16 次删除
  1. 4 8
      examples/js/controls/TransformControls.js
  2. 4 8
      examples/jsm/controls/TransformControls.js

+ 4 - 8
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();

+ 4 - 8
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();