foosinn/ergogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Case bugfixes

Browse source
This commit is contained in:
Bán Dénes 2020-10-08 20:11:36 +02:00
parent fd5cf7634f
commit 23ed8989ce
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -499,7 +499,7 @@ cases:
case_name:
- outline: <outline ref>
extrude: num # default = 1
translate: [x, y, z] # default = [0, 0, 0]
shift: [x, y, z] # default = [0, 0, 0]
rotate: [ax, ay, az] # default = [0, 0, 0]
operation: add | subtract | intersect # default = add
- ...
@ -507,7 +507,7 @@ cases:
```
`outline` specifies which outline to import onto the xy plane, while `extrude` specifies how much it should be extruded along the z axis.
After that, the object is `translate`d, `rotate`d, and combined with what we have so far according to `operation`.
After that, the object is `shift`d, `rotate`d, and combined with what we have so far according to `operation`.
If we only want to use an object as a building block for further objects, we can employ the same "start with an underscore" trick we learned at the outlines section to make it "private".

17
src/cases.js
View file

@ -24,12 +24,11 @@ exports.parse = (config, outlines) => {
const extrude = a.sane(part.extrude || 1, `${part_name}.extrude`, 'number')
const shift = a.numarr(part.shift || [0, 0, 0], `${part_name}.shift`, 3)
const rotate = a.numarr(part.rotate || [0, 0, 0], `${part_name}.rotate`, 3)
const operation = a.in(part.operation || 'add', `${part_name}.operation`, ['add', 'subtract', 'intersect', 'stack'])
const operation = a.in(part.operation || 'add', `${part_name}.operation`, ['add', 'subtract', 'intersect'])
let op = u.union
if (operation == 'subtract') op = u.subtract
else if (operation == 'intersect') op = u.intersect
else if (operation == 'stack') op = u.stack
let op = 'union'
if (operation == 'subtract') op = 'subtract'
else if (operation == 'intersect') op = 'intersect'
const part_fn = `${part.outline}_fn`
const part_var = `${part.outline}_var`
@ -41,17 +40,15 @@ exports.parse = (config, outlines) => {
let op_statement = `let ${case_name} = ${part_var};`
if (part_index > 1) {
op_statement = `${case_name} = ${case_name}.${operation}(${part_var});`
op_statement = `${case_name} = ${case_name}.${op}(${part_var});`
}
main.push(`
// creating part ${part_index} of case ${case_name}
let ${part_var} = ${part_fn}();
${part_var} = ${part_var}.rotateX(${rotate[0]});
${part_var} = ${part_var}.rotateY(${rotate[1]});
${part_var} = ${part_var}.rotateZ(${rotate[2]});
${part_var} = ${part_var}.translate(${shift});
${part_var} = rotate(${JSON.stringify(rotate)}, ${part_var});
${part_var} = translate(${JSON.stringify(shift)}, ${part_var});
${op_statement}
`)