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

add sketch selection and focus + normal

Browse source
This commit is contained in:
Stewart Allen 2024-07-24 13:28:15 -04:00
commit a594999292
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/mesh.js
View file

@ -331,13 +331,14 @@ function space_init(data) {
space.mouse.upSelect((int, event) => { space.mouse.upSelect((int, event) => {
if (event && event.target.nodeName === "CANVAS") { if (event && event.target.nodeName === "CANVAS") {
const model = int && int.object.model ? int.object.model : undefined; const model = int?.object?.model;
const sketch = int?.object?.sketch;
const { altKey, ctrlKey, metaKey, shiftKey } = event;
if (mesh.split.active()) { if (mesh.split.active()) {
return mesh.split.select(model); return mesh.split.select(model);
} }
if (model) { if (model) {
const group = model.group; const group = model.group;
const { altKey, ctrlKey, metaKey, shiftKey } = event;
if (metaKey) { if (metaKey) {
// set focus on intersected face // set focus on intersected face
const { x, y, z } = int.point; const { x, y, z } = int.point;
@ -374,6 +375,17 @@ function space_init(data) {
break; break;
} }
} }
} else if (sketch) {
if (metaKey) {
// set focus on intersected face
const { x, y, z } = int.point;
// rotate normal using group's matrix
const normal = shiftKey ? int.face.normal : undefined;
// y,z swap due to world rotation for orbit controls
api.focus({center: { x, y:-z, z:y }, normal});
} else {
selection.toggle(sketch);
}
} }
} else { } else {
return api.objects().filter(o => o.visible); return api.objects().filter(o => o.visible);
@ -509,7 +521,7 @@ function object_destroy(id) {
// listen for changes like dark mode toggle // listen for changes like dark mode toggle
function set_darkmode(dark) { function set_darkmode(dark) {
let { prefs, selection, model } = mesh.api; let { prefs, model } = mesh.api;
let { sky, platform } = moto.space; let { sky, platform } = moto.space;
prefs.map.space.dark = dark; prefs.map.space.dark = dark;
if (dark) { if (dark) {

5
src/mesh/api.js
View file

@ -1131,7 +1131,10 @@ const api = exports({
objects() { objects() {
// return model objects suitable for finding ray intersections // return model objects suitable for finding ray intersections
return group.list().map(o => o.models).flat().map(o => o.mesh); return [
...group.list().map(o => o.models).flat().map(o => o.mesh),
...sketches.map(s => s.object)
];
}, },
isDebug: self.debug === true isDebug: self.debug === true

1
src/mesh/sketch.js
View file

@ -46,6 +46,7 @@ mesh.sketch = class MeshSketch extends mesh.object {
const outlineMaterial = material.outline; const outlineMaterial = material.outline;
const outline = this.outline = new LineSegments(outlineGeometry, outlineMaterial); const outline = this.outline = new LineSegments(outlineGeometry, outlineMaterial);
plane.add(outline); plane.add(outline);
plane.sketch = this;
const handleGeometry = new SphereGeometry(0.05, 16, 16); const handleGeometry = new SphereGeometry(0.05, 16, 16);
const handleMaterial = material.handle; const handleMaterial = material.handle;