|
@@ -6245,12 +6245,12 @@ class Euler {
|
|
|
|
|
|
}
|
|
|
|
|
|
- set( x, y, z, order ) {
|
|
|
+ set( x, y, z, order = this._order ) {
|
|
|
|
|
|
this._x = x;
|
|
|
this._y = y;
|
|
|
this._z = z;
|
|
|
- this._order = order || this._order;
|
|
|
+ this._order = order;
|
|
|
|
|
|
this._onChangeCallback();
|
|
|
|
|
@@ -6277,7 +6277,7 @@ class Euler {
|
|
|
|
|
|
}
|
|
|
|
|
|
- setFromRotationMatrix( m, order, update ) {
|
|
|
+ setFromRotationMatrix( m, order = this._order, update = true ) {
|
|
|
|
|
|
// assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
|
|
|
|
|
@@ -6286,8 +6286,6 @@ class Euler {
|
|
|
const m21 = te[ 1 ], m22 = te[ 5 ], m23 = te[ 9 ];
|
|
|
const m31 = te[ 2 ], m32 = te[ 6 ], m33 = te[ 10 ];
|
|
|
|
|
|
- order = order || this._order;
|
|
|
-
|
|
|
switch ( order ) {
|
|
|
|
|
|
case 'XYZ':
|
|
@@ -6406,7 +6404,7 @@ class Euler {
|
|
|
|
|
|
this._order = order;
|
|
|
|
|
|
- if ( update !== false ) this._onChangeCallback();
|
|
|
+ if ( update === true ) this._onChangeCallback();
|
|
|
|
|
|
return this;
|
|
|
|
|
@@ -6420,9 +6418,9 @@ class Euler {
|
|
|
|
|
|
}
|
|
|
|
|
|
- setFromVector3( v, order ) {
|
|
|
+ setFromVector3( v, order = this._order ) {
|
|
|
|
|
|
- return this.set( v.x, v.y, v.z, order || this._order );
|
|
|
+ return this.set( v.x, v.y, v.z, order );
|
|
|
|
|
|
}
|
|
|
|
|
@@ -22672,11 +22670,15 @@ class WebXRManager extends EventDispatcher {
|
|
|
|
|
|
}
|
|
|
|
|
|
- // update camera and its children
|
|
|
+ cameraVR.matrixWorld.decompose( cameraVR.position, cameraVR.quaternion, cameraVR.scale );
|
|
|
|
|
|
- camera.matrixWorld.copy( cameraVR.matrixWorld );
|
|
|
+ // update user camera and its children
|
|
|
+
|
|
|
+ camera.position.copy( cameraVR.position );
|
|
|
+ camera.quaternion.copy( cameraVR.quaternion );
|
|
|
+ camera.scale.copy( cameraVR.scale );
|
|
|
camera.matrix.copy( cameraVR.matrix );
|
|
|
- camera.matrix.decompose( camera.position, camera.quaternion, camera.scale );
|
|
|
+ camera.matrixWorld.copy( cameraVR.matrixWorld );
|
|
|
|
|
|
const children = camera.children;
|
|
|
|
|
@@ -25938,7 +25940,7 @@ const _vector$6 = /*@__PURE__*/ new Vector3();
|
|
|
|
|
|
class InterleavedBufferAttribute {
|
|
|
|
|
|
- constructor( interleavedBuffer, itemSize, offset, normalized ) {
|
|
|
+ constructor( interleavedBuffer, itemSize, offset, normalized = false ) {
|
|
|
|
|
|
this.name = '';
|
|
|
|
|
@@ -39013,7 +39015,7 @@ class InstancedBufferAttribute extends BufferAttribute {
|
|
|
|
|
|
constructor( array, itemSize, normalized, meshPerAttribute ) {
|
|
|
|
|
|
- if ( typeof ( normalized ) === 'number' ) {
|
|
|
+ if ( typeof normalized === 'number' ) {
|
|
|
|
|
|
meshPerAttribute = normalized;
|
|
|
|
|
@@ -44799,7 +44801,7 @@ class InstancedInterleavedBuffer extends InterleavedBuffer {
|
|
|
|
|
|
super( array, stride );
|
|
|
|
|
|
- this.meshPerAttribute = meshPerAttribute || 1;
|
|
|
+ this.meshPerAttribute = meshPerAttribute;
|
|
|
|
|
|
}
|
|
|
|