test2
This commit is contained in:
parent
d7ddae637b
commit
7a47f38818
File diff suppressed because one or more lines are too long
|
@ -38,7 +38,8 @@ finalizeMesh.prototype = {
|
||||||
newGeometry.attributes.position.setXYZ(i, vertex.x, vertex.y, vertex.z);
|
newGeometry.attributes.position.setXYZ(i, vertex.x, vertex.y, vertex.z);
|
||||||
} else {
|
} else {
|
||||||
var finalVector = new Vector4();
|
var finalVector = new Vector4();
|
||||||
/*if (geometry.morphTargetInfluences !== undefined) {
|
|
||||||
|
if (geometry.morphTargetInfluences !== undefined) {
|
||||||
|
|
||||||
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);
|
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);
|
||||||
var tempMorph = new Vector4();
|
var tempMorph = new Vector4();
|
||||||
|
@ -54,8 +55,9 @@ finalizeMesh.prototype = {
|
||||||
|
|
||||||
tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]);
|
tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]);
|
||||||
}
|
}
|
||||||
morphVector.add(tempMorph);
|
//comment to avoid morph problems
|
||||||
}*/
|
//morphVector.add(tempMorph);
|
||||||
|
}
|
||||||
|
|
||||||
for (var si = 0; si < geometry.skinIndexNames.length; si++) {
|
for (var si = 0; si < geometry.skinIndexNames.length; si++) {
|
||||||
|
|
||||||
|
@ -87,11 +89,11 @@ finalizeMesh.prototype = {
|
||||||
skinMatrices[3] = mesh.skeleton.bones[skinIndex[3]].matrixWorld;
|
skinMatrices[3] = mesh.skeleton.bones[skinIndex[3]].matrixWorld;
|
||||||
|
|
||||||
for (var k = 0; k < 4; k++) {
|
for (var k = 0; k < 4; k++) {
|
||||||
/*if (geometry.morphTargetInfluences !== undefined) {
|
if (geometry.morphTargetInfluences !== undefined) {
|
||||||
var tempVector = new Vector4(morphVector.x, morphVector.y, morphVector.z);
|
var tempVector = new Vector4(morphVector.x, morphVector.y, morphVector.z);
|
||||||
} else {*/
|
} else {
|
||||||
var tempVector = new Vector4(vertex.x, vertex.y, vertex.z);
|
var tempVector = new Vector4(vertex.x, vertex.y, vertex.z);
|
||||||
//}
|
}
|
||||||
|
|
||||||
tempVector.multiplyScalar(skinWeight[k]);
|
tempVector.multiplyScalar(skinWeight[k]);
|
||||||
//the inverse takes the vector into local bone space
|
//the inverse takes the vector into local bone space
|
||||||
|
|
Loading…
Reference in New Issue