소스 검색

Merge remote-tracking branch 'remotes/mrdoob/dev' into dev

alteredq 13 년 전
부모
커밋
4adc8efa6e
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 2
      src/core/Projector.js

+ 4 - 2
src/core/Projector.js

@@ -82,7 +82,8 @@ THREE.Projector = function() {
 			if ( ( object instanceof THREE.Mesh || object instanceof THREE.Line ) &&
 			( object.frustumCulled === false || _frustum.contains( object ) ) ) {
 
-				_projScreenMatrix.multiplyVector3( _vector3.copy( object.position ) );
+				_vector3.copy( object.matrixWorld.getPosition() );
+				_projScreenMatrix.multiplyVector3( _vector3 );
 
 				_object = getNextObjectInPool();
 				_object.object = object;
@@ -92,7 +93,8 @@ THREE.Projector = function() {
 
 			} else if ( object instanceof THREE.Sprite || object instanceof THREE.Particle ) {
 
-				_projScreenMatrix.multiplyVector3( _vector3.copy( object.position ) );
+				_vector3.copy( object.matrixWorld.getPosition() );
+				_projScreenMatrix.multiplyVector3( _vector3 );
 
 				_object = getNextObjectInPool();
 				_object.object = object;