From 2acdcae963bf66d27a457f58343bc6b4fa6a8454 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Jan 2015 21:06:33 +0000 Subject: [PATCH] pandemic-counter: Makefiles etc. --- .gitignore | 2 ++ Makefile | 8 +++++++- pandemic-counter.scad | 15 ++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c5d1498..7a1b620 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ light-bracket.stl *.fig.bak funcs.scad knifeblock-knives-*.dxf* +pandemic-counter-l*.dxf +pandemic-counter-l*.eps diff --git a/Makefile b/Makefile index 1ae233f..2c86844 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ PLAY ?= $(CWD) CONFIG=$(PLAY)/slic3r-config.ini -USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock +USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m)) AUTO_INCS = funcs.scad @@ -72,6 +72,12 @@ knifeblock-knives-t%.dxf: knifeblock-knives-filter knifeblock-knives-trace.fig fig2dev -D -30 -L eps <$@.tmp.fig >$@.tmp.eps pstoedit -dt -f "dxf: -polyaslines -mm" $@.tmp.eps $@ +PANDEMICCOUNTER_LETTERS=30 31 32 33 34 35 +PANDEMICCOUNTER_DXFS=$(foreach l,$(PANDEMICCOUNTER_LETTERS), \ + pandemic-counter-l$l.dxf) + +pandemic-counter-letters pandemic-counter.stl: $(PANDEMICCOUNTER_DXFS) + pandemic-counter-l%.eps: pandemic-counter-letters.fig fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp @mv -f $@.tmp $@ diff --git a/pandemic-counter.scad b/pandemic-counter.scad index 995bc35..81e6de1 100644 --- a/pandemic-counter.scad +++ b/pandemic-counter.scad @@ -96,5 +96,18 @@ module Tokens_TerrMove(){ //// toplevel Tokens(1) Token_TerrMove(); } -Tokens_TerrMove(); +module PosToken(i,j){ + translate([j*spacing, i*spacing, 0]) child(); +} + +module Demo(){ //// toplevel + PosToken(0,0) Token_CDC(); + PosToken(1,0) Token_Lab(); + PosToken(2,0) Token_Act(); + PosToken(0,1) Token_Spec(); + PosToken(1,1) Token_Terr(); + PosToken(2,1) Token_TerrMove(); +} +//Tokens_Act(); +//Demo(); -- 2.30.2