commitid.scad.pl: refactor gentextmodule_plusq as prep for T (three line)

[reprap-play.git] / commitid.scad.pl

diff --git a/commitid.scad.pl b/commitid.scad.pl
index 489d5c22c4ab868e0dffea2969a74fe7df3ab21b..dc589fe3eb8cd334d8d896c363232973c64a58e2 100755 (executable)
--- 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++;
 }
 
@@ -263,13 +269,21 @@ sub ljustt ($$$) { # always includes $suffix
     return sprintf "%-${sz}.${sz}s%s", $whole, $suffix;
 }
 
+sub gentextmodule_q ($$$) {
+    my ($form, $s, $lines) = @_;
+    $gtm_demo_j++;
+    my $l = length $s;
+    return if $l % $lines;
+    my $e = $l/$lines;
+    return if $e < 2;
+    $gtm_demo_j--;
+    gentextmodule($form, $s =~ m/.{$e}/g);
+}
+
 sub gentextmodule_plusq ($$) {
     my ($form, $s) = @_;
-    my $l = length $s;
     gentextmodule($form, $s);
-    if (!($l & 1) && $l>=4) {
-       gentextmodule("${form}S", substr($s,0,$l/2), substr($s,$l/2));
-    }
+    gentextmodule_q("${form}S", $s, 2);
 }
 
 our @gcmd;
@@ -326,18 +340,14 @@ sub do_git () {
     }
 
     foreach my $sz (3..10) {
-       gentextmodule_demo_start_batch($sz-3, 0);
+       gentextmodule_demo_start_batch($sz-3);
 
        gentextmodule_plusq("Small$sz", rjustt($sz, $git_count.$git_dirty))
            if defined $git_count;
 
-       gentextmodule_demo_start_batch($sz-3, 2);
-
        gentextmodule_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty))
            if defined $git_object;
 
-       gentextmodule_demo_start_batch($sz-3, 4);
-
        gentextmodule("Full$sz",
                      rjustt($sz, $git_count.$git_dirty),
                      ljustt($sz, $git_object, ''))
@@ -376,6 +386,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 +421,8 @@ a b c d e f
 
 + *
 
-      r
- #  ###
-###  #
- #  ###
-    L 
+    # #
+ #  \#/
+### ###
+ #  /#\
+    # #