Xenon Update (#3)

* Commented Out Morph

i Commented Out Morph untill someone manage to make it work again

* changed domain

* test2

* Test2 fix by lilly
This commit is contained in:
hero-saver 2020-04-21 17:54:48 +01:00 committed by GitHub
parent 8ed56edae8
commit 2a452311ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions

View File

@ -11,7 +11,7 @@ Please **Always** think about the **developers** of such websites and try to **s
3. Paste the following
```
var xhr=new XMLHttpRequest;xhr.open("get","https://raw.githubusercontent.com/hero-saver/threejs/master/dist/saver.min.js",true);xhr.onreadystatechange=function(){if(xhr.readyState==4){var script=document.createElement("script");script.type="text/javascript";script.text=xhr.responseText;document.body.appendChild(script)}};xhr.send(null);
var xhr=new XMLHttpRequest;xhr.open("get","https://raw.githubusercontent.com/Xenon4722/threejs/master/dist/saver.min.js",true);xhr.onreadystatechange=function(){if(xhr.readyState==4){var script=document.createElement("script");script.type="text/javascript";script.text=xhr.responseText;document.body.appendChild(script)}};xhr.send(null);
```
### Loading via Greecemonkey or other script loader

2
dist/saver.min.js vendored

File diff suppressed because one or more lines are too long

6
package-lock.json generated
View File

@ -216,9 +216,9 @@
}
},
"rollup": {
"version": "1.24.0",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.24.0.tgz",
"integrity": "sha512-PiFETY/rPwodQ8TTC52Nz2DSCYUATznGh/ChnxActCr8rV5FIk3afBUb3uxNritQW/Jpbdn3kq1Rwh1HHYMwdQ==",
"version": "1.32.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
"integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
"dev": true,
"requires": {
"@types/estree": "*",

View File

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

View File

@ -38,9 +38,9 @@ finalizeMesh.prototype = {
newGeometry.attributes.position.setXYZ(i, vertex.x, vertex.y, vertex.z);
} else {
var finalVector = new Vector4();
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);//Lilly
if (geometry.morphTargetInfluences !== undefined) {
var morphVector = new Vector4(vertex.x, vertex.y, vertex.z);
var tempMorph = new Vector4();
for (var mt = 0; mt < geometry.morphAttributes.position.length; mt++) {
@ -52,8 +52,9 @@ finalizeMesh.prototype = {
geometry.morphAttributes.position[mt].getY(i),
geometry.morphAttributes.position[mt].getZ(i));
tempMorph.addScaledVector(morph.sub(morphVector), geometry.morphTargetInfluences[mt]);
tempMorph.addScaledVector(morph, geometry.morphTargetInfluences[mt]);
}
//comment to avoid morph problems
morphVector.add(tempMorph);
}
@ -90,7 +91,7 @@ finalizeMesh.prototype = {
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);
var tempVector = new Vector4(vertex.x, vertex.y, vertex.z);
}
tempVector.multiplyScalar(skinWeight[k]);