提交 84efc96b 编写于 作者: M Mr.doob

Updated builds.

上级 8be84c87
......@@ -6764,7 +6764,6 @@ class Material extends EventDispatcher {
this.uuid = generateUUID();
this.name = '';
this.type = 'Material';
this.fog = true;
this.blending = NormalBlending;
this.side = FrontSide;
this.vertexColors = false;
......@@ -7010,6 +7009,7 @@ class Material extends EventDispatcher {
if (this.flatShading === true) data.flatShading = this.flatShading;
if (this.visible === false) data.visible = false;
if (this.toneMapped === false) data.toneMapped = false;
if (this.fog === false) data.fog = false;
if (JSON.stringify(this.userData) !== '{}') data.userData = this.userData; // TODO: Copied from Object3D.toJSON
function extractFromCache(cache) {
......@@ -7040,7 +7040,6 @@ class Material extends EventDispatcher {
copy(source) {
this.name = source.name;
this.fog = source.fog;
this.blending = source.blending;
this.side = source.side;
this.vertexColors = source.vertexColors;
......@@ -7136,6 +7135,7 @@ class MeshBasicMaterial extends Material {
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -7157,6 +7157,7 @@ class MeshBasicMaterial extends Material {
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -8861,6 +8862,7 @@ class ShaderMaterial extends Material {
this.defines = Object.assign({}, source.defines);
this.wireframe = source.wireframe;
this.wireframeLinewidth = source.wireframeLinewidth;
this.fog = source.fog;
this.lights = source.lights;
this.clipping = source.clipping;
this.extensions = Object.assign({}, source.extensions);
......@@ -14536,7 +14538,7 @@ function WebGLPrograms(renderer, cubemaps, cubeuvmaps, extensions, capabilities,
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,
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,
fog: !!fog,
useFog: material.fog,
useFog: material.fog === true,
fogExp2: fog && fog.isFogExp2,
flatShading: !!material.flatShading,
sizeAttenuation: material.sizeAttenuation,
......@@ -15429,7 +15431,6 @@ class MeshDepthMaterial extends Material {
this.displacementBias = 0;
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.setValues(parameters);
}
......@@ -15462,7 +15463,6 @@ class MeshDistanceMaterial extends Material {
this.displacementMap = null;
this.displacementScale = 1;
this.displacementBias = 0;
this.fog = false;
this.setValues(parameters);
}
......@@ -20151,7 +20151,7 @@ function WebGLRenderer(parameters = {}) {
needsProgramChange = true;
} else if (materialProperties.envMap !== envMap) {
needsProgramChange = true;
} else if (material.fog && materialProperties.fog !== fog) {
} else if (material.fog === true && materialProperties.fog !== fog) {
needsProgramChange = true;
} else if (materialProperties.numClippingPlanes !== undefined && (materialProperties.numClippingPlanes !== clipping.numPlanes || materialProperties.numIntersection !== clipping.numIntersection)) {
needsProgramChange = true;
......@@ -20280,7 +20280,7 @@ function WebGLRenderer(parameters = {}) {
} // refresh uniforms common to several materials
if (fog && material.fog) {
if (fog && material.fog === true) {
materials.refreshFogUniforms(m_uniforms, fog);
}
......@@ -21022,6 +21022,7 @@ class SpriteMaterial extends Material {
this.rotation = 0;
this.sizeAttenuation = true;
this.transparent = true;
this.fog = true;
this.setValues(parameters);
}
......@@ -21032,6 +21033,7 @@ class SpriteMaterial extends Material {
this.alphaMap = source.alphaMap;
this.rotation = source.rotation;
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -21760,6 +21762,7 @@ class LineBasicMaterial extends Material {
this.linewidth = 1;
this.linecap = 'round';
this.linejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -21769,6 +21772,7 @@ class LineBasicMaterial extends Material {
this.linewidth = source.linewidth;
this.linecap = source.linecap;
this.linejoin = source.linejoin;
this.fog = source.fog;
return this;
}
......@@ -22019,6 +22023,7 @@ class PointsMaterial extends Material {
this.alphaMap = null;
this.size = 1;
this.sizeAttenuation = true;
this.fog = true;
this.setValues(parameters);
}
......@@ -22029,6 +22034,7 @@ class PointsMaterial extends Material {
this.alphaMap = source.alphaMap;
this.size = source.size;
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -26260,12 +26266,14 @@ class ShadowMaterial extends Material {
this.type = 'ShadowMaterial';
this.color = new Color(0x000000);
this.transparent = true;
this.fog = true;
this.setValues(parameters);
}
copy(source) {
super.copy(source);
this.color.copy(source.color);
this.fog = source.fog;
return this;
}
......@@ -26320,6 +26328,7 @@ class MeshStandardMaterial extends Material {
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26357,6 +26366,7 @@ class MeshStandardMaterial extends Material {
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -26511,6 +26521,7 @@ class MeshPhongMaterial extends Material {
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26546,6 +26557,7 @@ class MeshPhongMaterial extends Material {
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -26583,6 +26595,7 @@ class MeshToonMaterial extends Material {
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -26611,6 +26624,7 @@ class MeshToonMaterial extends Material {
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -26632,7 +26646,6 @@ class MeshNormalMaterial extends Material {
this.displacementBias = 0;
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.flatShading = false;
this.setValues(parameters);
}
......@@ -26681,6 +26694,7 @@ class MeshLambertMaterial extends Material {
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -26705,6 +26719,7 @@ class MeshLambertMaterial extends Material {
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -26733,6 +26748,7 @@ class MeshMatcapMaterial extends Material {
this.displacementBias = 0;
this.alphaMap = null;
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26754,6 +26770,7 @@ class MeshMatcapMaterial extends Material {
this.displacementBias = source.displacementBias;
this.alphaMap = source.alphaMap;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -6766,7 +6766,6 @@
this.uuid = generateUUID();
this.name = '';
this.type = 'Material';
this.fog = true;
this.blending = NormalBlending;
this.side = FrontSide;
this.vertexColors = false;
......@@ -7012,6 +7011,7 @@
if (this.flatShading === true) data.flatShading = this.flatShading;
if (this.visible === false) data.visible = false;
if (this.toneMapped === false) data.toneMapped = false;
if (this.fog === false) data.fog = false;
if (JSON.stringify(this.userData) !== '{}') data.userData = this.userData; // TODO: Copied from Object3D.toJSON
function extractFromCache(cache) {
......@@ -7042,7 +7042,6 @@
copy(source) {
this.name = source.name;
this.fog = source.fog;
this.blending = source.blending;
this.side = source.side;
this.vertexColors = source.vertexColors;
......@@ -7138,6 +7137,7 @@
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -7159,6 +7159,7 @@
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -8863,6 +8864,7 @@
this.defines = Object.assign({}, source.defines);
this.wireframe = source.wireframe;
this.wireframeLinewidth = source.wireframeLinewidth;
this.fog = source.fog;
this.lights = source.lights;
this.clipping = source.clipping;
this.extensions = Object.assign({}, source.extensions);
......@@ -14538,7 +14540,7 @@
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,
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,
fog: !!fog,
useFog: material.fog,
useFog: material.fog === true,
fogExp2: fog && fog.isFogExp2,
flatShading: !!material.flatShading,
sizeAttenuation: material.sizeAttenuation,
......@@ -15431,7 +15433,6 @@
this.displacementBias = 0;
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.setValues(parameters);
}
......@@ -15464,7 +15465,6 @@
this.displacementMap = null;
this.displacementScale = 1;
this.displacementBias = 0;
this.fog = false;
this.setValues(parameters);
}
......@@ -20153,7 +20153,7 @@
needsProgramChange = true;
} else if (materialProperties.envMap !== envMap) {
needsProgramChange = true;
} else if (material.fog && materialProperties.fog !== fog) {
} else if (material.fog === true && materialProperties.fog !== fog) {
needsProgramChange = true;
} else if (materialProperties.numClippingPlanes !== undefined && (materialProperties.numClippingPlanes !== clipping.numPlanes || materialProperties.numIntersection !== clipping.numIntersection)) {
needsProgramChange = true;
......@@ -20282,7 +20282,7 @@
} // refresh uniforms common to several materials
if (fog && material.fog) {
if (fog && material.fog === true) {
materials.refreshFogUniforms(m_uniforms, fog);
}
......@@ -21024,6 +21024,7 @@
this.rotation = 0;
this.sizeAttenuation = true;
this.transparent = true;
this.fog = true;
this.setValues(parameters);
}
......@@ -21034,6 +21035,7 @@
this.alphaMap = source.alphaMap;
this.rotation = source.rotation;
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -21762,6 +21764,7 @@
this.linewidth = 1;
this.linecap = 'round';
this.linejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -21771,6 +21774,7 @@
this.linewidth = source.linewidth;
this.linecap = source.linecap;
this.linejoin = source.linejoin;
this.fog = source.fog;
return this;
}
......@@ -22021,6 +22025,7 @@
this.alphaMap = null;
this.size = 1;
this.sizeAttenuation = true;
this.fog = true;
this.setValues(parameters);
}
......@@ -22031,6 +22036,7 @@
this.alphaMap = source.alphaMap;
this.size = source.size;
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -26262,12 +26268,14 @@
this.type = 'ShadowMaterial';
this.color = new Color(0x000000);
this.transparent = true;
this.fog = true;
this.setValues(parameters);
}
copy(source) {
super.copy(source);
this.color.copy(source.color);
this.fog = source.fog;
return this;
}
......@@ -26322,6 +26330,7 @@
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26359,6 +26368,7 @@
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -26513,6 +26523,7 @@
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26548,6 +26559,7 @@
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -26585,6 +26597,7 @@
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -26613,6 +26626,7 @@
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -26634,7 +26648,6 @@
this.displacementBias = 0;
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.flatShading = false;
this.setValues(parameters);
}
......@@ -26683,6 +26696,7 @@
this.wireframeLinewidth = 1;
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues(parameters);
}
......@@ -26707,6 +26721,7 @@
this.wireframeLinewidth = source.wireframeLinewidth;
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -26735,6 +26750,7 @@
this.displacementBias = 0;
this.alphaMap = null;
this.flatShading = false;
this.fog = true;
this.setValues(parameters);
}
......@@ -26756,6 +26772,7 @@
this.displacementBias = source.displacementBias;
this.alphaMap = source.alphaMap;
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
此差异已折叠。
......@@ -8779,8 +8779,6 @@ class Material extends EventDispatcher {
this.name = '';
this.type = 'Material';
this.fog = true;
this.blending = NormalBlending;
this.side = FrontSide;
this.vertexColors = false;
......@@ -9112,6 +9110,8 @@ class Material extends EventDispatcher {
if ( this.toneMapped === false ) data.toneMapped = false;
if ( this.fog === false ) data.fog = false;
if ( JSON.stringify( this.userData ) !== '{}' ) data.userData = this.userData;
// TODO: Copied from Object3D.toJSON
......@@ -9156,8 +9156,6 @@ class Material extends EventDispatcher {
this.name = source.name;
this.fog = source.fog;
this.blending = source.blending;
this.side = source.side;
this.vertexColors = source.vertexColors;
......@@ -9287,6 +9285,8 @@ class MeshBasicMaterial extends Material {
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues( parameters );
}
......@@ -9319,6 +9319,8 @@ class MeshBasicMaterial extends Material {
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -11657,6 +11659,7 @@ class ShaderMaterial extends Material {
this.wireframe = source.wireframe;
this.wireframeLinewidth = source.wireframeLinewidth;
this.fog = source.fog;
this.lights = source.lights;
this.clipping = source.clipping;
......@@ -19353,7 +19356,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
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,
fog: !! fog,
useFog: material.fog,
useFog: material.fog === true,
fogExp2: ( fog && fog.isFogExp2 ),
flatShading: !! material.flatShading,
......@@ -20647,8 +20650,6 @@ class MeshDepthMaterial extends Material {
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.setValues( parameters );
}
......@@ -20698,8 +20699,6 @@ class MeshDistanceMaterial extends Material {
this.displacementScale = 1;
this.displacementBias = 0;
this.fog = false;
this.setValues( parameters );
}
......@@ -27531,7 +27530,7 @@ function WebGLRenderer( parameters = {} ) {
needsProgramChange = true;
} else if ( material.fog && materialProperties.fog !== fog ) {
} else if ( material.fog === true && materialProperties.fog !== fog ) {
needsProgramChange = true;
......@@ -27748,7 +27747,7 @@ function WebGLRenderer( parameters = {} ) {
// refresh uniforms common to several materials
if ( fog && material.fog ) {
if ( fog && material.fog === true ) {
materials.refreshFogUniforms( m_uniforms, fog );
......@@ -28768,6 +28767,8 @@ class SpriteMaterial extends Material {
this.transparent = true;
this.fog = true;
this.setValues( parameters );
}
......@@ -28786,6 +28787,8 @@ class SpriteMaterial extends Material {
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -29783,6 +29786,8 @@ class LineBasicMaterial extends Material {
this.linecap = 'round';
this.linejoin = 'round';
this.fog = true;
this.setValues( parameters );
}
......@@ -29798,6 +29803,8 @@ class LineBasicMaterial extends Material {
this.linecap = source.linecap;
this.linejoin = source.linejoin;
this.fog = source.fog;
return this;
}
......@@ -30137,6 +30144,8 @@ class PointsMaterial extends Material {
this.size = 1;
this.sizeAttenuation = true;
this.fog = true;
this.setValues( parameters );
}
......@@ -30154,6 +30163,8 @@ class PointsMaterial extends Material {
this.size = source.size;
this.sizeAttenuation = source.sizeAttenuation;
this.fog = source.fog;
return this;
}
......@@ -36324,6 +36335,8 @@ class ShadowMaterial extends Material {
this.color = new Color( 0x000000 );
this.transparent = true;
this.fog = true;
this.setValues( parameters );
}
......@@ -36334,6 +36347,8 @@ class ShadowMaterial extends Material {
this.color.copy( source.color );
this.fog = source.fog;
return this;
}
......@@ -36409,6 +36424,8 @@ class MeshStandardMaterial extends Material {
this.flatShading = false;
this.fog = true;
this.setValues( parameters );
}
......@@ -36462,6 +36479,8 @@ class MeshStandardMaterial extends Material {
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -36683,6 +36702,8 @@ class MeshPhongMaterial extends Material {
this.flatShading = false;
this.fog = true;
this.setValues( parameters );
}
......@@ -36734,6 +36755,8 @@ class MeshPhongMaterial extends Material {
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
......@@ -36785,6 +36808,8 @@ class MeshToonMaterial extends Material {
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues( parameters );
}
......@@ -36826,6 +36851,8 @@ class MeshToonMaterial extends Material {
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -36856,8 +36883,6 @@ class MeshNormalMaterial extends Material {
this.wireframe = false;
this.wireframeLinewidth = 1;
this.fog = false;
this.flatShading = false;
this.setValues( parameters );
......@@ -36928,6 +36953,8 @@ class MeshLambertMaterial extends Material {
this.wireframeLinecap = 'round';
this.wireframeLinejoin = 'round';
this.fog = true;
this.setValues( parameters );
}
......@@ -36964,6 +36991,8 @@ class MeshLambertMaterial extends Material {
this.wireframeLinecap = source.wireframeLinecap;
this.wireframeLinejoin = source.wireframeLinejoin;
this.fog = source.fog;
return this;
}
......@@ -37003,6 +37032,8 @@ class MeshMatcapMaterial extends Material {
this.flatShading = false;
this.fog = true;
this.setValues( parameters );
}
......@@ -37035,6 +37066,8 @@ class MeshMatcapMaterial extends Material {
this.flatShading = source.flatShading;
this.fog = source.fog;
return this;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册