|
@@ -6252,7 +6252,6 @@
|
|
if (this.wireframeLinejoin !== 'round') data.wireframeLinejoin = this.wireframeLinejoin;
|
|
if (this.wireframeLinejoin !== 'round') data.wireframeLinejoin = this.wireframeLinejoin;
|
|
if (this.morphTargets === true) data.morphTargets = true;
|
|
if (this.morphTargets === true) data.morphTargets = true;
|
|
if (this.morphNormals === true) data.morphNormals = true;
|
|
if (this.morphNormals === true) data.morphNormals = true;
|
|
- if (this.skinning === true) data.skinning = true;
|
|
|
|
if (this.flatShading === true) data.flatShading = this.flatShading;
|
|
if (this.flatShading === true) data.flatShading = this.flatShading;
|
|
if (this.visible === false) data.visible = false;
|
|
if (this.visible === false) data.visible = false;
|
|
if (this.toneMapped === false) data.toneMapped = false;
|
|
if (this.toneMapped === false) data.toneMapped = false;
|
|
@@ -6953,7 +6952,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>,
|
|
* wireframeLinewidth: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>
|
|
* morphTargets: <bool>
|
|
* }
|
|
* }
|
|
*/
|
|
*/
|
|
@@ -6979,7 +6977,6 @@
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.setValues(parameters);
|
|
this.setValues(parameters);
|
|
}
|
|
}
|
|
@@ -7002,7 +6999,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
return this;
|
|
return this;
|
|
}
|
|
}
|
|
@@ -8486,7 +8482,7 @@
|
|
_vC$1.add(_morphC);
|
|
_vC$1.add(_morphC);
|
|
}
|
|
}
|
|
|
|
|
|
- if (object.isSkinnedMesh && material.skinning) {
|
|
|
|
|
|
+ if (object.isSkinnedMesh) {
|
|
object.boneTransform(a, _vA$1);
|
|
object.boneTransform(a, _vA$1);
|
|
object.boneTransform(b, _vB$1);
|
|
object.boneTransform(b, _vB$1);
|
|
object.boneTransform(c, _vC$1);
|
|
object.boneTransform(c, _vC$1);
|
|
@@ -8699,7 +8695,6 @@
|
|
*
|
|
*
|
|
* lights: <bool>,
|
|
* lights: <bool>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>
|
|
* morphNormals: <bool>
|
|
* }
|
|
* }
|
|
@@ -8722,8 +8717,6 @@
|
|
|
|
|
|
this.clipping = false; // set to use user-defined clipping planes
|
|
this.clipping = false; // set to use user-defined clipping planes
|
|
|
|
|
|
- this.skinning = false; // set to use skinning attribute streams
|
|
|
|
-
|
|
|
|
this.morphTargets = false; // set to use morph targets
|
|
this.morphTargets = false; // set to use morph targets
|
|
|
|
|
|
this.morphNormals = false; // set to use morph normals
|
|
this.morphNormals = false; // set to use morph normals
|
|
@@ -8768,7 +8761,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.lights = source.lights;
|
|
this.lights = source.lights;
|
|
this.clipping = source.clipping;
|
|
this.clipping = source.clipping;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
this.extensions = Object.assign({}, source.extensions);
|
|
this.extensions = Object.assign({}, source.extensions);
|
|
@@ -13184,7 +13176,7 @@
|
|
flatShading: !!material.flatShading,
|
|
flatShading: !!material.flatShading,
|
|
sizeAttenuation: material.sizeAttenuation,
|
|
sizeAttenuation: material.sizeAttenuation,
|
|
logarithmicDepthBuffer: logarithmicDepthBuffer,
|
|
logarithmicDepthBuffer: logarithmicDepthBuffer,
|
|
- skinning: material.skinning && maxBones > 0,
|
|
|
|
|
|
+ skinning: object.isSkinnedMesh === true && maxBones > 0,
|
|
maxBones: maxBones,
|
|
maxBones: maxBones,
|
|
useVertexTexture: floatVertexTextures,
|
|
useVertexTexture: floatVertexTextures,
|
|
morphTargets: material.morphTargets,
|
|
morphTargets: material.morphTargets,
|
|
@@ -13974,7 +13966,6 @@
|
|
super();
|
|
super();
|
|
this.type = 'MeshDepthMaterial';
|
|
this.type = 'MeshDepthMaterial';
|
|
this.depthPacking = BasicDepthPacking;
|
|
this.depthPacking = BasicDepthPacking;
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.map = null;
|
|
this.map = null;
|
|
this.alphaMap = null;
|
|
this.alphaMap = null;
|
|
@@ -13990,7 +13981,6 @@
|
|
copy(source) {
|
|
copy(source) {
|
|
super.copy(source);
|
|
super.copy(source);
|
|
this.depthPacking = source.depthPacking;
|
|
this.depthPacking = source.depthPacking;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.map = source.map;
|
|
this.map = source.map;
|
|
this.alphaMap = source.alphaMap;
|
|
this.alphaMap = source.alphaMap;
|
|
@@ -14013,7 +14003,6 @@
|
|
* nearDistance: <float>,
|
|
* nearDistance: <float>,
|
|
* farDistance: <float>,
|
|
* farDistance: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
*
|
|
*
|
|
* map: new THREE.Texture( <Image> ),
|
|
* map: new THREE.Texture( <Image> ),
|
|
@@ -14034,7 +14023,6 @@
|
|
this.referencePosition = new Vector3();
|
|
this.referencePosition = new Vector3();
|
|
this.nearDistance = 1;
|
|
this.nearDistance = 1;
|
|
this.farDistance = 1000;
|
|
this.farDistance = 1000;
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.map = null;
|
|
this.map = null;
|
|
this.alphaMap = null;
|
|
this.alphaMap = null;
|
|
@@ -14050,7 +14038,6 @@
|
|
this.referencePosition.copy(source.referencePosition);
|
|
this.referencePosition.copy(source.referencePosition);
|
|
this.nearDistance = source.nearDistance;
|
|
this.nearDistance = source.nearDistance;
|
|
this.farDistance = source.farDistance;
|
|
this.farDistance = source.farDistance;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.map = source.map;
|
|
this.map = source.map;
|
|
this.alphaMap = source.alphaMap;
|
|
this.alphaMap = source.alphaMap;
|
|
@@ -14249,15 +14236,14 @@
|
|
_renderer.renderBufferDirect(camera, null, geometry, shadowMaterialHorizontal, fullScreenMesh, null);
|
|
_renderer.renderBufferDirect(camera, null, geometry, shadowMaterialHorizontal, fullScreenMesh, null);
|
|
}
|
|
}
|
|
|
|
|
|
- function getDepthMaterialVariant(useMorphing, useSkinning, useInstancing) {
|
|
|
|
- const index = useMorphing << 0 | useSkinning << 1 | useInstancing << 2;
|
|
|
|
|
|
+ function getDepthMaterialVariant(useMorphing) {
|
|
|
|
+ const index = useMorphing << 0;
|
|
let material = _depthMaterials[index];
|
|
let material = _depthMaterials[index];
|
|
|
|
|
|
if (material === undefined) {
|
|
if (material === undefined) {
|
|
material = new MeshDepthMaterial({
|
|
material = new MeshDepthMaterial({
|
|
depthPacking: RGBADepthPacking,
|
|
depthPacking: RGBADepthPacking,
|
|
- morphTargets: useMorphing,
|
|
|
|
- skinning: useSkinning
|
|
|
|
|
|
+ morphTargets: useMorphing
|
|
});
|
|
});
|
|
_depthMaterials[index] = material;
|
|
_depthMaterials[index] = material;
|
|
}
|
|
}
|
|
@@ -14265,14 +14251,13 @@
|
|
return material;
|
|
return material;
|
|
}
|
|
}
|
|
|
|
|
|
- function getDistanceMaterialVariant(useMorphing, useSkinning, useInstancing) {
|
|
|
|
- const index = useMorphing << 0 | useSkinning << 1 | useInstancing << 2;
|
|
|
|
|
|
+ function getDistanceMaterialVariant(useMorphing) {
|
|
|
|
+ const index = useMorphing << 0;
|
|
let material = _distanceMaterials[index];
|
|
let material = _distanceMaterials[index];
|
|
|
|
|
|
if (material === undefined) {
|
|
if (material === undefined) {
|
|
material = new MeshDistanceMaterial({
|
|
material = new MeshDistanceMaterial({
|
|
- morphTargets: useMorphing,
|
|
|
|
- skinning: useSkinning
|
|
|
|
|
|
+ morphTargets: useMorphing
|
|
});
|
|
});
|
|
_distanceMaterials[index] = material;
|
|
_distanceMaterials[index] = material;
|
|
}
|
|
}
|
|
@@ -14297,18 +14282,7 @@
|
|
useMorphing = geometry.morphAttributes && geometry.morphAttributes.position && geometry.morphAttributes.position.length > 0;
|
|
useMorphing = geometry.morphAttributes && geometry.morphAttributes.position && geometry.morphAttributes.position.length > 0;
|
|
}
|
|
}
|
|
|
|
|
|
- let useSkinning = false;
|
|
|
|
-
|
|
|
|
- if (object.isSkinnedMesh === true) {
|
|
|
|
- if (material.skinning === true) {
|
|
|
|
- useSkinning = true;
|
|
|
|
- } else {
|
|
|
|
- console.warn('THREE.WebGLShadowMap: THREE.SkinnedMesh with material.skinning set to false:', object);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- const useInstancing = object.isInstancedMesh === true;
|
|
|
|
- result = getMaterialVariant(useMorphing, useSkinning, useInstancing);
|
|
|
|
|
|
+ result = getMaterialVariant(useMorphing);
|
|
} else {
|
|
} else {
|
|
result = customMaterial;
|
|
result = customMaterial;
|
|
}
|
|
}
|
|
@@ -18139,6 +18113,7 @@
|
|
const materialProperties = properties.get(material);
|
|
const materialProperties = properties.get(material);
|
|
materialProperties.outputEncoding = parameters.outputEncoding;
|
|
materialProperties.outputEncoding = parameters.outputEncoding;
|
|
materialProperties.instancing = parameters.instancing;
|
|
materialProperties.instancing = parameters.instancing;
|
|
|
|
+ materialProperties.skinning = parameters.skinning;
|
|
materialProperties.numClippingPlanes = parameters.numClippingPlanes;
|
|
materialProperties.numClippingPlanes = parameters.numClippingPlanes;
|
|
materialProperties.numIntersection = parameters.numClipIntersection;
|
|
materialProperties.numIntersection = parameters.numClipIntersection;
|
|
materialProperties.vertexAlphas = parameters.vertexAlphas;
|
|
materialProperties.vertexAlphas = parameters.vertexAlphas;
|
|
@@ -18178,6 +18153,10 @@
|
|
needsProgramChange = true;
|
|
needsProgramChange = true;
|
|
} else if (!object.isInstancedMesh && materialProperties.instancing === true) {
|
|
} else if (!object.isInstancedMesh && materialProperties.instancing === true) {
|
|
needsProgramChange = true;
|
|
needsProgramChange = true;
|
|
|
|
+ } else if (object.isSkinnedMesh && materialProperties.skinning === false) {
|
|
|
|
+ needsProgramChange = true;
|
|
|
|
+ } else if (!object.isSkinnedMesh && materialProperties.skinning === true) {
|
|
|
|
+ needsProgramChange = true;
|
|
} else if (materialProperties.envMap !== envMap) {
|
|
} else if (materialProperties.envMap !== envMap) {
|
|
needsProgramChange = true;
|
|
needsProgramChange = true;
|
|
} else if (material.fog && materialProperties.fog !== fog) {
|
|
} else if (material.fog && materialProperties.fog !== fog) {
|
|
@@ -18247,7 +18226,7 @@
|
|
p_uniforms.setValue(_gl, 'isOrthographic', camera.isOrthographicCamera === true);
|
|
p_uniforms.setValue(_gl, 'isOrthographic', camera.isOrthographicCamera === true);
|
|
}
|
|
}
|
|
|
|
|
|
- if (material.isMeshPhongMaterial || material.isMeshToonMaterial || material.isMeshLambertMaterial || material.isMeshBasicMaterial || material.isMeshStandardMaterial || material.isShaderMaterial || material.isShadowMaterial || material.skinning) {
|
|
|
|
|
|
+ if (material.isMeshPhongMaterial || material.isMeshToonMaterial || material.isMeshLambertMaterial || material.isMeshBasicMaterial || material.isMeshStandardMaterial || material.isShaderMaterial || material.isShadowMaterial || object.isSkinnedMesh) {
|
|
p_uniforms.setValue(_gl, 'viewMatrix', camera.matrixWorldInverse);
|
|
p_uniforms.setValue(_gl, 'viewMatrix', camera.matrixWorldInverse);
|
|
}
|
|
}
|
|
} // skinning uniforms must be set even if material didn't change
|
|
} // skinning uniforms must be set even if material didn't change
|
|
@@ -18255,7 +18234,7 @@
|
|
// otherwise textures used for skinning can take over texture units reserved for other material textures
|
|
// otherwise textures used for skinning can take over texture units reserved for other material textures
|
|
|
|
|
|
|
|
|
|
- if (material.skinning) {
|
|
|
|
|
|
+ if (object.isSkinnedMesh) {
|
|
p_uniforms.setOptional(_gl, object, 'bindMatrix');
|
|
p_uniforms.setOptional(_gl, object, 'bindMatrix');
|
|
p_uniforms.setOptional(_gl, object, 'bindMatrixInverse');
|
|
p_uniforms.setOptional(_gl, object, 'bindMatrixInverse');
|
|
const skeleton = object.skeleton;
|
|
const skeleton = object.skeleton;
|
|
@@ -22944,7 +22923,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>,
|
|
* wireframeLinewidth: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>,
|
|
* morphNormals: <bool>,
|
|
*
|
|
*
|
|
@@ -22989,7 +22967,6 @@
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.flatShading = false;
|
|
this.flatShading = false;
|
|
@@ -23031,7 +23008,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
this.flatShading = source.flatShading;
|
|
this.flatShading = source.flatShading;
|
|
@@ -23164,7 +23140,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>,
|
|
* wireframeLinewidth: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>,
|
|
* morphNormals: <bool>,
|
|
*
|
|
*
|
|
@@ -23206,7 +23181,6 @@
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.flatShading = false;
|
|
this.flatShading = false;
|
|
@@ -23244,7 +23218,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
this.flatShading = source.flatShading;
|
|
this.flatShading = source.flatShading;
|
|
@@ -23288,7 +23261,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>,
|
|
* wireframeLinewidth: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>
|
|
* morphNormals: <bool>
|
|
* }
|
|
* }
|
|
@@ -23324,7 +23296,6 @@
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.setValues(parameters);
|
|
this.setValues(parameters);
|
|
@@ -23355,7 +23326,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
return this;
|
|
return this;
|
|
@@ -23383,7 +23353,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>
|
|
* wireframeLinewidth: <float>
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>,
|
|
* morphNormals: <bool>,
|
|
*
|
|
*
|
|
@@ -23406,7 +23375,6 @@
|
|
this.wireframe = false;
|
|
this.wireframe = false;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.fog = false;
|
|
this.fog = false;
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.flatShading = false;
|
|
this.flatShading = false;
|
|
@@ -23425,7 +23393,6 @@
|
|
this.displacementBias = source.displacementBias;
|
|
this.displacementBias = source.displacementBias;
|
|
this.wireframe = source.wireframe;
|
|
this.wireframe = source.wireframe;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
this.flatShading = source.flatShading;
|
|
this.flatShading = source.flatShading;
|
|
@@ -23465,7 +23432,6 @@
|
|
* wireframe: <boolean>,
|
|
* wireframe: <boolean>,
|
|
* wireframeLinewidth: <float>,
|
|
* wireframeLinewidth: <float>,
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>
|
|
* morphNormals: <bool>
|
|
* }
|
|
* }
|
|
@@ -23495,7 +23461,6 @@
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinewidth = 1;
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinecap = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
this.wireframeLinejoin = 'round';
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.setValues(parameters);
|
|
this.setValues(parameters);
|
|
@@ -23522,7 +23487,6 @@
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
return this;
|
|
return this;
|
|
@@ -23554,7 +23518,6 @@
|
|
*
|
|
*
|
|
* alphaMap: new THREE.Texture( <Image> ),
|
|
* alphaMap: new THREE.Texture( <Image> ),
|
|
*
|
|
*
|
|
- * skinning: <bool>,
|
|
|
|
* morphTargets: <bool>,
|
|
* morphTargets: <bool>,
|
|
* morphNormals: <bool>
|
|
* morphNormals: <bool>
|
|
*
|
|
*
|
|
@@ -23582,7 +23545,6 @@
|
|
this.displacementScale = 1;
|
|
this.displacementScale = 1;
|
|
this.displacementBias = 0;
|
|
this.displacementBias = 0;
|
|
this.alphaMap = null;
|
|
this.alphaMap = null;
|
|
- this.skinning = false;
|
|
|
|
this.morphTargets = false;
|
|
this.morphTargets = false;
|
|
this.morphNormals = false;
|
|
this.morphNormals = false;
|
|
this.flatShading = false;
|
|
this.flatShading = false;
|
|
@@ -23606,7 +23568,6 @@
|
|
this.displacementScale = source.displacementScale;
|
|
this.displacementScale = source.displacementScale;
|
|
this.displacementBias = source.displacementBias;
|
|
this.displacementBias = source.displacementBias;
|
|
this.alphaMap = source.alphaMap;
|
|
this.alphaMap = source.alphaMap;
|
|
- this.skinning = source.skinning;
|
|
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphTargets = source.morphTargets;
|
|
this.morphNormals = source.morphNormals;
|
|
this.morphNormals = source.morphNormals;
|
|
this.flatShading = source.flatShading;
|
|
this.flatShading = source.flatShading;
|
|
@@ -27785,7 +27746,6 @@
|
|
if (json.polygonOffset !== undefined) material.polygonOffset = json.polygonOffset;
|
|
if (json.polygonOffset !== undefined) material.polygonOffset = json.polygonOffset;
|
|
if (json.polygonOffsetFactor !== undefined) material.polygonOffsetFactor = json.polygonOffsetFactor;
|
|
if (json.polygonOffsetFactor !== undefined) material.polygonOffsetFactor = json.polygonOffsetFactor;
|
|
if (json.polygonOffsetUnits !== undefined) material.polygonOffsetUnits = json.polygonOffsetUnits;
|
|
if (json.polygonOffsetUnits !== undefined) material.polygonOffsetUnits = json.polygonOffsetUnits;
|
|
- if (json.skinning !== undefined) material.skinning = json.skinning;
|
|
|
|
if (json.morphTargets !== undefined) material.morphTargets = json.morphTargets;
|
|
if (json.morphTargets !== undefined) material.morphTargets = json.morphTargets;
|
|
if (json.morphNormals !== undefined) material.morphNormals = json.morphNormals;
|
|
if (json.morphNormals !== undefined) material.morphNormals = json.morphNormals;
|
|
if (json.dithering !== undefined) material.dithering = json.dithering;
|
|
if (json.dithering !== undefined) material.dithering = json.dithering;
|