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

stub in cubic infill

Browse source
This commit is contained in:
Stewart Allen 2021-06-08 14:02:02 -04:00
commit 14ab980371
3 changed files with 55 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/geo/base.js
View file

@ -319,11 +319,9 @@
/**
* Find Z of XY pair given plane defined by 3 points
*/
function zInPlane(p1, p2, p3, x, y)
{
function zInPlane(p1, p2, p3, x, y) {
let vec1 = new THREE.Vector3(p2.x - p1.x, p2.y - p1.y, p2.z - p1.z);
let vec2 = new THREE.Vector3(p3.x - p1.x, p3.y - p1.y, p3.z - p1.z);
vec1.cross(vec2);
if (vec1.z !== 0) {

8
src/kiri/main.js
View file

@ -146,13 +146,13 @@
{ name: "origin" },
],
infill: [
{ name: "vase" },
{ name: "hex" },
{ name: "grid" },
{ name: "gyroid" },
{ name: "triangle" },
// { name: "cubic" },
{ name: "linear" },
{ name: "bubbles" }
{ name: "triangle" },
{ name: "gyroid" },
{ name: "vase" }
],
units: [
{ name: "mm" },

109
src/mode/fdm/fill.js
View file

@ -17,7 +17,7 @@
gyroid: fillGyroid,
triangle: fillTriangle,
linear: fillLinear,
bubbles: fillBubbles
cubic: fillCubic
},
CACHE = self.kiri.fill_fixed = {
hex: fillHexFull,
@ -152,30 +152,59 @@
}
}
function fillLinear(target) {
function fillCubic(target) {
let bounds = target.bounds();
let height = target.zHeight();
let repeat = target.repeat();
let density = target.density();
let line = target.lineWidth();
let span_x = bounds.max.x - bounds.min.x;
let span_y = bounds.max.y - bounds.min.y;
let steps_x = (span_x / line) * density;
let steps_y = (span_y / line) * density;
let step_x = span_x / steps_x;
let step_y = span_x / steps_x;
let zindex = Math.floor(target.zIndex() / repeat);
if (zindex % 2 === 1) {
for (let tx=bounds.min.x; tx<=bounds.max.x; tx += step_x) {
let span = Math.max(
bounds.max.x - bounds.min.x,
bounds.max.y - bounds.min.y
);
let steps = Math.floor((span / target.lineWidth()) * target.density());
let step = span / steps;
let ztype = Math.floor(target.zIndex() / target.repeat()) % 3;
if (ztype === 1) {
for (let tx=bounds.min.x; tx<=bounds.max.x; tx += step) {
target.newline();
target.emit(tx, bounds.min.y);
target.emit(tx, bounds.max.y);
}
} else if (ztype === 0) {
for (let ty=bounds.min.y; ty<=bounds.max.y; ty += step) {
target.newline();
target.emit(bounds.min.x, ty);
target.emit(bounds.max.x, ty);
}
} else {
for (let ty=bounds.min.y; ty<=bounds.max.y; ty += step_y) {
step *- Math.sqrt(2);
for (let tx=bounds.min.x; tx<=bounds.max.x; tx += step) {
target.newline();
target.emit(tx, bounds.min.y);
target.emit(tx + 1000, bounds.max.y + 1000);
}
for (let ty=bounds.min.y; ty<=bounds.max.y; ty += step) {
target.newline();
target.emit(bounds.min.x, ty);
target.emit(bounds.min.x + 1000, ty + 1000);
}
}
}
function fillLinear(target) {
let bounds = target.bounds();
let span = Math.max(
bounds.max.x - bounds.min.x,
bounds.max.y - bounds.min.y
);
let steps = Math.floor((span / target.lineWidth()) * target.density());
let step = span / steps;
let ztype = Math.floor(target.zIndex() / target.repeat()) % 2;
if (ztype === 1) {
for (let tx=bounds.min.x; tx<=bounds.max.x; tx += step) {
target.newline();
target.emit(tx, bounds.min.y);
target.emit(tx, bounds.max.y);
}
} else if (ztype === 0) {
for (let ty=bounds.min.y; ty<=bounds.max.y; ty += step) {
target.newline();
target.emit(bounds.min.x, ty);
target.emit(bounds.max.x, ty);
@ -185,13 +214,11 @@
function fillTriangle(target) {
let bounds = target.bounds();
let height = target.zHeight();
let span_x = bounds.max.x - bounds.min.x;
let span_y = bounds.max.y - bounds.min.y;
let density = target.density();
let offset = target.offset();
let line_w = target.lineWidth() / 2;
let tile = 1 + (1 - density) * 5;
let tile = 1 + (1 - target.density()) * 5;
let tile_x = tile + offset*2 + line_w;
let tile_xc = span_x / tile_x;
let tile_yc = span_y / tile;
@ -220,42 +247,4 @@
}
}
function fillBubbles(api) {
let {min, max} = api.bounds();
let slice = api.slice(); // slice object (for adding solids)
let height = api.zHeight(); // layer height
let offset = api.lineWidth() / 2; // offset size by nozzle width
let size = 3 / api.density(); // circle diameter from density
let rad = size / 2 - offset; // max circle radius
let minr = offset + (2 - api.density() * 2) * offset;
let zrep = size / height; // # layers to repeat pattern
let zpad = zrep * 0.3; // # pad layers between pattern
let bind = api.zIndex() % (zrep + zpad); // index into pattern
let brad = bind < zrep ? Math.max(minr,(rad * Math.sin(((bind + 1) / zrep) * Math.PI))) : minr;
let sind = (api.zIndex() + (zrep + zpad)/2) % (zrep + zpad); // index into pattern
let srad = sind < zrep ? Math.max(minr,(rad * Math.sin(((sind + 1) / (zrep + 0)) * Math.PI))) : minr;
for (let x=min.x-size; x<max.x+size; x += size) {
let eoy = 0;
for (let y=min.y-size; y<max.y+size; y += size) {
let xo = (eoy++ % 2 === 0) ? (size / 2) : 0;
// primary pattern
self.base
.newPolygon()
.centerCircle({x:x+xo, y:y*0.85}, brad, 20, true)
.forEachPoint(p => {
api.emit(p.x, p.y);
}, true);
api.newline();
// alternate pattern
self.base
.newPolygon()
.centerCircle({x:x+xo, y:y*0.85+(size/1.75)}, srad, 20, true)
.forEachPoint(p => {
api.emit(p.x, p.y);
}, true);
api.newline();
}
}
};
})();