Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pavle Goloskokovic 2017-12-22 15:47:44 +01:00
commit c328d1ea59
2 changed files with 2 additions and 2 deletions

View file

@ -75,7 +75,7 @@ var OrthographicCamera = new Class({
this.view.lookAt(this.position, tmpVec3, this.up);
// Projection * view matrix
this.combined.copy(this.projection).mul(this.view);
this.combined.copy(this.projection).multiply(this.view);
// Invert combined matrix, used for unproject
this.invProjectionView.copy(this.combined).invert();

View file

@ -52,7 +52,7 @@ var PerspectiveCamera = new Class({
this.view.lookAt(this.position, tmpVec3, this.up);
// Projection * view matrix
this.combined.copy(this.projection).mul(this.view);
this.combined.copy(this.projection).multiply(this.view);
// Invert combined matrix, used for unproject
this.invProjectionView.copy(this.combined).invert();