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

many hole selection/toggle bugfixes

Browse source
This commit is contained in:
bakedpotatolord 2025-11-25 18:35:54 -07:00
commit cbca71ed3b
1 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/kiri/mode/cam/cl-hole.js
View file

@ -9,8 +9,7 @@ export let holeSelOn = false;
export let lastSelHoles; export let lastSelHoles;
let holeGeo = new THREE.CylinderGeometry(1,1,1,20); let holeGeo = new THREE.CylinderGeometry(1,1,1,20);
let holeMaterial = new THREE.MeshPhongMaterial( ); let holeMaterial = new THREE.MeshPhongMaterial( );
let holeMesh; let alert;
let activeDrills;
/** /**
* Client side function to select holes in widgets for CAM operations. * Client side function to select holes in widgets for CAM operations.
@ -25,7 +24,7 @@ export async function selectHoles(individual) {
return selectHolesDone(); return selectHolesDone();
} }
clearPops(); clearPops();
let alert = api.show.alert("analyzing parts..."); alert = api.show.alert("analyzing parts...");
holeSelOn = env.hoveredOp; holeSelOn = env.hoveredOp;
holeSelOn.classList.add("editing"); holeSelOn.classList.add("editing");
api.feature.hover = true; api.feature.hover = true;
@ -37,12 +36,12 @@ export async function selectHoles(individual) {
/** /**
* creates a mesh for a hole and adds it to a widget * creates a mesh for a hole and adds it to a widget
* @param {Object3D} widget - widget to add the hole mesh to * @param {Object3D} widget - widget to add the hole mesh to
* @param {Object} drill - {depth,selected} object of the hole * @param {Object} drills - {depth,selected}[] object of the hole
* @returns {Mesh} the created mesh * @returns {Mesh} the created mesh
*/ */
function createHoleMesh(widget,drills){ function createHoleMesh(widget,drills){
if(holeMesh) holeMesh.dispose() if(widget.holeMesh) widget.holeMesh.dispose()
holeMesh = new THREE.InstancedMesh(holeGeo, holeMaterial,drills.length); widget.holeMesh = new THREE.InstancedMesh(holeGeo, holeMaterial,drills.length);
let baseMx = new THREE.Matrix4() let baseMx = new THREE.Matrix4()
for(let [i,drill] of drills.entries()){ for(let [i,drill] of drills.entries()){
@ -53,13 +52,13 @@ export async function selectHoles(individual) {
mx.multiply( new THREE.Matrix4().makeTranslation(drill.x, drill.y, drill.z-depth/2)); mx.multiply( new THREE.Matrix4().makeTranslation(drill.x, drill.y, drill.z-depth/2));
mx.multiply( new THREE.Matrix4().makeRotationX(Math.PI / 2)) mx.multiply( new THREE.Matrix4().makeRotationX(Math.PI / 2))
mx.multiply( new THREE.Matrix4().makeScale(diam /2, depth,diam /2)); mx.multiply( new THREE.Matrix4().makeScale(diam /2, depth,diam /2));
holeMesh.setMatrixAt(i, mx); widget.holeMesh.setMatrixAt(i, mx);
holeMesh.setColorAt(i, new THREE.Color(color)); widget.holeMesh.setColorAt(i, new THREE.Color(color));
drill.widgetID = widget.id drill.widgetID = widget.id
} }
widget.mesh.add(holeMesh); widget.mesh.add(widget.holeMesh);
widget.adds.push(holeMesh); // for click detection widget.adds.push(widget.holeMesh); // for click detection
return holeMesh return widget.holeMesh
} }
let meshesCached = widgets.every(widget => env.poppedRec.drills[widget.id] != undefined) let meshesCached = widgets.every(widget => env.poppedRec.drills[widget.id] != undefined)
if (individual && meshesCached) { if (individual && meshesCached) {
@ -67,7 +66,7 @@ export async function selectHoles(individual) {
api.hide.alert(alert); api.hide.alert(alert);
api.widgets.for(widget => { api.widgets.for(widget => {
if (widget.adds) { if (widget.adds) {
let drills = activeDrills = env.poppedRec.drills[widget.id]; let drills = env.poppedRec.drills[widget.id];
createHoleMesh(widget, drills); createHoleMesh(widget, drills);
} }
}) })
@ -102,15 +101,10 @@ export async function selectHoles(individual) {
api.widgets.for(widget => { api.widgets.for(widget => {
const { holes } = centers.find(center => center.id == widget.id); const { holes } = centers.find(center => center.id == widget.id);
// console.log(holes) // console.log(holes)
if (!holes || !holes.length) unselectHoles(holes);
createHoleMesh(widget, holes); createHoleMesh(widget, holes);
//add hole data to record //add hole data to record
env.poppedRec.drills = env.poppedRec.drills ?? {}; env.poppedRec.drills = env.poppedRec.drills ?? {};
env.poppedRec.drills[widget.id] = activeDrills = holes; env.poppedRec.drills[widget.id] = holes;
//give widget access to an array of drill records that refrence it
//so that it can be cleared when widget is rotated or mirrored etc.
if (!widget.drills) { widget.drills = [] };
widget.drills.push(holes);
}) })
} }
); );
@ -136,20 +130,22 @@ export function selectHolesHover(data) {
export function selectHolesHoverUp(int, ev) { export function selectHolesHoverUp(int, ev) {
if (!int) return; //if not a hole mesh return if (!int) return; //if not a hole mesh return
let { instanceId } = int; let { instanceId, object } = int;
selectHoleToggle(instanceId); selectHoleToggle(instanceId, object);
} }
/** /**
* Toggle the selection of a hole mesh and update its color * Toggle the selection of a hole mesh and update its color
* @param {Object3D} mesh - the hole mesh to toggle * @param {Object3D} mesh - the hole mesh to toggle
*/ */
export function selectHoleToggle(id) { export function selectHoleToggle(id,mesh) {
if (id === undefined) return if (id === undefined) return
if(activeDrills[id].selected !== undefined){ let widget = mesh.parent.widget;
activeDrills[id].selected = !activeDrills[id].selected if(env.poppedRec.drills[widget.id][id].selected !== undefined){
holeMesh.setColorAt(id, new THREE.Color(activeDrills[id].selected ? 0xFF0000 : 0x39e366)); env.poppedRec.drills[widget.id][id].selected = !env.poppedRec.drills[widget.id][id].selected
holeMesh.instanceColor.needsUpdate = true widget.holeMesh.setColorAt(id, new THREE.Color(env.poppedRec.drills[widget.id][id].selected ? 0xFF0000 : 0x39e366));
widget.holeMesh.instanceColor.needsUpdate = true
} }
} }
@ -161,6 +157,7 @@ export function selectHoleToggle(id) {
export function clearHolesRec(widget) { export function clearHolesRec(widget) {
if (widget.adds) { if (widget.adds) {
widget.adds.length = 0 //clear adds array widget.adds.length = 0 //clear adds array
delete env.poppedRec.drills[widget.id]
} }
} }
@ -188,10 +185,3 @@ export function selectHolesDone() {
} }
}); });
} }
export function unselectHoles(widget) {
if (!widget.holes) return
widget.holes.forEach(hole => {
hole.selected = false
})
}