AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix origin and grid labels

Browse source
This commit is contained in:
Stewart Allen 2021-01-09 23:57:46 -05:00
commit 49f84dd420
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri/main.js
View file

@ -1294,9 +1294,9 @@
settings.origin = {x, y, z};
SPACE.platform.setRulers(ruler, ruler, 1/unitScale(), 'X', isBelt ? 'Z' : 'Y');
if (settings.controller.showOrigin && MODE !== MODES.SLA) {
SPACE.platform.setOrigin(x,y,z);
SPACE.platform.setOrigin(x,y,z,true);
} else {
SPACE.platform.setOrigin();
SPACE.platform.setOrigin(x,y,z,false);
}
}

19
src/moto/space.js
View file

@ -48,7 +48,7 @@
mouseHover,
mouseDrag,
grid = {
origin: undefined,
origin: origin,
unitMinor: 0,
unitMajor: 0,
colorMinor: 0,
@ -477,21 +477,22 @@
requestRefresh();
}
function setOrigin(x, y, z) {
function setOrigin(x, y, z, show) {
if (grid.origin) {
if (x === grid.origin.x && y === grid.origin.y && z === grid.origin.z) {
let or = origin;
let unchanged = x === or.x && y === or.y && z === or.z && show === or.show;
if (!unchanged) {
Space.scene.remove(grid.origin.group);
}
if (unchanged) {
updateDraws();
return;
}
Space.scene.remove(grid.origin.group);
}
if (x === undefined) {
origin = {x:0, y:0, z:0};
grid.origin = null;
updateDraws();
origin = {x, y, z, show};
if (!show) {
return;
}
origin = {x, y, z};
let cmat = new THREE.MeshPhongMaterial({
color: 0xcceeff,
specular: 0xcceeff,