From 7998e174d0200f39071dda5834e625f7636e9406 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Mar 2020 18:55:02 +0100 Subject: [PATCH] quacks-ingredients: -counts: extras with Zero spots Signed-off-by: Ian Jackson --- quacks-ingredients-counts | 4 +- quacks-ingredients-counts.scad | 77 +++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts index fefbc72..5377cbc 100755 --- a/quacks-ingredients-counts +++ b/quacks-ingredients-counts @@ -11,7 +11,7 @@ sub xdata ($) { my ($cb) = @_; return unless $which eq 'Base'; foreach my $count (qw(1 2 3)) { - foreach my $nspots (qw(1 2 3 4)) { + foreach my $nspots (qw(0 1 2 3 4)) { $_ = $cb->($count,$nspots)."\t".$_; } } @@ -20,7 +20,7 @@ sub xdata ($) { $_=; chomp or die; xdata sub { my ($xcount,$xnspots) = @_; - "${xcount}x". (qw(X One Two Three Four)[$xnspots]); + "${xcount}x". (qw(Zero One Two Three Four)[$xnspots]); }; our @names = split /\t/, $_; diff --git a/quacks-ingredients-counts.scad b/quacks-ingredients-counts.scad index e7699be..c2a8d08 100644 --- a/quacks-ingredients-counts.scad +++ b/quacks-ingredients-counts.scad @@ -97,6 +97,30 @@ module Base_1xTwo(){ ////toplevel $nspots = 4; }; } +module Base_1xZero(){ ////toplevel +// Base 1xZero total= 1 rowsz=1 nrows=1 + union(){ + Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]); + $nspots = 0; + translate(token_pitch * [ 0.0, 0.0 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]); + $nspots = 1; + }; + union(){ + Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]); + $nspots = 2; + }; + union(){ + Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]); + $nspots = 3; + }; + union(){ + Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]); + $nspots = 4; + }; +} module Base_2xFour(){ ////toplevel // Base 2xFour total= 2 rowsz=2 nrows=1 union(){ @@ -197,6 +221,31 @@ module Base_2xTwo(){ ////toplevel $nspots = 4; }; } +module Base_2xZero(){ ////toplevel +// Base 2xZero total= 2 rowsz=2 nrows=1 + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]); + $nspots = 0; + translate(token_pitch * [ -0.5, 0.0 ]) Token_L(); + translate(token_pitch * [ 0.5, 0.0 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]); + $nspots = 1; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]); + $nspots = 2; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]); + $nspots = 3; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]); + $nspots = 4; + }; +} module Base_3xFour(){ ////toplevel // Base 3xFour total= 3 rowsz=2 nrows=2 union(){ @@ -301,6 +350,32 @@ module Base_3xTwo(){ ////toplevel $nspots = 4; }; } +module Base_3xZero(){ ////toplevel +// Base 3xZero total= 3 rowsz=2 nrows=2 + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 0; + translate(token_pitch * [ -0.5, -0.5 ]) Token_L(); + translate(token_pitch * [ -0.5, 0.5 ]) Token_L(); + translate(token_pitch * [ 0.5, -0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 1; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 2; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 3; + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 4; + }; +} module Base_Black(){ ////toplevel // Base Black total=18 rowsz=5 nrows=4 union(){ @@ -730,7 +805,7 @@ module Base_Yellow(){ ////toplevel translate(token_pitch * [ 2.5, 1.0 ]) Token_L(); }; } -// Base total_count=246 total_real_count=219 +// Base total_count=252 total_real_count=219 // Base max_rowsz=7 max_nrows=6 module All_Black(){ ////toplevel // All Black total=26 rowsz=6 nrows=5 -- 2.30.2