X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=commitid.scad.pl;h=ae1ebb42b531626ba76a8930dd0272312ac05f1e;hb=f64a67465347be98626be64b92207aba039e7b32;hp=489d5c22c4ab868e0dffea2969a74fe7df3ab21b;hpb=c6b479b1e9b94ef8d8d92def8f1cf8508e4519e5;p=reprap-play.git

diff --git a/commitid.scad.pl b/commitid.scad.pl
index 489d5c2..ae1ebb4 100755
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -25,7 +25,7 @@ $SIG{__WARN__} = sub { die @_; };
 #            generate a form FORM containing TEXT
 #            TEXT can contain newlines (final newline usually undesirable)
 #            if FORM not specified, generates Arg0 Arg1 Arg2 in sequence
-#            character set is SPC 0-9 a-f + * (`*' glyph is `=/=').
+#            character set is SPC 0-9 a-f + *
 #
 # We generate a physical indication of which commit was used.
 #
@@ -148,9 +148,9 @@ sub gentextmodule ($@) {
 	$y--;
 	my $x = 0;
 	foreach my $chr (split //, $line) {
-	    next if $chr !~ m/\S/;
 	    p sprintf "  translate([%d * 0.8, %d * 1.2]) %s();\n",
-		$x, $y, chrmodname $chr;
+		$x, $y, chrmodname $chr
+		if $chr =~ m/\S/;
 	    $x++;
 	}
 	$cols = $x if $x > $cols;
@@ -165,9 +165,15 @@ sub gentextmodule ($@) {
     p sprintf "function %s_sz() = Commitid__scale() * 0.1 * [ %d, %d ];\n",
 	$modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1);
 
-    push @gtm_demo_o,
-	" translate([$gtm_demo_i * st[0], $gtm_demo_j * st[1]])".
-	" ${modb}_2D();\n";
+    push @gtm_demo_o, <<END;
+ translate([$gtm_demo_i * st[0], $gtm_demo_j * st[1]]) {
+  difference(){
+   color("blue") translate([-e,-e]) square(${modb}_sz() + 2*[e,e]);
+   square(${modb}_sz());
+  }
+  ${modb}_2D();
+}
+END
     $gtm_demo_j++;
 }
 
@@ -376,6 +382,7 @@ do_git();
 
 p "module Commitid_2DDemo(){\n";
 p " st = Commitid__scale() * [ 10, 5 ];\n";
+p " e  = Commitid_pixelsz();\n";
 p $_ foreach @gtm_demo_o;
 p "}\n";
 
@@ -410,8 +417,8 @@ a b c d e f
 
 + *
 
-      r
- #  ###
-###  #
- #  ###
-    L 
+    # #
+ #  \#/
+### ###
+ #  /#\
+    # #