未验证 提交 5ee6e857 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #19177 from Mugen87/dev49

TransformControls: Fix arguments of intersectObjectWithRay().
......@@ -52,15 +52,15 @@ THREE.TransformControls = function ( camera, domElement ) {
var raycaster = new THREE.Raycaster();
var intersectObjectWithRay = function( object, raycaster, includeInvisible ) {
var intersectObjectWithRay = function ( object, raycaster, includeInvisible ) {
var allIntersections = raycaster.intersectObject( object, true );
var intersection = false;
for ( var i = allIntersections.length; i--; ) {
for ( var i = allIntersections.length; i --; ) {
if (allIntersections[i].object.visible || includeInvisible) {
if ( allIntersections[ i ].object.visible || includeInvisible ) {
intersection = allIntersections[ i ];
......@@ -72,7 +72,7 @@ THREE.TransformControls = function ( camera, domElement ) {
return intersection;
}
};
var _tempVector = new THREE.Vector3();
var _tempVector2 = new THREE.Vector3();
......@@ -283,7 +283,7 @@ THREE.TransformControls = function ( camera, domElement ) {
raycaster.setFromCamera( pointer, this.camera );
var planeIntersect = intersectObjectWithRay( [ _plane ], raycaster, true );
var planeIntersect = intersectObjectWithRay( _plane, raycaster, true );
if ( planeIntersect ) {
......@@ -351,9 +351,9 @@ THREE.TransformControls = function ( camera, domElement ) {
raycaster.setFromCamera( pointer, this.camera );
var planeIntersect = intersectObjectWithRay( [ _plane ], raycaster, true );
var planeIntersect = intersectObjectWithRay( _plane, raycaster, true );
if ( !planeIntersect ) return;
if ( ! planeIntersect ) return;
pointEnd.copy( planeIntersect.point ).sub( worldPositionStart );
......
......@@ -75,15 +75,15 @@ var TransformControls = function ( camera, domElement ) {
var raycaster = new Raycaster();
var intersectObjectWithRay = function( object, raycaster, includeInvisible ) {
var intersectObjectWithRay = function ( object, raycaster, includeInvisible ) {
var allIntersections = raycaster.intersectObject( object, true );
var intersection = false;
for ( var i = allIntersections.length; i--; ) {
for ( var i = allIntersections.length; i --; ) {
if (allIntersections[i].object.visible || includeInvisible) {
if ( allIntersections[ i ].object.visible || includeInvisible ) {
intersection = allIntersections[ i ];
......@@ -95,7 +95,7 @@ var TransformControls = function ( camera, domElement ) {
return intersection;
}
};
var _tempVector = new Vector3();
var _tempVector2 = new Vector3();
......@@ -376,7 +376,7 @@ var TransformControls = function ( camera, domElement ) {
var planeIntersect = intersectObjectWithRay( _plane, raycaster, true );
if ( !planeIntersect ) return;
if ( ! planeIntersect ) return;
pointEnd.copy( planeIntersect.point ).sub( worldPositionStart );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册