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 first pillar re-orientation in linear chains

Browse source
This commit is contained in:
Stewart Allen 2021-02-21 18:00:28 -05:00
commit d9950bb9f0
1 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/mode/fdm/client.js
View file

@ -111,6 +111,7 @@
lastView = view; lastView = view;
updateVisiblity(); updateVisiblity();
filterSynth(); filterSynth();
func.sdone();
// let ranges = API.conf.get().process.ranges; // let ranges = API.conf.get().process.ranges;
if (isFdmMode) { if (isFdmMode) {
if (lastView === VIEWS.SLICE) { if (lastView === VIEWS.SLICE) {
@ -277,33 +278,21 @@
} }
delbox('supp'); delbox('supp');
if (lastPillar) { if (lastPillar) {
const {widget, box, id} = lastPillar; removeWidgetSupport(lastPillar.widget, lastPillar);
widget.adds.remove(box);
widget.mesh.remove(box);
delete widget.sups[id];
let sa = API.widgets.annotate(widget.id).support;
let ix = 0;
sa.forEach((rec,i) => {
if (rec.id === id) {
ix = i;
}
});
sa.splice(ix,1);
API.conf.save();
fromPillar = undefined;
return; return;
} }
if (!iw) return; if (!iw) return;
let { point, dim } = lastBox; let { point, dim } = lastBox;
p1.y = Math.max(0, p1.y); p1.y = Math.max(0, p1.y);
p2.y = Math.max(0, p2.y); p2.y = Math.max(0, p2.y);
let rz = dim.rz;
let dh = dim.z; let dh = dim.z;
let dw = api.conf.get().process.sliceSupportSize / 2; let dw = api.conf.get().process.sliceSupportSize / 2;
let ip = iw.track.pos; let ip = iw.track.pos;
let wa = api.widgets.annotate(iw.id); let wa = api.widgets.annotate(iw.id);
let ws = (wa.support = wa.support || []); let ws = (wa.support = wa.support || []);
let id = ++nextID; let id = ++nextID;
let rec = {x: point.x - ip.x, y: -point.z - ip.y, z: point.y, dw, dh, id}; let rec = {x: point.x - ip.x, y: -point.z - ip.y, z: point.y, rz, dw, dh, id};
if (fromPillar && event && event.shiftKey) { if (fromPillar && event && event.shiftKey) {
let targets = api.widgets.meshes().append(SPACE.internals().platform); let targets = api.widgets.meshes().append(SPACE.internals().platform);
let from = fromPillar, let from = fromPillar,
@ -318,9 +307,9 @@
let fromrec = ws.filter(r => r.id === from.id)[0]; let fromrec = ws.filter(r => r.id === from.id)[0];
if (fromrec) { if (fromrec) {
from.rz = fromrec.rz = angle; from.rz = fromrec.rz = angle;
let q = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,0,1), angle); removeWidgetSupport(iw, fromPillar);
let m = new THREE.Matrix4().makeRotationFromQuaternion(q); ws.push(Object.clone(fromrec));
from.box.geometry.applyMatrix4(m); addWidgetSupport(iw, fromrec);
} }
lerp.pop(); lerp.pop();
let seed = Math.random(); let seed = Math.random();
@ -389,6 +378,7 @@
p1 = point; p1 = point;
let dir = new THREE.Vector3(0,1,0) let dir = new THREE.Vector3(0,1,0)
let ray = new THREE.Raycaster(point, dir); let ray = new THREE.Raycaster(point, dir);
let rz = int && int.face ? Math.atan2(int.face.normal.y, int.face.normal.x) : 0;
// when on object, project down on downward faces // when on object, project down on downward faces
if (int && int.face && int.face.normal.z < -0.1) { if (int && int.face && int.face.normal.z < -0.1) {
dir.y = -1; dir.y = -1;
@ -404,7 +394,7 @@
let dy = Math.abs(p1.y - p2.y); let dy = Math.abs(p1.y - p2.y);
let dw = api.conf.get().process.sliceSupportSize / 2; let dw = api.conf.get().process.sliceSupportSize / 2;
addbox({x:p1.x, y:hy, z:p1.z}, 0x0000dd, 'supp', { addbox({x:p1.x, y:hy, z:p1.z}, 0x0000dd, 'supp', {
x:dw, y:dw, z:dy x:dw, y:dw, z:dy, rz
}); });
} }
if (event && event.altKey) { if (event && event.altKey) {
@ -449,6 +439,23 @@
return sups[id]; return sups[id];
} }
function removeWidgetSupport(widget, rec) {
const {box, id} = rec;
widget.adds.remove(box);
widget.mesh.remove(box);
delete widget.sups[id];
let sa = API.widgets.annotate(widget.id).support;
let ix = 0;
sa.forEach((rec,i) => {
if (rec.id === id) {
ix = i;
}
});
sa.splice(ix,1);
API.conf.save();
fromPillar = undefined;
}
function updateVisiblity() { function updateVisiblity() {
API.widgets.all().forEach(w => { API.widgets.all().forEach(w => {
setSupportVisiblity(w, lastMode === 'FDM' && lastView === VIEWS.ARRANGE); setSupportVisiblity(w, lastMode === 'FDM' && lastView === VIEWS.ARRANGE);