|
1928 | 1928 |
|
1929 | 1929 | Object.assign( Quaternion, { |
1930 | 1930 |
|
| 1931 | + isQuaternion: true, |
| 1932 | + |
1931 | 1933 | slerp: function ( qa, qb, qm, t ) { |
1932 | 1934 |
|
1933 | 1935 | return qm.copy( qa ).slerp( qb, t ); |
|
12787 | 12789 | data.envMap = this.envMap.toJSON( meta ).uuid; |
12788 | 12790 | data.reflectivity = this.reflectivity; // Scale behind envMap |
12789 | 12791 |
|
| 12792 | + if ( this.combine !== undefined ) data.combine = this.combine; |
| 12793 | + if ( this.envMapIntensity !== undefined ) data.envMapIntensity = this.envMapIntensity; |
| 12794 | + |
12790 | 12795 | } |
12791 | 12796 |
|
12792 | 12797 | if ( this.gradientMap && this.gradientMap.isTexture ) { |
@@ -15635,14 +15640,22 @@ |
15635 | 15640 | * @author Artur Trzesiok |
15636 | 15641 | */ |
15637 | 15642 |
|
15638 | | - function Texture3D( data, width, height, depth, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding ) { |
| 15643 | + function Texture3D( data, width, height, depth ) { |
15639 | 15644 |
|
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 ); |
15641 | 15654 |
|
15642 | 15655 | this.image = { data: data, width: width, height: height, depth: depth }; |
15643 | 15656 |
|
15644 | | - this.magFilter = magFilter !== undefined ? magFilter : NearestFilter; |
15645 | | - this.minFilter = minFilter !== undefined ? minFilter : NearestFilter; |
| 15657 | + this.magFilter = NearestFilter; |
| 15658 | + this.minFilter = NearestFilter; |
15646 | 15659 |
|
15647 | 15660 | this.generateMipmaps = false; |
15648 | 15661 | this.flipY = false; |
|
37155 | 37168 | if ( json.fog !== undefined ) material.fog = json.fog; |
37156 | 37169 | if ( json.flatShading !== undefined ) material.flatShading = json.flatShading; |
37157 | 37170 | if ( json.blending !== undefined ) material.blending = json.blending; |
| 37171 | + if ( json.combine !== undefined ) material.combine = json.combine; |
37158 | 37172 | if ( json.side !== undefined ) material.side = json.side; |
37159 | 37173 | if ( json.opacity !== undefined ) material.opacity = json.opacity; |
37160 | 37174 | if ( json.transparent !== undefined ) material.transparent = json.transparent; |
|
37288 | 37302 | if ( json.specularMap !== undefined ) material.specularMap = getTexture( json.specularMap ); |
37289 | 37303 |
|
37290 | 37304 | if ( json.envMap !== undefined ) material.envMap = getTexture( json.envMap ); |
| 37305 | + if ( json.envMapIntensity !== undefined ) material.envMapIntensity = json.envMapIntensity; |
37291 | 37306 |
|
37292 | 37307 | if ( json.reflectivity !== undefined ) material.reflectivity = json.reflectivity; |
37293 | 37308 |
|
|
0 commit comments