test128534
/
Xenon4722-threejs
mirror of https://github.com/Xenon4722/threejs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

test2

This commit is contained in:
Xenon472 2020-04-09 19:14:20 +02:00
parent d7ddae637b
commit 7a47f38818
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/saver.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
src/finalizeMesh.js
View File

@ -38,7 +38,8 @@ finalizeMesh.prototype = {
newGeometry.attributes.position.setXYZ(i, vertex.x, vertex.y, vertex.z);
} else {
var finalVector = new Vector4();
/*if (geometry.morphTargetInfluences !== undefined) {
if (geometry.morphTargetInfluences !== undefined) {
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);
var tempMorph = new Vector4();
@ -54,8 +55,9 @@ finalizeMesh.prototype = {
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++) {
@ -87,11 +89,11 @@ finalizeMesh.prototype = {
skinMatrices[3] = mesh.skeleton.bones[skinIndex[3]].matrixWorld;
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);
} else {*/
var tempVector = new Vector4(vertex.x, vertex.y, vertex.z);
//}
} else {
var tempVector = new Vector4(vertex.x, vertex.y, vertex.z);
}
tempVector.multiplyScalar(skinWeight[k]);
//the inverse takes the vector into local bone space