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

denote X and Y axes with red / blue colors

Browse source
This commit is contained in:
Stewart Allen 2022-01-01 18:47:01 -05:00
commit 1093a05f2d
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/mesh.js
View file

@ -35,7 +35,7 @@ function init() {
color: 0xcccccc, color: 0xcccccc,
zoom: { reverse: true, speed: 1 }, zoom: { reverse: true, speed: 1 },
size: { width: 300, depth: 300, height: 2.5, maxz: 2.5 }, size: { width: 300, depth: 300, height: 2.5, maxz: 2.5 },
grid: { major: 25, minor: 5, majorColor: 0x999999, minorColor: 0xcccccc } grid: { major: 25, minor: 5, majorColor: 0x999999, minorColor: 0xcccccc },
}); });
space.view.setZoom(zoomrev, zoomspd); space.view.setZoom(zoomrev, zoomspd);
space.useDefaultKeys(false); space.useDefaultKeys(false);
@ -146,14 +146,14 @@ broker.subscribe('space_init', data => {
break; break;
case 'ArrowLeft': case 'ArrowLeft':
if (shiftKey) { if (shiftKey) {
api.selection.rotate(0,rv,0).floor(); api.selection.rotate(0,-rv,0).floor();
} else { } else {
api.selection.rotate(0,0,rv).floor(); api.selection.rotate(0,0,rv).floor();
} }
break; break;
case 'ArrowRight': case 'ArrowRight':
if (shiftKey) { if (shiftKey) {
api.selection.rotate(0,-rv,0).floor(); api.selection.rotate(0,rv,0).floor();
} else { } else {
api.selection.rotate(0,0,-rv).floor(); api.selection.rotate(0,0,-rv).floor();
} }

2
src/mesh/object.js
View file

@ -120,7 +120,7 @@ mesh.object = class MeshObject {
new THREE.Vector3(center.x, center.y, center.z), new THREE.Vector3(center.x, center.y, center.z),
new THREE.Vector3(size.x, size.y, size.z) new THREE.Vector3(size.x, size.y, size.z)
); );
let helper = this._boundsBox = new THREE.Box3Helper(b3, 0x1155aa); let helper = this._boundsBox = new THREE.Box3Helper(b3, 0x555555);
world.add(helper); world.add(helper);
} }
} }

22
src/moto/space.js
View file

@ -470,22 +470,22 @@
ruler.xo = xh - xo; ruler.xo = xh - xo;
ruler.yo = yh - yo; ruler.yo = yh - yo;
for (let x=0; x>x1; x -= unitMinor) { for (let x=-unitMinor; x>x1; x -= unitMinor) {
let oh = isRound ? Math.sqrt(1-(x/xh)*(x/xh)) * yh : yh; let oh = isRound ? Math.sqrt(1-(x/xh)*(x/xh)) * yh : yh;
let arr = modMatch(x, unitMajor) ? majors : minors; let arr = modMatch(x, unitMajor) ? majors : minors;
arr.append({x:x-xo, y:-oh, z:zp}).append({x:x-xo, y:oh, z:zp}); arr.append({x:x-xo, y:-oh, z:zp}).append({x:x-xo, y:oh, z:zp});
} }
for (let x=0; x<x2; x += unitMinor) { for (let x=unitMinor; x<x2; x += unitMinor) {
let oh = isRound ? Math.sqrt(1-(x/xh)*(x/xh)) * yh : yh; let oh = isRound ? Math.sqrt(1-(x/xh)*(x/xh)) * yh : yh;
let arr = modMatch(x, unitMajor) ? majors : minors; let arr = modMatch(x, unitMajor) ? majors : minors;
arr.append({x:x-xo, y:-oh, z:zp}).append({x:x-xo, y:oh, z:zp}); arr.append({x:x-xo, y:-oh, z:zp}).append({x:x-xo, y:oh, z:zp});
} }
for (let y=0; y>y1; y -= unitMinor) { for (let y=-unitMinor; y>y1; y -= unitMinor) {
let ow = isRound ? Math.sqrt(1-(y/yh)*(y/yh)) * xh : xh; let ow = isRound ? Math.sqrt(1-(y/yh)*(y/yh)) * xh : xh;
let arr = modMatch(y, unitMajor) ? majors : minors; let arr = modMatch(y, unitMajor) ? majors : minors;
arr.append({x:-ow, y:y-yo, z:zp}).append({x:ow, y:y-yo, z:zp}); arr.append({x:-ow, y:y-yo, z:zp}).append({x:ow, y:y-yo, z:zp});
} }
for (let y=0; y<y2; y += unitMinor) { for (let y=unitMinor; y<y2; y += unitMinor) {
let ow = isRound ? Math.sqrt(1-(y/yh)*(y/yh)) * xh : xh; let ow = isRound ? Math.sqrt(1-(y/yh)*(y/yh)) * xh : xh;
let arr = modMatch(y, unitMajor) ? majors : minors; let arr = modMatch(y, unitMajor) ? majors : minors;
arr.append({x:-ow, y:y-yo, z:zp}).append({x:ow, y:y-yo, z:zp}); arr.append({x:-ow, y:y-yo, z:zp}).append({x:ow, y:y-yo, z:zp});
@ -493,6 +493,14 @@
view.add(makeLinesFromPoints(majors, colorMajor || 0x999999, 1)); view.add(makeLinesFromPoints(majors, colorMajor || 0x999999, 1));
view.add(makeLinesFromPoints(minors, colorMinor || 0xcccccc, 1)); view.add(makeLinesFromPoints(minors, colorMinor || 0xcccccc, 1));
view.add(makeLinesFromPoints([
{x: -xo, y:y1-yo, z:zp},
{x: -xo, y:y2-yo, z:zp},
], 0x000099, 1));
view.add(makeLinesFromPoints([
{x: x1-xo, y:-yo, z:zp},
{x: x2-xo, y:-yo, z:zp},
], 0x990000, 1));
Space.scene.remove(oldView); Space.scene.remove(oldView);
Space.scene.add(grid.view); Space.scene.add(grid.view);
@ -888,7 +896,7 @@
} }
function setPlatform(opt = {}) { function setPlatform(opt = {}) {
let { color, round, size, grid, opacity, volume, zOffset } = opt; let { color, round, size, grid, opacity, volume, zOffset, origin } = opt;
if (color) { if (color) {
Space.platform.setColor(color); Space.platform.setColor(color);
} }
@ -903,6 +911,10 @@
let { major = 25, minor = 5, majorColor = 0x999999, minorColor = 0xcccccc } = grid; let { major = 25, minor = 5, majorColor = 0x999999, minorColor = 0xcccccc } = grid;
Space.platform.setGrid(major, minor, majorColor, minorColor); Space.platform.setGrid(major, minor, majorColor, minorColor);
} }
if (origin) {
let { x, y, z, show } = origin;
Space.platform.setOrigin(x || 0, y || 0, z || 0, show);
}
if (opacity !== undefined) { if (opacity !== undefined) {
Space.platform.opacity(opacity); Space.platform.opacity(opacity);
} }