Skip to content

Commit 217e20e

Browse files
committed
Updated builds.
1 parent 1454e7a commit 217e20e

File tree

5 files changed

+99
-57
lines changed

5 files changed

+99
-57
lines changed

build/three.cjs

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8732,10 +8732,10 @@ class Material extends EventDispatcher {
87328732

87338733
if ( this.blending !== NormalBlending ) data.blending = this.blending;
87348734
if ( this.side !== FrontSide ) data.side = this.side;
8735-
if ( this.vertexColors ) data.vertexColors = true;
8735+
if ( this.vertexColors === true ) data.vertexColors = true;
87368736

87378737
if ( this.opacity < 1 ) data.opacity = this.opacity;
8738-
if ( this.transparent === true ) data.transparent = this.transparent;
8738+
if ( this.transparent === true ) data.transparent = true;
87398739

87408740
data.depthFunc = this.depthFunc;
87418741
data.depthTest = this.depthTest;
@@ -8766,17 +8766,17 @@ class Material extends EventDispatcher {
87668766
if ( this.dithering === true ) data.dithering = true;
87678767

87688768
if ( this.alphaTest > 0 ) data.alphaTest = this.alphaTest;
8769-
if ( this.alphaHash === true ) data.alphaHash = this.alphaHash;
8770-
if ( this.alphaToCoverage === true ) data.alphaToCoverage = this.alphaToCoverage;
8771-
if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = this.premultipliedAlpha;
8772-
if ( this.forceSinglePass === true ) data.forceSinglePass = this.forceSinglePass;
8769+
if ( this.alphaHash === true ) data.alphaHash = true;
8770+
if ( this.alphaToCoverage === true ) data.alphaToCoverage = true;
8771+
if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = true;
8772+
if ( this.forceSinglePass === true ) data.forceSinglePass = true;
87738773

8774-
if ( this.wireframe === true ) data.wireframe = this.wireframe;
8774+
if ( this.wireframe === true ) data.wireframe = true;
87758775
if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
87768776
if ( this.wireframeLinecap !== 'round' ) data.wireframeLinecap = this.wireframeLinecap;
87778777
if ( this.wireframeLinejoin !== 'round' ) data.wireframeLinejoin = this.wireframeLinejoin;
87788778

8779-
if ( this.flatShading === true ) data.flatShading = this.flatShading;
8779+
if ( this.flatShading === true ) data.flatShading = true;
87808780

87818781
if ( this.visible === false ) data.visible = false;
87828782

@@ -12642,6 +12642,7 @@ class CubeCamera extends Object3D {
1264212642

1264312643
this.renderTarget = renderTarget;
1264412644
this.coordinateSystem = null;
12645+
this.activeMipmapLevel = 0;
1264512646

1264612647
const cameraPX = new PerspectiveCamera( fov, aspect, near, far );
1264712648
cameraPX.layers = this.layers;
@@ -12739,7 +12740,7 @@ class CubeCamera extends Object3D {
1273912740

1274012741
if ( this.parent === null ) this.updateMatrixWorld();
1274112742

12742-
const renderTarget = this.renderTarget;
12743+
const { renderTarget, activeMipmapLevel } = this;
1274312744

1274412745
if ( this.coordinateSystem !== renderer.coordinateSystem ) {
1274512746

@@ -12752,6 +12753,8 @@ class CubeCamera extends Object3D {
1275212753
const [ cameraPX, cameraNX, cameraPY, cameraNY, cameraPZ, cameraNZ ] = this.children;
1275312754

1275412755
const currentRenderTarget = renderer.getRenderTarget();
12756+
const currentActiveCubeFace = renderer.getActiveCubeFace();
12757+
const currentActiveMipmapLevel = renderer.getActiveMipmapLevel();
1275512758

1275612759
const currentXrEnabled = renderer.xr.enabled;
1275712760

@@ -12761,27 +12764,30 @@ class CubeCamera extends Object3D {
1276112764

1276212765
renderTarget.texture.generateMipmaps = false;
1276312766

12764-
renderer.setRenderTarget( renderTarget, 0 );
12767+
renderer.setRenderTarget( renderTarget, 0, activeMipmapLevel );
1276512768
renderer.render( scene, cameraPX );
1276612769

12767-
renderer.setRenderTarget( renderTarget, 1 );
12770+
renderer.setRenderTarget( renderTarget, 1, activeMipmapLevel );
1276812771
renderer.render( scene, cameraNX );
1276912772

12770-
renderer.setRenderTarget( renderTarget, 2 );
12773+
renderer.setRenderTarget( renderTarget, 2, activeMipmapLevel );
1277112774
renderer.render( scene, cameraPY );
1277212775

12773-
renderer.setRenderTarget( renderTarget, 3 );
12776+
renderer.setRenderTarget( renderTarget, 3, activeMipmapLevel );
1277412777
renderer.render( scene, cameraNY );
1277512778

12776-
renderer.setRenderTarget( renderTarget, 4 );
12779+
renderer.setRenderTarget( renderTarget, 4, activeMipmapLevel );
1277712780
renderer.render( scene, cameraPZ );
1277812781

12782+
// mipmaps are generated during the last call of render()
12783+
// at this point, all sides of the cube render target are defined
12784+
1277912785
renderTarget.texture.generateMipmaps = generateMipmaps;
1278012786

12781-
renderer.setRenderTarget( renderTarget, 5 );
12787+
renderer.setRenderTarget( renderTarget, 5, activeMipmapLevel );
1278212788
renderer.render( scene, cameraNZ );
1278312789

12784-
renderer.setRenderTarget( currentRenderTarget );
12790+
renderer.setRenderTarget( currentRenderTarget, currentActiveCubeFace, currentActiveMipmapLevel );
1278512791

1278612792
renderer.xr.enabled = currentXrEnabled;
1278712793

@@ -30560,6 +30566,7 @@ class FogExp2 {
3056030566

3056130567
return {
3056230568
type: 'FogExp2',
30569+
name: this.name,
3056330570
color: this.color.getHex(),
3056430571
density: this.density
3056530572
};
@@ -30593,6 +30600,7 @@ class Fog {
3059330600

3059430601
return {
3059530602
type: 'Fog',
30603+
name: this.name,
3059630604
color: this.color.getHex(),
3059730605
near: this.near,
3059830606
far: this.far
@@ -31198,7 +31206,7 @@ const _uvC = /*@__PURE__*/ new Vector2();
3119831206

3119931207
class Sprite extends Object3D {
3120031208

31201-
constructor( material ) {
31209+
constructor( material = new SpriteMaterial() ) {
3120231210

3120331211
super();
3120431212

@@ -31226,7 +31234,7 @@ class Sprite extends Object3D {
3122631234
}
3122731235

3122831236
this.geometry = _geometry;
31229-
this.material = ( material !== undefined ) ? material : new SpriteMaterial();
31237+
this.material = material;
3123031238

3123131239
this.center = new Vector2( 0.5, 0.5 );
3123231240

@@ -44960,6 +44968,12 @@ class ObjectLoader extends Loader {
4496044968

4496144969
}
4496244970

44971+
if ( data.fog.name !== '' ) {
44972+
44973+
object.fog.name = data.fog.name;
44974+
44975+
}
44976+
4496344977
}
4496444978

4496544979
if ( data.backgroundBlurriness !== undefined ) object.backgroundBlurriness = data.backgroundBlurriness;

build/three.js

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8737,10 +8737,10 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
87378737

87388738
if ( this.blending !== NormalBlending ) data.blending = this.blending;
87398739
if ( this.side !== FrontSide ) data.side = this.side;
8740-
if ( this.vertexColors ) data.vertexColors = true;
8740+
if ( this.vertexColors === true ) data.vertexColors = true;
87418741

87428742
if ( this.opacity < 1 ) data.opacity = this.opacity;
8743-
if ( this.transparent === true ) data.transparent = this.transparent;
8743+
if ( this.transparent === true ) data.transparent = true;
87448744

87458745
data.depthFunc = this.depthFunc;
87468746
data.depthTest = this.depthTest;
@@ -8771,17 +8771,17 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
87718771
if ( this.dithering === true ) data.dithering = true;
87728772

87738773
if ( this.alphaTest > 0 ) data.alphaTest = this.alphaTest;
8774-
if ( this.alphaHash === true ) data.alphaHash = this.alphaHash;
8775-
if ( this.alphaToCoverage === true ) data.alphaToCoverage = this.alphaToCoverage;
8776-
if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = this.premultipliedAlpha;
8777-
if ( this.forceSinglePass === true ) data.forceSinglePass = this.forceSinglePass;
8774+
if ( this.alphaHash === true ) data.alphaHash = true;
8775+
if ( this.alphaToCoverage === true ) data.alphaToCoverage = true;
8776+
if ( this.premultipliedAlpha === true ) data.premultipliedAlpha = true;
8777+
if ( this.forceSinglePass === true ) data.forceSinglePass = true;
87788778

8779-
if ( this.wireframe === true ) data.wireframe = this.wireframe;
8779+
if ( this.wireframe === true ) data.wireframe = true;
87808780
if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
87818781
if ( this.wireframeLinecap !== 'round' ) data.wireframeLinecap = this.wireframeLinecap;
87828782
if ( this.wireframeLinejoin !== 'round' ) data.wireframeLinejoin = this.wireframeLinejoin;
87838783

8784-
if ( this.flatShading === true ) data.flatShading = this.flatShading;
8784+
if ( this.flatShading === true ) data.flatShading = true;
87858785

87868786
if ( this.visible === false ) data.visible = false;
87878787

@@ -12647,6 +12647,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
1264712647

1264812648
this.renderTarget = renderTarget;
1264912649
this.coordinateSystem = null;
12650+
this.activeMipmapLevel = 0;
1265012651

1265112652
const cameraPX = new PerspectiveCamera( fov, aspect, near, far );
1265212653
cameraPX.layers = this.layers;
@@ -12744,7 +12745,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
1274412745

1274512746
if ( this.parent === null ) this.updateMatrixWorld();
1274612747

12747-
const renderTarget = this.renderTarget;
12748+
const { renderTarget, activeMipmapLevel } = this;
1274812749

1274912750
if ( this.coordinateSystem !== renderer.coordinateSystem ) {
1275012751

@@ -12757,6 +12758,8 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
1275712758
const [ cameraPX, cameraNX, cameraPY, cameraNY, cameraPZ, cameraNZ ] = this.children;
1275812759

1275912760
const currentRenderTarget = renderer.getRenderTarget();
12761+
const currentActiveCubeFace = renderer.getActiveCubeFace();
12762+
const currentActiveMipmapLevel = renderer.getActiveMipmapLevel();
1276012763

1276112764
const currentXrEnabled = renderer.xr.enabled;
1276212765

@@ -12766,27 +12769,30 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
1276612769

1276712770
renderTarget.texture.generateMipmaps = false;
1276812771

12769-
renderer.setRenderTarget( renderTarget, 0 );
12772+
renderer.setRenderTarget( renderTarget, 0, activeMipmapLevel );
1277012773
renderer.render( scene, cameraPX );
1277112774

12772-
renderer.setRenderTarget( renderTarget, 1 );
12775+
renderer.setRenderTarget( renderTarget, 1, activeMipmapLevel );
1277312776
renderer.render( scene, cameraNX );
1277412777

12775-
renderer.setRenderTarget( renderTarget, 2 );
12778+
renderer.setRenderTarget( renderTarget, 2, activeMipmapLevel );
1277612779
renderer.render( scene, cameraPY );
1277712780

12778-
renderer.setRenderTarget( renderTarget, 3 );
12781+
renderer.setRenderTarget( renderTarget, 3, activeMipmapLevel );
1277912782
renderer.render( scene, cameraNY );
1278012783

12781-
renderer.setRenderTarget( renderTarget, 4 );
12784+
renderer.setRenderTarget( renderTarget, 4, activeMipmapLevel );
1278212785
renderer.render( scene, cameraPZ );
1278312786

12787+
// mipmaps are generated during the last call of render()
12788+
// at this point, all sides of the cube render target are defined
12789+
1278412790
renderTarget.texture.generateMipmaps = generateMipmaps;
1278512791

12786-
renderer.setRenderTarget( renderTarget, 5 );
12792+
renderer.setRenderTarget( renderTarget, 5, activeMipmapLevel );
1278712793
renderer.render( scene, cameraNZ );
1278812794

12789-
renderer.setRenderTarget( currentRenderTarget );
12795+
renderer.setRenderTarget( currentRenderTarget, currentActiveCubeFace, currentActiveMipmapLevel );
1279012796

1279112797
renderer.xr.enabled = currentXrEnabled;
1279212798

@@ -30565,6 +30571,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
3056530571

3056630572
return {
3056730573
type: 'FogExp2',
30574+
name: this.name,
3056830575
color: this.color.getHex(),
3056930576
density: this.density
3057030577
};
@@ -30598,6 +30605,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
3059830605

3059930606
return {
3060030607
type: 'Fog',
30608+
name: this.name,
3060130609
color: this.color.getHex(),
3060230610
near: this.near,
3060330611
far: this.far
@@ -31203,7 +31211,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
3120331211

3120431212
class Sprite extends Object3D {
3120531213

31206-
constructor( material ) {
31214+
constructor( material = new SpriteMaterial() ) {
3120731215

3120831216
super();
3120931217

@@ -31231,7 +31239,7 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
3123131239
}
3123231240

3123331241
this.geometry = _geometry;
31234-
this.material = ( material !== undefined ) ? material : new SpriteMaterial();
31242+
this.material = material;
3123531243

3123631244
this.center = new Vector2( 0.5, 0.5 );
3123731245

@@ -44965,6 +44973,12 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
4496544973

4496644974
}
4496744975

44976+
if ( data.fog.name !== '' ) {
44977+
44978+
object.fog.name = data.fog.name;
44979+
44980+
}
44981+
4496844982
}
4496944983

4497044984
if ( data.backgroundBlurriness !== undefined ) object.backgroundBlurriness = data.backgroundBlurriness;

build/three.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)