mirror of
https://github.com/photonstorm/phaser
synced 2024-11-23 13:13:43 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c328d1ea59
2 changed files with 2 additions and 2 deletions
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue