Skip to content

Commit cd1b695

Browse files
mrdoobmrdoob
committed
Updated builds
1 parent 31565e6 commit cd1b695

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

‎build/three.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4783,11 +4783,11 @@
47834783
this._onChangeCallback();
47844784
}
47854785

4786-
set(x, y, z, order) {
4786+
set(x, y, z, order = this._order) {
47874787
this._x = x;
47884788
this._y = y;
47894789
this._z = z;
4790-
this._order = order || this._order;
4790+
this._order = order;
47914791

47924792
this._onChangeCallback();
47934793

@@ -4809,7 +4809,7 @@
48094809
return this;
48104810
}
48114811

4812-
setFromRotationMatrix(m, order, update) {
4812+
setFromRotationMatrix(m, order = this._order, update = true) {
48134813
// assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
48144814
const te = m.elements;
48154815
const m11 = te[0],
@@ -4821,7 +4821,6 @@
48214821
const m31 = te[2],
48224822
m32 = te[6],
48234823
m33 = te[10];
4824-
order = order || this._order;
48254824

48264825
switch (order) {
48274826
case 'XYZ':
@@ -4907,7 +4906,7 @@
49074906
}
49084907

49094908
this._order = order;
4910-
if (update !== false) this._onChangeCallback();
4909+
if (update === true) this._onChangeCallback();
49114910
return this;
49124911
}
49134912

@@ -4917,8 +4916,8 @@
49174916
return this.setFromRotationMatrix(_matrix$1, order, update);
49184917
}
49194918

4920-
setFromVector3(v, order) {
4921-
return this.set(v.x, v.y, v.z, order || this._order);
4919+
setFromVector3(v, order = this._order) {
4920+
return this.set(v.x, v.y, v.z, order);
49224921
}
49234922

49244923
reorder(newOrder) {
@@ -16781,12 +16780,15 @@
1678116780

1678216781
for (let i = 0; i < cameras.length; i++) {
1678316782
updateCamera(cameras[i], parent);
16784-
} // update camera and its children
16783+
}
1678516784

16785+
cameraVR.matrixWorld.decompose(cameraVR.position, cameraVR.quaternion, cameraVR.scale); // update user camera and its children
1678616786

16787-
camera.matrixWorld.copy(cameraVR.matrixWorld);
16787+
camera.position.copy(cameraVR.position);
16788+
camera.quaternion.copy(cameraVR.quaternion);
16789+
camera.scale.copy(cameraVR.scale);
1678816790
camera.matrix.copy(cameraVR.matrix);
16789-
camera.matrix.decompose(camera.position, camera.quaternion, camera.scale);
16791+
camera.matrixWorld.copy(cameraVR.matrixWorld);
1679016792
const children = camera.children;
1679116793

1679216794
for (let i = 0, l = children.length; i < l; i++) {
@@ -19046,7 +19048,7 @@
1904619048
const _vector$6 = /*@__PURE__*/new Vector3();
1904719049

1904819050
class InterleavedBufferAttribute {
19049-
constructor(interleavedBuffer, itemSize, offset, normalized) {
19051+
constructor(interleavedBuffer, itemSize, offset, normalized = false) {
1905019052
this.name = '';
1905119053
this.data = interleavedBuffer;
1905219054
this.itemSize = itemSize;
@@ -32252,7 +32254,7 @@
3225232254
class InstancedInterleavedBuffer extends InterleavedBuffer {
3225332255
constructor(array, stride, meshPerAttribute = 1) {
3225432256
super(array, stride);
32255-
this.meshPerAttribute = meshPerAttribute || 1;
32257+
this.meshPerAttribute = meshPerAttribute;
3225632258
}
3225732259

3225832260
copy(source) {

‎build/three.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/three.module.js‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6245,12 +6245,12 @@ class Euler {
62456245

62466246
}
62476247

6248-
set( x, y, z, order ) {
6248+
set( x, y, z, order = this._order ) {
62496249

62506250
this._x = x;
62516251
this._y = y;
62526252
this._z = z;
6253-
this._order = order || this._order;
6253+
this._order = order;
62546254

62556255
this._onChangeCallback();
62566256

@@ -6277,7 +6277,7 @@ class Euler {
62776277

62786278
}
62796279

6280-
setFromRotationMatrix( m, order, update ) {
6280+
setFromRotationMatrix( m, order = this._order, update = true ) {
62816281

62826282
// assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
62836283

@@ -6286,8 +6286,6 @@ class Euler {
62866286
const m21 = te[ 1 ], m22 = te[ 5 ], m23 = te[ 9 ];
62876287
const m31 = te[ 2 ], m32 = te[ 6 ], m33 = te[ 10 ];
62886288

6289-
order = order || this._order;
6290-
62916289
switch ( order ) {
62926290

62936291
case 'XYZ':
@@ -6406,7 +6404,7 @@ class Euler {
64066404

64076405
this._order = order;
64086406

6409-
if ( update !== false ) this._onChangeCallback();
6407+
if ( update === true ) this._onChangeCallback();
64106408

64116409
return this;
64126410

@@ -6420,9 +6418,9 @@ class Euler {
64206418

64216419
}
64226420

6423-
setFromVector3( v, order ) {
6421+
setFromVector3( v, order = this._order ) {
64246422

6425-
return this.set( v.x, v.y, v.z, order || this._order );
6423+
return this.set( v.x, v.y, v.z, order );
64266424

64276425
}
64286426

@@ -22672,11 +22670,15 @@ class WebXRManager extends EventDispatcher {
2267222670

2267322671
}
2267422672

22675-
// update camera and its children
22673+
cameraVR.matrixWorld.decompose( cameraVR.position, cameraVR.quaternion, cameraVR.scale );
2267622674

22677-
camera.matrixWorld.copy( cameraVR.matrixWorld );
22675+
// update user camera and its children
22676+
22677+
camera.position.copy( cameraVR.position );
22678+
camera.quaternion.copy( cameraVR.quaternion );
22679+
camera.scale.copy( cameraVR.scale );
2267822680
camera.matrix.copy( cameraVR.matrix );
22679-
camera.matrix.decompose( camera.position, camera.quaternion, camera.scale );
22681+
camera.matrixWorld.copy( cameraVR.matrixWorld );
2268022682

2268122683
const children = camera.children;
2268222684

@@ -25938,7 +25940,7 @@ const _vector$6 = /*@__PURE__*/ new Vector3();
2593825940

2593925941
class InterleavedBufferAttribute {
2594025942

25941-
constructor( interleavedBuffer, itemSize, offset, normalized ) {
25943+
constructor( interleavedBuffer, itemSize, offset, normalized = false ) {
2594225944

2594325945
this.name = '';
2594425946

@@ -39013,7 +39015,7 @@ class InstancedBufferAttribute extends BufferAttribute {
3901339015

3901439016
constructor( array, itemSize, normalized, meshPerAttribute ) {
3901539017

39016-
if ( typeof ( normalized ) === 'number' ) {
39018+
if ( typeof normalized === 'number' ) {
3901739019

3901839020
meshPerAttribute = normalized;
3901939021

@@ -44799,7 +44801,7 @@ class InstancedInterleavedBuffer extends InterleavedBuffer {
4479944801

4480044802
super( array, stride );
4480144803

44802-
this.meshPerAttribute = meshPerAttribute || 1;
44804+
this.meshPerAttribute = meshPerAttribute;
4480344805

4480444806
}
4480544807

0 commit comments

Comments
 (0)