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

Revert "Revert "Revert "test fix lilly""" 

This reverts commit 655eb30020.
This commit is contained in:
Xenon472 2020-04-11 13:37:33 +02:00
parent 655eb30020
commit d5a78f9bd8
2 changed files with 8 additions and 9 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

15
src/finalizeMesh.js
View File

@ -38,12 +38,12 @@ 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();
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);
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();
for (var mt = 0; mt < geometry.morphAttributes.position.length; mt++) { for (var mt = 0; mt < geometry.morphAttributes.position.length; mt++) {
if (geometry.morphTargetInfluences[mt] == 0) continue; if (geometry.morphTargetInfluences[mt] == 0) continue;
if (geometry.morphTargetDictionary.hide == mt) continue; if (geometry.morphTargetDictionary.hide == mt) continue;
@ -51,13 +51,12 @@ finalizeMesh.prototype = {
var morph = new Vector4( var morph = new Vector4(
geometry.morphAttributes.position[mt].getX(i), geometry.morphAttributes.position[mt].getX(i),
geometry.morphAttributes.position[mt].getY(i), geometry.morphAttributes.position[mt].getY(i),
geometry.morphAttributes.position[mt].getZ(i)); geometry.morphAttributes.position[mt].getZ(i));
tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]); tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]);
tempMorph.addScaledVector(morph, geometry.morphTargetInfluences[mt]);
} }
//comment to avoid morph problems //comment to avoid morph problems
morphVector.add(tempMorph); //morphVector.add(tempMorph);
} }
for (var si = 0; si < geometry.skinIndexNames.length; si++) { for (var si = 0; si < geometry.skinIndexNames.length; si++) {