commitid-cube-test: Provide rotated TTWall too

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

diff --git a/commitid.scad.pl b/commitid.scad.pl
index ee9be882723147703c2054fff2e1151a51ea7c44..a2793ea3db8712ba10eb9fe933f5e78a2076298c 100755 (executable)
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -8,15 +8,20 @@ $SIG{__WARN__} = sub { die @_; };
 # We generate a physical indication of which commit was used.
 #
 # We provide for scaling factors with dynamic variables:
-#    $Commitid_pixelsz        if not set, we use 0.4 } multiplied
+#    $Commitid_pixelsz        if not set, we use 0.8 } multiplied
 #    $Commitid_scale          if not set, we use 1.0 }  together
-#    $Commitid_depth          if not set, we use xy pixel size from above
+#    $Commitid_depth          if not set, we use xy pixel size from above / 2
 #    $Commitid_depth_scale    if not set, we use 1.0 (multiplies depth above)
 #
 # For each form we have
 #
-#    module Commitid_Form_2D(.4)
-#    module Commitid_Form()
+#    module Commitid_Form_2D() { ... }
+#    module Commitid_Form() { ... }
+#    function Commitid_Form_sz()     => [ x, y ]
+#
+#  These have their origin in the bottom left corner.  The 3D model
+#  is a positive, has its origin halfway through, and is twice the
+#  depth in height, so it can be added or subtracted.
 #
 # And we provide
 #
@@ -33,6 +38,7 @@ $SIG{__WARN__} = sub { die @_; };
 #   Tiny8:
 #       git rev-list --first-parent --count HEAD
 #       typically 3-4 characters but we allow for up to 6
+#       padded with zeroes; if too long we reduce mod 10^n
 #       eg
 #            Tiny4    1070
 #
@@ -43,10 +49,10 @@ $SIG{__WARN__} = sub { die @_; };
 #            Tiny4Q   10
 #                     70
 #
-#   Git4
-#   Git6
-#   Git8
-#       git-rev-parse HEAD
+#   Git4  Git4Q
+#   Git6  Git6Q
+#   Git8  Git8Q
+#       git-rev-parse HEAD   (prefix of requested length)
 #       eg
 #            Git6    82f2a2
 
@@ -62,14 +68,15 @@ $SIG{__WARN__} = sub { die @_; };
 sub p { print @_ or die $!; }
 
 p <<'END';
+// *** AUTOGENERATED - DO NOT EDIT *** //
 function Commitid_pixelsz() =
-  ($Commitid_pixelsz       ? $Commitid_pixelsz       : 0.4) *
+  ($Commitid_pixelsz       ? $Commitid_pixelsz       : 0.8) *
   ($Commitid_scale         ? $Commitid_scale         : 1.0);
 function Commitid_depth() =
-  ($Commitid_depth         ? $Commitid_depth         : Commitid_pixelsz()) *
+  ($Commitid_depth         ? $Commitid_depth         : Commitid_pixelsz()/2) *
   ($Commitid_depth_scale   ? $Commitid_depth_scale   : 1.0);
 function Commitid__scale() =
-  Commitid_pixelsz() / 0.1;
+  Commitid_pixelsz() / 0.2;
 END
 
 sub chrmodname ($) {
@@ -78,6 +85,36 @@ sub chrmodname ($) {
     return "Commitid__chr_$chrx";
 }
 
+sub gentextmodule ($@) {
+    my ($form, @lines) = @_;
+    my $modb = "Commitid_$form";
+    p "module ${modb}_2D(){\n";
+    p " scale(Commitid__scale()){\n";
+    my $y = @lines;
+    my $cols = 1;
+    foreach my $line (@lines) {
+       $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++;
+       }
+       $cols = $x if $x > $cols;
+    }
+    p " }\n";
+    p "}\n";
+    p "module ${modb}(){\n";
+    p " d=Commitid_depth();\n";
+    p " translate([0,0,-d]) linear_extrude(height=d*2) ${modb}_2D();\n";
+    p "}\n";
+    p sprintf "function %s_sz() = Commitid__scale() * 0.1 * [ %d, %d ];\n",
+       $modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1);
+}
+
+our @demo;
+
 sub parsefont () {
     my %cellmap;
     for (;;) {
@@ -91,6 +128,7 @@ sub parsefont () {
     my %chrpolys;
     while (<DATA>) {
        next unless m/\S/;
+       chomp;
        my @chrs = split / /, $_;
        <DATA> !~ m/\S/ or die;
        foreach my $row (reverse 0..4) {
@@ -124,7 +162,7 @@ sub parsefont () {
        }    
     }
 
-    my @demo;
+    my $demo = '';
     my $democols = 6;
     foreach my $chr (sort keys %chrpolys) {
        my $mod = chrmodname $chr;
@@ -142,22 +180,14 @@ sub parsefont () {
            p "]);\n";
        }
        p "}\n";
-       my $px = @demo % $democols;
-       my $py = int(@demo / $democols);
-       push @demo, " scale( Commitid__scale() ) translate([$px * 0.800, $py * 1.200]) 
- $mod ();\n";
+       $demo .= $chr;
     }
-    p "module Commitid_FontDemo(){\n";
-    p $_ foreach @demo;
-    p "}\n";
-
-#    use Data::Dumper;
-#    print Dumper(\%chrpolys);
+    @demo = reverse $demo =~ m{.{1,$democols}}go;
 }
 
 parsefont();
 
-#p "Commitid_FontDemo();\n";
+gentextmodule('FontDemo', @demo);
 
 __DATA__