correct origin options in A indexed mode
This commit is contained in:
parent
f081f32749
commit
7c99a9a7ac
1 changed files with 16 additions and 3 deletions
|
|
@ -21,6 +21,8 @@ const { space } = moto;
|
|||
const { util } = base;
|
||||
const { COLOR, MODES } = consts;
|
||||
|
||||
const V0 = new THREE.Vector3(0,0,0);
|
||||
|
||||
let grouping = false;
|
||||
let topZ = 0;
|
||||
|
||||
|
|
@ -32,16 +34,19 @@ function get_mode() {
|
|||
return api.mode.get_id();
|
||||
}
|
||||
|
||||
function platformUpdateOrigin() {
|
||||
platform.update_bounds();
|
||||
function platformUpdateOrigin(update_bounds = true) {
|
||||
if (update_bounds) {
|
||||
platform.update_bounds();
|
||||
}
|
||||
|
||||
const settings = current();
|
||||
const { device, process, controller, stock, bounds } = settings;
|
||||
const MODE = get_mode();
|
||||
|
||||
let ruler = controller.showRulers;
|
||||
let stockCenter = stock.center || {};
|
||||
let stockCenter = stock.center || { x: 0, y: 0, z: 0 };
|
||||
let hasStock = stock.x && stock.y && stock.z;
|
||||
let isIndexed = process.camStockIndexed && process.camStockOn;
|
||||
let isBelt = device.bedBelt;
|
||||
let origin = settings.origin = { x: 0, y: 0, z: 0 };
|
||||
let center = MODE === MODES.FDM ? device.originCenter || device.bedRound :
|
||||
|
|
@ -74,6 +79,10 @@ function platformUpdateOrigin() {
|
|||
origin.y = device.bedDepth / 2;
|
||||
}
|
||||
|
||||
if (isIndexed) {
|
||||
origin.y = 0;
|
||||
}
|
||||
|
||||
space.platform.setRulers(ruler, ruler, 1 / api.view.unit_scale(), 'X', isBelt ? 'Z' : 'Y');
|
||||
|
||||
let { x, y, z } = origin;
|
||||
|
|
@ -195,10 +204,14 @@ function platformUpdateBounds() {
|
|||
wb.max.y += wp.y;
|
||||
bounds.union(wb);
|
||||
});
|
||||
if (bounds.isEmpty()) {
|
||||
bounds.set(V0, V0);
|
||||
}
|
||||
current().bounds = bounds;
|
||||
platformUpdateStock();
|
||||
platformUpdateTopZ();
|
||||
platformUpdateMidZ();
|
||||
platformUpdateOrigin(false);
|
||||
return bounds;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue