|
@@ -2853,12 +2853,13 @@ Object.assign( Vector3.prototype, {
|
|
|
var x = this.x, y = this.y, z = this.z;
|
|
|
var e = m.elements;
|
|
|
|
|
|
- this.x = e[ 0 ] * x + e[ 4 ] * y + e[ 8 ] * z + e[ 12 ];
|
|
|
- this.y = e[ 1 ] * x + e[ 5 ] * y + e[ 9 ] * z + e[ 13 ];
|
|
|
- this.z = e[ 2 ] * x + e[ 6 ] * y + e[ 10 ] * z + e[ 14 ];
|
|
|
- var w = e[ 3 ] * x + e[ 7 ] * y + e[ 11 ] * z + e[ 15 ];
|
|
|
+ var w = 1 / ( e[ 3 ] * x + e[ 7 ] * y + e[ 11 ] * z + e[ 15 ] );
|
|
|
|
|
|
- return this.divideScalar( w );
|
|
|
+ this.x = ( e[ 0 ] * x + e[ 4 ] * y + e[ 8 ] * z + e[ 12 ] ) * w;
|
|
|
+ this.y = ( e[ 1 ] * x + e[ 5 ] * y + e[ 9 ] * z + e[ 13 ] ) * w;
|
|
|
+ this.z = ( e[ 2 ] * x + e[ 6 ] * y + e[ 10 ] * z + e[ 14 ] ) * w;
|
|
|
+
|
|
|
+ return this;
|
|
|
|
|
|
},
|
|
|
|
|
@@ -3225,7 +3226,13 @@ Object.assign( Vector3.prototype, {
|
|
|
|
|
|
setFromMatrixPosition: function ( m ) {
|
|
|
|
|
|
- return this.setFromMatrixColumn( m, 3 );
|
|
|
+ var e = m.elements;
|
|
|
+
|
|
|
+ this.x = e[ 12 ];
|
|
|
+ this.y = e[ 13 ];
|
|
|
+ this.z = e[ 14 ];
|
|
|
+
|
|
|
+ return this;
|
|
|
|
|
|
},
|
|
|
|
|
@@ -3245,7 +3252,6 @@ Object.assign( Vector3.prototype, {
|
|
|
|
|
|
setFromMatrixColumn: function ( m, index ) {
|
|
|
|
|
|
-
|
|
|
return this.fromArray( m.elements, index * 4 );
|
|
|
|
|
|
},
|
|
@@ -21350,7 +21356,7 @@ function WebGLRenderer( parameters ) {
|
|
|
_this.setScissor( x, y, width, height );
|
|
|
_this.setScissorTest( true );
|
|
|
|
|
|
- renderScene( currentRenderList, scene, camera );
|
|
|
+ renderScene( currentRenderList, scene, camera2 );
|
|
|
|
|
|
}
|
|
|
|