clean up state prep and tool move

This commit is contained in:
Stewart Allen 2022-10-28 10:05:28 -04:00
commit 2e90849ca3

View file

@ -372,12 +372,6 @@ kiri.load(() => {
stock = settings.stock; stock = settings.stock;
rez = 1/Math.sqrt(density/(stock.x * stock.y)); rez = 1/Math.sqrt(density/(stock.x * stock.y));
const offset = {
x: process.outputOriginCenter ? 0 : stock.x / 2,
y: process.outputOriginCenter ? 0 : stock.y / 2,
z: process.camOriginTop ? -stock.z : 0
}
tool = null; tool = null;
last = null; last = null;
animating = false; animating = false;
@ -387,22 +381,17 @@ kiri.load(() => {
startTime = 0; startTime = 0;
updates = 0; updates = 0;
center = Object.assign({}, stock.center);
center.z -= stock.z / 2;
stockSlices = []; stockSlices = [];
const { x, y, z } = stock; const { x, y, z } = stock;
const sliceCount = 10; const sliceCount = 10;
const sliceWidth = stock.x / sliceCount; const sliceWidth = stock.x / sliceCount;
for (let i=0; i<sliceCount; i++) { for (let i=0; i<sliceCount; i++) {
let xmin = -(x/2) + (i * sliceWidth) + sliceWidth/2; let xmin = -(x/2) + (i * sliceWidth) + sliceWidth / 2;
// let xmax = xmin + sliceWidth; let slice = new Stock(sliceWidth, y, z).translate(xmin, 0, z / 2);
let slice = new Stock(sliceWidth, y, z).translate(xmin, 0, z/2);
slice.dim = { xmin: xmin - sliceWidth / 2, xmax: xmin + sliceWidth / 2 }; slice.dim = { xmin: xmin - sliceWidth / 2, xmax: xmin + sliceWidth / 2 };
stockSlices.push(slice); stockSlices.push(slice);
slice.updateMesh([]); slice.updateMesh([]);
slice.send(send); slice.send(send);
send.data({ mesh_move: { id: slice.id, pos: center } });
} }
send.done(); send.done();
@ -575,9 +564,7 @@ kiri.load(() => {
// move tool mesh animation space, update client // move tool mesh animation space, update client
function toolMove(pos) { function toolMove(pos) {
const lpos = tool.pos || { x:0, y:0, z:0 }; toolUpdateMsg = { mesh_move: { id: toolID, pos: { x: pos.x, y: pos.y, z: pos.z } } };
tool.pos = pos;
toolUpdateMsg = { mesh_move: { id: toolID, pos }};
if (toolMesh.mesh) { if (toolMesh.mesh) {
toolMesh.mesh.delete(); toolMesh.mesh.delete();
} }