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

Commented Out Morph 

i Commented Out Morph untill someone manage to make it work again
This commit is contained in:
Xenon472 2020-04-09 16:39:23 +02:00
parent 34383014a9
commit 1255070019
4 changed files with 26 additions and 19 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

26
package-lock.json generated
View File

@ -46,9 +46,9 @@
} }
}, },
"acorn": { "acorn": {
"version": "7.1.0", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
"integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
"dev": true "dev": true
}, },
"ansi-styles": { "ansi-styles": {
@ -216,9 +216,9 @@
} }
}, },
"rollup": { "rollup": {
"version": "1.24.0", "version": "1.32.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.24.0.tgz", "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
"integrity": "sha512-PiFETY/rPwodQ8TTC52Nz2DSCYUATznGh/ChnxActCr8rV5FIk3afBUb3uxNritQW/Jpbdn3kq1Rwh1HHYMwdQ==", "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/estree": "*", "@types/estree": "*",
@ -273,6 +273,14 @@
"rollup-pluginutils": "^2.8.1", "rollup-pluginutils": "^2.8.1",
"serialize-javascript": "^1.7.0", "serialize-javascript": "^1.7.0",
"terser": "^4.1.0" "terser": "^4.1.0"
},
"dependencies": {
"serialize-javascript": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
"integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
"dev": true
}
} }
}, },
"rollup-pluginutils": { "rollup-pluginutils": {
@ -284,12 +292,6 @@
"estree-walker": "^0.6.1" "estree-walker": "^0.6.1"
} }
}, },
"serialize-javascript": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz",
"integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==",
"dev": true
},
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",

2
package.json
View File

@ -9,7 +9,7 @@
"three": "^0.109.0" "three": "^0.109.0"
}, },
"devDependencies": { "devDependencies": {
"rollup": "^1.24.0", "rollup": "^1.32.1",
"rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0", "rollup-plugin-replace": "^2.2.0",

15
src/finalizeMesh.js
View File

@ -38,7 +38,10 @@ 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) {
//commenting out the morph part untill someone manage to fix it
/*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();
@ -55,7 +58,7 @@ finalizeMesh.prototype = {
tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]); tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]);
} }
morphVector.add(tempMorph); morphVector.add(tempMorph);
} }*/
for (var si = 0; si < geometry.skinIndexNames.length; si++) { for (var si = 0; si < geometry.skinIndexNames.length; si++) {
@ -87,11 +90,13 @@ 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) { // commenting out the morph part as above
/*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