Skip to content

Vector3.unproject(): Avoid computing inverse #15996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2019
Merged

Vector3.unproject(): Avoid computing inverse #15996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bad3a4
Vector3.unproject(): Avoid computing inverse
WestLangley Mar 16, 2019
89c39cc
Accommodate refactoring of Vector3.unproject( camera )
WestLangley Mar 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/helpers/CameraHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ CameraHelper.prototype.update = function () {

var w = 1, h = 1;

// we need just camera projection matrix
// we need just camera projection matrix inverse
// world matrix must be identity

camera.projectionMatrix.copy( this.camera.projectionMatrix );
camera.projectionMatrixInverse.copy( this.camera.projectionMatrixInverse );

// center / target

Expand Down
13 changes: 3 additions & 10 deletions src/math/Vector3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { _Math } from './Math.js';
import { Matrix4 } from './Matrix4.js';
import { Quaternion } from './Quaternion.js';

/**
Expand Down Expand Up @@ -318,17 +317,11 @@ Object.assign( Vector3.prototype, {

},

unproject: function () {
unproject: function ( camera ) {

var matrix = new Matrix4();
return this.applyMatrix4( camera.projectionMatrixInverse ).applyMatrix4( camera.matrixWorld );

return function unproject( camera ) {

return this.applyMatrix4( matrix.getInverse( camera.projectionMatrix ) ).applyMatrix4( camera.matrixWorld );

};

}(),
},

transformDirection: function ( m ) {

Expand Down