test128534
/
lkspencer-Herosaver
mirror of https://github.com/lkspencer/Herosaver
1
0
Fork 0
Code Issues Releases Wiki Activity

more refactorings

This commit is contained in:
Kirk Spencer 2020-03-26 10:13:32 -07:00
parent 2d481ae649
commit bf4f4e87e1
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/saver.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
src/finalizeMesh.js
View File

@ -3,6 +3,7 @@ import { Matrix4, Vector3, Vector4 } from "three";
let matrixRotation = new Matrix4().makeRotationX(90 * Math.PI / 180); let matrixRotation = new Matrix4().makeRotationX(90 * Math.PI / 180);
let matrixScale = new Matrix4().makeScale(10, 10, 10); let matrixScale = new Matrix4().makeScale(10, 10, 10);
let vertex = new Vector3(); let vertex = new Vector3();
let geometry;
export function parse(mesh) { export function parse(mesh) {
if (!mesh.isMesh) { if (!mesh.isMesh) {
@ -10,7 +11,7 @@ export function parse(mesh) {
return; return;
} }
let geometry = mesh.geometry; geometry = mesh.geometry;
if (geometry.isBufferGeometry) { if (geometry.isBufferGeometry) {
var newGeometry = geometry.clone(geometry); var newGeometry = geometry.clone(geometry);
@ -51,7 +52,7 @@ export function parse(mesh) {
} }
for (let j = 0; j < geometry.skinIndexNames.length; j++) { for (let j = 0; j < geometry.skinIndexNames.length; j++) {
newFunction_1(geometry, i, j, mesh, morphVector, finalVector); newFunction_1(i, j, mesh, morphVector, finalVector);
} }
newGeometry.attributes.position.setXYZ(i, finalVector.x, finalVector.y, finalVector.z); newGeometry.attributes.position.setXYZ(i, finalVector.x, finalVector.y, finalVector.z);
} }
@ -64,7 +65,7 @@ export function parse(mesh) {
return newGeometry; return newGeometry;
} }
function newFunction_1(geometry, i, j, mesh, morphVector, finalVector) { function newFunction_1(i, j, mesh, morphVector, finalVector) {
var skinIndices = geometry.getAttribute([geometry.skinIndexNames[j]]); var skinIndices = geometry.getAttribute([geometry.skinIndexNames[j]]);
var weights = geometry.getAttribute([geometry.skinWeightNames[j]]); var weights = geometry.getAttribute([geometry.skinWeightNames[j]]);
var skinIndex = []; var skinIndex = [];
@ -88,11 +89,11 @@ function newFunction_1(geometry, i, j, mesh, morphVector, finalVector) {
skinMatrices[2] = mesh.skeleton.bones[skinIndex[2]].matrixWorld; skinMatrices[2] = mesh.skeleton.bones[skinIndex[2]].matrixWorld;
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++) {
newFunction(geometry, morphVector, skinWeight, k, inverses, skinMatrices, finalVector); newFunction(morphVector, skinWeight, k, inverses, skinMatrices, finalVector);
} }
} }
function newFunction(geometry, morphVector, skinWeight, k, inverses, skinMatrices, finalVector) { function newFunction(morphVector, skinWeight, k, inverses, skinMatrices, finalVector) {
var vectorToCopy = geometry.morphTargetInfluences !== undefined var vectorToCopy = geometry.morphTargetInfluences !== undefined
? morphVector ? morphVector
: vertex; : vertex;

1
src/saver.js
View File

@ -4,6 +4,7 @@ import { OBJExporter } from 'three/examples/jsm/exporters/OBJExporter.js';
import { SubdivisionModifier } from 'three/examples/jsm/modifiers/SubdivisionModifier.js'; import { SubdivisionModifier } from 'three/examples/jsm/modifiers/SubdivisionModifier.js';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import jQuery from 'jquery'; import jQuery from 'jquery';
import { arrive } from 'arrive';
import * as exporter from './finalizeMesh.js'; import * as exporter from './finalizeMesh.js';
function save_stl() { function save_stl() {