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 cam rendering and lines in fdm

Browse source
This commit is contained in:
Stewart Allen 2022-10-16 18:10:17 -04:00
commit b075388702
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri-mode/fdm/slice.js
View file

@ -909,7 +909,7 @@ function doRender(slice, isSynth, params, devel) {
slice.tops.forEach(top => { slice.tops.forEach(top => {
if (isThin) output if (isThin) output
.setLayer('part', { line: 0x333333, check: 0x333333 }) .setLayer('part', { line: 0x333333, check: 0x333333 })
.addPolys(top.poly); .addPolys([top.poly]);
output output
.setLayer(isSynth ? "support" : "shells", isSynth ? COLOR.support : COLOR.shell) .setLayer(isSynth ? "support" : "shells", isSynth ? COLOR.support : COLOR.shell)
@ -917,7 +917,7 @@ function doRender(slice, isSynth, params, devel) {
output output
.setLayer("solid fill", isSynth ? COLOR.support : COLOR.fill) .setLayer("solid fill", isSynth ? COLOR.support : COLOR.fill)
.addLines(top.fill_lines || [], vopt({ offset: offset * solidWidth, height })); .addLines(top.fill_lines || [], vopt({ offset: offset * solidWidth, height, z:slice.z }));
if (!(slice.belt && slice.belt.anchor)) output if (!(slice.belt && slice.belt.anchor)) output
.setLayer("sparse fill", COLOR.infill) .setLayer("sparse fill", COLOR.infill)

23
src/kiri/stack.js
View file

@ -88,18 +88,21 @@ class Stack {
renderLayer(layer, group) { renderLayer(layer, group) {
function addPoly(vertices, poly) { function addPoly(vertices, poly) {
// unroll native polys into points
if (poly.id) {
poly = {
open: poly.open,
points: poly.points.map(p => [p.x, p.y, p.z]).flat().toFloat32()
};
}
const points = poly.points, len = points.length; const points = poly.points, len = points.length;
for (let i=1; i<len; i++) { for (let i=3; i<len; i += 3) {
const p1 = points[i-1]; vertices.push(new THREE.Vector3(points[i-3], points[i-2], points[i-1]));
const p2 = points[i]; vertices.push(new THREE.Vector3(points[i+0], points[i+1], points[i+2]));
vertices.push(new THREE.Vector3(p1.x, p1.y, p1.z));
vertices.push(new THREE.Vector3(p2.x, p2.y, p2.z));
} }
if (!poly.open) { if (!poly.open) {
const p1 = points[points.length-1]; vertices.push(new THREE.Vector3(points[0], points[1], points[2]));
const p2 = points[0]; vertices.push(new THREE.Vector3(points[len-3], points[len-2], points[len-1]));
vertices.push(new THREE.Vector3(p1.x, p1.y, p1.z));
vertices.push(new THREE.Vector3(p2.x, p2.y, p2.z));
} }
} }
@ -137,7 +140,7 @@ class Stack {
} }
// for now, line segments inherit the last color // for now, line segments inherit the last color
for (let i=0, il=lines.length; i<il; i += 3) { for (let i=0, il=lines.length; i<il; i += 3) {
vert.push(new THREE.Vector3(lines[i], lines[i+1], lines[i+1])); vert.push(new THREE.Vector3(lines[i], lines[i+1], lines[i+2]));
} }
// ensure at least one group using the default color settings // ensure at least one group using the default color settings
if (grp.length === 0) { if (grp.length === 0) {