diff options
| author | Elena of Valhalla'' Grandi <valhalla@trueelena.org> | 2014-03-10 20:15:29 +0100 |
|---|---|---|
| committer | Elena of Valhalla'' Grandi <valhalla@trueelena.org> | 2014-03-10 20:15:29 +0100 |
| commit | 31f86c7adbdca88b34986361782bf329903bfa29 (patch) | |
| tree | 96f0ac24bb2331c01d7023f758deed83e47b4ff4 | |
| parent | a7637c582c127ab43f489a3cdaa499aa685099e2 (diff) | |
Fixed suite die and gcode generation
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | src/piecepack.scad | 5 |
2 files changed, 11 insertions, 5 deletions
@@ -35,14 +35,14 @@ coins: dice: mkdir -p ${DESTDIR} for SUITE in ${SUITES}; do \ - for S in 12 16; do \ + for S in 12 15; do \ openscad -o ${DESTDIR}/die-$$SUITE-$$S.stl \ -D suite=\"$$SUITE\" -D s=$$S src/die.scad; \ done \ done - for S in 12 16; do \ + for S in 12 15; do \ openscad -o ${DESTDIR}/suite_die-$$S.stl \ - -D suite='["'`echo ${SUITES} | sed 's/ /","/g'`'"]' \ + -D suites='["'`echo ${SUITES} | sed 's/ /","/g'`'"]' \ -D s=$$S src/suite_die.scad; \ done @@ -74,7 +74,7 @@ pyramids: done \ done -gcode: tiles coins dice saucers pyramids +gcode: tiles coins dice pawns saucers pyramids for T in ${DESTDIR}/tile*.stl; do \ ${SLIC3R} --load ${CONFDIR}/tiles.ini $$T; \ done @@ -84,6 +84,9 @@ gcode: tiles coins dice saucers pyramids for T in ${DESTDIR}/die*.stl ${DESTDIR}/suite_die*.stl; do \ ${SLIC3R} --load ${CONFDIR}/dice.ini $$T; \ done + for T in ${DESTDIR}/pawn*.stl ${DESTDIR}/pawn*.stl; do \ + ${SLIC3R} --load ${CONFDIR}/pawns.ini $$T; \ + done for T in ${DESTDIR}/pyramid*.stl; do \ ${SLIC3R} --load ${CONFDIR}/pyramids.ini $$T; \ done diff --git a/src/piecepack.scad b/src/piecepack.scad index 33406a3..9c830ae 100644 --- a/src/piecepack.scad +++ b/src/piecepack.scad @@ -60,7 +60,10 @@ module die(suite,s) { module suite_die(suites,s) { difference() { - cube(s); + intersection() { + cube(s); + translate([s/2,s/2,s/2]) sphere(r=s*0.79); + } translate([1,0,0]) rotate([0,-90,0]) linear_extrude(height=1.5) scale(s*0.02) import(str("../graphics/",suites[0],".dxf")); |