Skip to content

Commit 3a01546

Browse files
committed
Updated builds.
1 parent 598155b commit 3a01546

File tree

3 files changed

+283
-252
lines changed

3 files changed

+283
-252
lines changed

build/three.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,6 +1928,8 @@
19281928

19291929
Object.assign( Quaternion, {
19301930

1931+
isQuaternion: true,
1932+
19311933
slerp: function ( qa, qb, qm, t ) {
19321934

19331935
return qm.copy( qa ).slerp( qb, t );
@@ -12787,6 +12789,9 @@
1278712789
data.envMap = this.envMap.toJSON( meta ).uuid;
1278812790
data.reflectivity = this.reflectivity; // Scale behind envMap
1278912791

12792+
if ( this.combine !== undefined ) data.combine = this.combine;
12793+
if ( this.envMapIntensity !== undefined ) data.envMapIntensity = this.envMapIntensity;
12794+
1279012795
}
1279112796

1279212797
if ( this.gradientMap && this.gradientMap.isTexture ) {
@@ -15635,14 +15640,22 @@
1563515640
* @author Artur Trzesiok
1563615641
*/
1563715642

15638-
function Texture3D( data, width, height, depth, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding ) {
15643+
function Texture3D( data, width, height, depth ) {
1563915644

15640-
Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
15645+
// We're going to add .setXXX() methods for setting properties later.
15646+
// Users can still set in Texture3D directly.
15647+
//
15648+
// var texture = new THREE.Texture3D( data, width, height, depth );
15649+
// texture.anisotropy = 16;
15650+
//
15651+
// See #14839
15652+
15653+
Texture.call( this, null );
1564115654

1564215655
this.image = { data: data, width: width, height: height, depth: depth };
1564315656

15644-
this.magFilter = magFilter !== undefined ? magFilter : NearestFilter;
15645-
this.minFilter = minFilter !== undefined ? minFilter : NearestFilter;
15657+
this.magFilter = NearestFilter;
15658+
this.minFilter = NearestFilter;
1564615659

1564715660
this.generateMipmaps = false;
1564815661
this.flipY = false;
@@ -37155,6 +37168,7 @@
3715537168
if ( json.fog !== undefined ) material.fog = json.fog;
3715637169
if ( json.flatShading !== undefined ) material.flatShading = json.flatShading;
3715737170
if ( json.blending !== undefined ) material.blending = json.blending;
37171+
if ( json.combine !== undefined ) material.combine = json.combine;
3715837172
if ( json.side !== undefined ) material.side = json.side;
3715937173
if ( json.opacity !== undefined ) material.opacity = json.opacity;
3716037174
if ( json.transparent !== undefined ) material.transparent = json.transparent;
@@ -37288,6 +37302,7 @@
3728837302
if ( json.specularMap !== undefined ) material.specularMap = getTexture( json.specularMap );
3728937303

3729037304
if ( json.envMap !== undefined ) material.envMap = getTexture( json.envMap );
37305+
if ( json.envMapIntensity !== undefined ) material.envMapIntensity = json.envMapIntensity;
3729137306

3729237307
if ( json.reflectivity !== undefined ) material.reflectivity = json.reflectivity;
3729337308

0 commit comments

Comments
 (0)