|
@@ -6,35 +6,19 @@ THREE.Projector = function () {
|
|
|
|
|
|
this.projectVector = function ( vector, camera ) {
|
|
this.projectVector = function ( vector, camera ) {
|
|
|
|
|
|
- var viewProjectionMatrix = new THREE.Matrix4();
|
|
|
|
|
|
+ console.warn( 'THREE.Projector: .projectVector() is now vector.projectCamera().' );
|
|
|
|
|
|
- return function ( vector, camera ) {
|
|
|
|
|
|
+ vector.projectCamera( camera );
|
|
|
|
|
|
- camera.matrixWorldInverse.getInverse( camera.matrixWorld );
|
|
|
|
-
|
|
|
|
- viewProjectionMatrix.multiplyMatrices( camera.projectionMatrix, camera.matrixWorldInverse );
|
|
|
|
-
|
|
|
|
- return vector.applyProjection( viewProjectionMatrix );
|
|
|
|
-
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
- }();
|
|
|
|
-
|
|
|
|
- this.unprojectVector = function () {
|
|
|
|
-
|
|
|
|
- var projectionMatrixInverse = new THREE.Matrix4();
|
|
|
|
- var viewProjectionMatrix = new THREE.Matrix4();
|
|
|
|
-
|
|
|
|
- return function ( vector, camera ) {
|
|
|
|
|
|
+ };
|
|
|
|
|
|
- projectionMatrixInverse.getInverse( camera.projectionMatrix );
|
|
|
|
- viewProjectionMatrix.multiplyMatrices( camera.matrixWorld, projectionMatrixInverse );
|
|
|
|
|
|
+ this.unprojectVector = function ( vector, camera ) {
|
|
|
|
|
|
- return vector.applyProjection( viewProjectionMatrix );
|
|
|
|
|
|
+ console.warn( 'THREE.Projector: .unprojectVector() is now vector.unprojectCamera().' );
|
|
|
|
|
|
- };
|
|
|
|
|
|
+ vector.unprojectCamera( camera );
|
|
|
|
|
|
- }();
|
|
|
|
|
|
+ };
|
|
|
|
|
|
this.pickingRay = function ( vector, camera ) {
|
|
this.pickingRay = function ( vector, camera ) {
|
|
|
|
|