8000 Updated builds. · robinboot/three.js@84efc96 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 84efc96

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent 8be84c8 commit 84efc96

File tree

4 files changed

+97
-30
lines changed

4 files changed

+97
-30
lines changed

‎build/three.cjs

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6764,7 +6764,6 @@ class Material extends EventDispatcher {
67646764
this.uuid = generateUUID();
67656765
this.name = '';
67666766
this.type = 'Material';
6767-
this.fog = true;
67686767
this.blending = NormalBlending;
67696768
this.side = FrontSide;
67706769
this.vertexColors = false;
@@ -7010,6 +7009,7 @@ class Material extends EventDispatcher {
70107009
if (this.flatShading === true) data.flatShading = this.flatShading;
70117010
if (this.visible === false) data.visible = false;
70127011
if (this.toneMapped === false) data.toneMapped = false;
7012+
if (this.fog === false) data.fog = false;
70137013
if (JSON.stringify(this.userData) !== '{}') data.userData = this.userData; // TODO: Copied from Object3D.toJSON
70147014

70157015
function extractFromCache(cache) {
@@ -7040,7 +7040,6 @@ class Material extends EventDispatcher {
70407040

70417041
copy(source) {
70427042
this.name = source.name;
7043-
this.fog = source.fog;
70447043
this.blending = source.blending;
70457044
this.side = source.side;
70467045
this.vertexColors = source.vertexColors;
@@ -7136,6 +7135,7 @@ class MeshBasicMaterial extends Material {
71367135
this.wireframeLinewidth = 1;
71377136
this.wireframeLinecap = 'round';
71387137
this.wireframeLinejoin = 'round';
7138+
this.fog = true;
71397139
this.setValues(parameters);
71407140
}
71417141

@@ -7157,6 +7157,7 @@ class MeshBasicMaterial extends Material {
71577157
this.wireframeLinewidth = source.wireframeLinewidth;
71587158
this.wireframeLinecap = source.wireframeLinecap;
71597159
this.wireframeLinejoin = source.wireframeLinejoin;
7160+
this.fog = source.fog;
71607161
return this;
71617162
}
71627163

@@ -8861,6 +8862,7 @@ class ShaderMaterial extends Material {
88618862
this.defines = Object.assign({}, source.defines);
88628863
this.wireframe = source.wireframe;
88638864
this.wireframeLinewidth = source.wireframeLinewidth;
8865+
this.fog = source.fog;
88648866
this.lights = source.lights;
88658867
this.clipping = source.clipping;
88668868
this.extensions = Object.assign({}, source.extensions);
@@ -14536,7 +14538,7 @@ function WebGLPrograms(renderer, cubemaps, cubeuvmaps, extensions, capabilities,
1453614538
vertexUvs: !!material.map || !!material.bumpMap || !!material.normalMap || !!material.specularMap || !!material.alphaMap || !!material.emissiveMap || !!material.roughnessMap || !!material.metalnessMap || !!material.clearcoatMap || !!material.clearcoatRoughnessMap || !!material.clearcoatNormalMap || !!material.displacementMap || !!material.transmissionMap || !!material.thicknessMap || !!material.specularIntensityMap || !!material.specularColorMap || !!material.sheenColorMap || !!material.sheenRoughnessMap,
1453714539
uvsVertexOnly: !(!!material.map || !!material.bumpMap || !!material.normalMap || !!material.specularMap || !!material.alphaMap || !!material.emissiveMap || !!material.roughnessMap || !!material.metalnessMap || !!material.clearcoatNormalMap || material.transmission > 0 || !!material.transmissionMap || !!material.thicknessMap || !!material.specularIntensityMap || !!material.specularColorMap || material.sheen > 0 || !!material.sheenColorMap || !!material.sheenRoughnessMap) && !!material.displacementMap,
1453814540
fog: !!fog,
14539-
useFog: material.fog,
14541+
useFog: material.fog === true,
1454014542
fogExp2: fog && fog.isFogExp2,
1454114543
flatShading: !!material.flatShading,
1454214544
sizeAttenuation: material.sizeAttenuation,
@@ -15429,7 +15431,6 @@ class MeshDepthMaterial extends Material {
1542915431
this.displacementBias = 0;
1543015432
this.wireframe = false;
1543115433
this.wireframeLinewidth = 1;
15432-
this.fog = false;
1543315434
this.setValues(parameters);
1543415435
}
1543515436

@@ -15462,7 +15463,6 @@ class MeshDistanceMaterial extends Material {
1546215463
this.displacementMap = null;
1546315464
this.displacementScale = 1;
1546415465
this.displacementBias = 0;
15465-
this.fog = false;
1546615466
this.setValues(parameters);
1546715467
}
1546815468

@@ -20151,7 +20151,7 @@ function WebGLRenderer(parameters = {}) {
2015120151
needsProgramChange = true;
2015220152
} else if (materialProperties.envMap !== envMap) {
2015320153
needsProgramChange = true;
20154-
} else if (material.fog && materialProperties.fog !== fog) {
20154+
} else if (material.fog === true && materialProperties.fog !== fog) {
2015520155
needsProgramChange = true;
2015620156
} else if (materialProperties.numClippingPlanes !== undefined && (materialProperties.numClippingPlanes !== clipping.numPlanes || materialProperties.numIntersection !== clipping.numIntersection)) {
2015720157
needsProgramChange = true;
@@ -20280,7 +20280,7 @@ function WebGLRenderer(parameters = {}) {
2028020280
} // refresh uniforms common to several materials
2028120281

2028220282

20283-
if (fog && material.fog) {
20283+
if (fog && material.fog === true) {
2028420284
materials.refreshFogUniforms(m_uniforms, fog);
2028520285
}
2028620286

@@ -21022,6 +21022,7 @@ class SpriteMaterial extends Material {
2102221022
this.rotation = 0;
2102321023
this.sizeAttenuation = true;
2102421024
this.transparent = true;
21025+
this.fog = true;
2102521026
this.setValues(parameters);
2102621027
}
2102721028

@@ -21032,6 +21033,7 @@ class SpriteMaterial extends Material {
2103221033
this.alphaMap = source.alphaMap;
2103321034
this.rotation = source.rotation;
2103421035
this.sizeAttenuation = source.sizeAttenuation;
21036+
this.fog = source.fog;
2103521037
return this;
2103621038
}
2103721039

@@ -21760,6 +21762,7 @@ class LineBasicMaterial extends Material {
2176021762
this.linewidth = 1;
2176121763
this.linecap = 'round';
2176221764
this.linejoin = 'round';
21765+
this.fog = true;
2176321766
this.setValues(parameters);
2176421767
}
2176521768

@@ -21769,6 +21772,7 @@ class LineBasicMaterial extends Material {
2176921772
this.linewidth = source.linewidth;
2177021773
this.linecap = source.linecap;
2177121774
this.linejoin = source.linejoin;
21775+
this.fog = source.fog;
2177221776
return this;
2177321777
}
2177421778

@@ -22019,6 +22023,7 @@ class PointsMaterial extends Material {
2201922023
this.alphaMap = null;
2202022024
this.size = 1;
2202122025
this.sizeAttenuation = true;
22026+
this.fog = true;
2202222027
this.setValues(parameters);
2202322028
}
2202422029

@@ -22029,6 +22034,7 @@ class PointsMaterial extends Material {
2202922034
this.alphaMap = source.alphaMap;
2203022035
this.size = source.size;
2203122036
this.sizeAttenuation = source.sizeAttenuation;
22037+
this.fog = source.fog;
2203222038
return this;
2203322039
}
2203422040

@@ -26260,12 +26266,14 @@ class ShadowMaterial extends Material {
2626026266
this.type = 'ShadowMaterial';
2626126267
this.color = new Color(0x000000);
2626226268
this.transparent = true;
26269+
this.fog = true;
2626326270
this.setValues(parameters);
2626426271
}
2626526272

2626626273
copy(source) {
2626726274
super.copy(source);
2626826275
this.color.copy(source.color);
26276+
this.fog = source.fog;
2626926277
return this;
2627026278
}
2627126279

@@ -26320,6 +26328,7 @@ class MeshStandardMaterial extends Material {
2632026328
this.wireframeLinecap = 'round';
2632126329
this.wireframeLinejoin = 'round';
2632226330
this.flatShading = false;
26331+
this.fog = true;
2632326332
this.setValues(parameters);
2632426333
}
2632526334

@@ -26357,6 +26366,7 @@ class MeshStandardMaterial extends Material {
2635726366
this.wireframeLinecap = source.wireframeLinecap;
2635826367
this.wireframeLinejoin = source.wireframeLinejoin;
2635926368
this.flatShading = source.flatShading;
26369+
this.fog = source.fog;
2636026370
return this;
2636126371
}
2636226372

@@ -26511,6 +26521,7 @@ class MeshPhongMaterial extends Material {
2651126521
this.wireframeLinecap = 'round';
2651226522
this.wireframeLinejoin = 'round';
2651326523
this.flatShading = false;
26524+
this.fog = true;
2651426525
this.setValues(parameters);
2651526526
}
2651626527

@@ -26546,6 +26557,7 @@ class MeshPhongMaterial extends Material {
2654626557
this.wireframeLinecap = source.wireframeLinecap;
2654726558
this.wireframeLinejoin = source.wireframeLinejoin;
2654826559
this.flatShading = source.flatShading;
26560+
this.fog = source.fog;
2654926561
return this;
2655026562
}
2655126563

@@ -26583,6 +26595,7 @@ class MeshToonMaterial extends Material {
2658326595
this.wireframeLinewidth = 1;
2658426596
this.wireframeLinecap = 'round';
2658526597
this.wireframeLinejoin = 'round';
26598+
this.fog = true;
2658626599
this.setValues(parameters);
2658726600
}
2658826601

@@ -26611,6 +26624,7 @@ class MeshToonMaterial extends Material {
2661126624
this.wireframeLinewidth = source.wireframeLinewidth;
2661226625
this.wireframeLinecap = source.wireframeLinecap;
2661326626
this.wireframeLinejoin = source.wireframeLinejoin;
26627+
this.fog = source.fog;
2661426628
return this;
2661526629
}
2661626630

@@ -26632,7 +26646,6 @@ class MeshNormalMaterial extends Material {
2663226646
this.displacementBias = 0;
2663326647
this.wireframe = false;
2663426648
this.wireframeLinewidth = 1;
26635-
this.fog = false;
2663626649
this.flatShading = false;
2663726650
this.setValues(parameters);
2663826651
}
@@ -26681,6 +26694,7 @@ class MeshLambertMaterial extends Material {
2668126694
this.wireframeLinewidth = 1;
2668226695
this.wireframeLinecap = 'round';
2668326696
this.wireframeLinejoin = 'round';
26697+
this.fog = true;
2668426698
this.setValues(parameters);
2668526699
}
2668626700

@@ -26705,6 +26719,7 @@ class MeshLambertMaterial extends Material {
2670526719
this.wireframeLinewidth = source.wireframeLinewidth;
2670626720
this.wireframeLinecap = source.wireframeLinecap;
2670726721
this.wireframeLinejoin = source.wireframeLinejoin;
26722+
this.fog = source.fog;
2670826723
return this;
2670926724
}
2671026725

@@ -26733,6 +26748,7 @@ class MeshMatcapMaterial extends Material {
2673326748
this.displacementBias = 0;
2673426749
this.alphaMap = null;
2673526750
this.flatShading = false;
26751+
this.fog = true;
2673626752
this.setValues(parameters);
2673726753
}
2673826754

@@ -26754,6 +26770,7 @@ class MeshMatcapMaterial extends Material {
2675426770
this.displacementBias = source.displacementBias;
2675526771
this.alphaMap = source.alphaMap;
2675626772
this.flatShading = source.flatShading;
26773+
this.fog = source.fog;
2675726774
return this;
2675826775
}
2675926776

0 commit comments

Comments
 (0)
0