Skip to content

Commit 06a56a1

Browse files
committed
Updated builds.
1 parent e6fb40d commit 06a56a1

File tree

3 files changed

+699
-651
lines changed

3 files changed

+699
-651
lines changed

build/three.js

Lines changed: 63 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2849,27 +2849,19 @@
28492849

28502850
},
28512851

2852-
project: function () {
2852+
project: function ( camera ) {
28532853

2854-
var matrix = new Matrix4();
2855-
2856-
return function project( camera ) {
2857-
2858-
matrix.multiplyMatrices( camera.projectionMatrix, matrix.getInverse( camera.matrixWorld ) );
2859-
return this.applyMatrix4( matrix );
2860-
2861-
};
2854+
return this.applyMatrix4( camera.matrixWorldInverse ).applyMatrix4( camera.projectionMatrix );
28622855

2863-
}(),
2856+
},
28642857

28652858
unproject: function () {
28662859

28672860
var matrix = new Matrix4();
28682861

28692862
return function unproject( camera ) {
28702863

2871-
matrix.multiplyMatrices( camera.matrixWorld, matrix.getInverse( camera.projectionMatrix ) );
2872-
return this.applyMatrix4( matrix );
2864+
return this.applyMatrix4( matrix.getInverse( camera.projectionMatrix ) ).applyMatrix4( camera.matrixWorld );
28732865

28742866
};
28752867

@@ -6936,6 +6928,28 @@
69366928

69376929
},
69386930

6931+
lerpHSL: function () {
6932+
6933+
var hslA = { h: 0, s: 0, l: 0 };
6934+
var hslB = { h: 0, s: 0, l: 0 };
6935+
6936+
return function lerpHSL( color, alpha ) {
6937+
6938+
this.getHSL( hslA );
6939+
color.getHSL( hslB );
6940+
6941+
var h = _Math.lerp( hslA.h, hslB.h, alpha );
6942+
var s = _Math.lerp( hslA.s, hslB.s, alpha );
6943+
var l = _Math.lerp( hslA.l, hslB.l, alpha );
6944+
6945+
this.setHSL( h, s, l );
6946+
6947+
return this;
6948+
6949+
};
6950+
6951+
}(),
6952+
69396953
equals: function ( c ) {
69406954

69416955
return ( c.r === this.r ) && ( c.g === this.g ) && ( c.b === this.b );
@@ -8514,26 +8528,22 @@
85148528

85158529
}(),
85168530

8517-
getWorldDirection: function () {
8518-
8519-
var quaternion = new Quaternion();
8520-
8521-
return function getWorldDirection( target ) {
8531+
getWorldDirection: function ( target ) {
85228532

8523-
if ( target === undefined ) {
8533+
if ( target === undefined ) {
85248534

8525-
console.warn( 'THREE.Object3D: .getWorldDirection() target is now required' );
8526-
target = new Vector3();
8535+
console.warn( 'THREE.Object3D: .getWorldDirection() target is now required' );
8536+
target = new Vector3();
85278537

8528-
}
8538+
}
85298539

8530-
this.getWorldQuaternion( quaternion );
8540+
this.updateMatrixWorld( true );
85318541

8532-
return target.set( 0, 0, 1 ).applyQuaternion( quaternion );
8542+
var e = this.matrixWorld.elements;
85338543

8534-
};
8544+
return target.set( e[ 8 ], e[ 9 ], e[ 10 ] ).normalize();
85358545

8536-
}(),
8546+
},
85378547

85388548
raycast: function () {},
85398549

@@ -8877,26 +8887,22 @@
88778887

88788888
},
88798889

8880-
getWorldDirection: function () {
8881-
8882-
var quaternion = new Quaternion();
8883-
8884-
return function getWorldDirection( target ) {
8890+
getWorldDirection: function ( target ) {
88858891

8886-
if ( target === undefined ) {
8892+
if ( target === undefined ) {
88878893

8888-
console.warn( 'THREE.Camera: .getWorldDirection() target is now required' );
8889-
target = new Vector3();
8894+
console.warn( 'THREE.Camera: .getWorldDirection() target is now required' );
8895+
target = new Vector3();
88908896

8891-
}
8897+
}
88928898

8893-
this.getWorldQuaternion( quaternion );
8899+
this.updateMatrixWorld( true );
88948900

8895-
return target.set( 0, 0, - 1 ).applyQuaternion( quaternion );
8901+
var e = this.matrixWorld.elements;
88968902

8897-
};
8903+
return target.set( - e[ 8 ], - e[ 9 ], - e[ 10 ] ).normalize();
88988904

8899-
}(),
8905+
},
89008906

89018907
updateMatrixWorld: function ( force ) {
89028908

@@ -31873,6 +31879,24 @@
3187331879

3187431880
}, false );
3187531881

31882+
request.addEventListener( 'abort', function ( event ) {
31883+
31884+
var callbacks = loading[ url ];
31885+
31886+
delete loading[ url ];
31887+
31888+
for ( var i = 0, il = callbacks.length; i < il; i ++ ) {
31889+
31890+
var callback = callbacks[ i ];
31891+
if ( callback.onError ) callback.onError( event );
31892+
31893+
}
31894+
31895+
scope.manager.itemEnd( url );
31896+
scope.manager.itemError( url );
31897+
31898+
}, false );
31899+
3187631900
if ( this.responseType !== undefined ) request.responseType = this.responseType;
3187731901
if ( this.withCredentials !== undefined ) request.withCredentials = this.withCredentials;
3187831902

@@ -32355,7 +32379,7 @@
3235532379
texture.image = image;
3235632380

3235732381
// JPEGs can't have an alpha channel, so memory can be saved by storing them as RGB.
32358-
var isJPEG = url.search( /\.(jpg|jpeg)$/ ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;
32382+
var isJPEG = url.search( /\.jpe?g$/i ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;
3235932383

3236032384
texture.format = isJPEG ? RGBFormat : RGBAFormat;
3236132385
texture.needsUpdate = true;

0 commit comments

Comments
 (0)