commitid.scad.pl: Do not process \n as a character

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

diff --git a/commitid.scad.pl b/commitid.scad.pl
index 093a8fbca913d2af46a375a49ea9e0bed506c2d2..dcebd26a5c1cd9bf853294d9ec3a63c1e86db7d6 100755 (executable)
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -7,18 +7,21 @@ $SIG{__WARN__} = sub { die @_; };
 
 # We generate a physical indication of which commit was used.
 #
-# We provide for a scaling factor
-#
-#    $Commitid_pixelsz = 0.4;
-#    $Commitid_depth = 1.5; // in pixels
+# We provide for scaling factors with dynamic variables:
+#    $Commitid_pixelsz        if not set, we use 0.4 } 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_scale    if not set, we use 1.0 (multiplies depth above)
 #
 # For each form we have
 #
-#    module Commitid_Form_2D(pixelsz=0.4)
-#    module Commitid_Form(pixelsz=0.4, depth=pixelsz)
+#    module Commitid_Form_2D(.4)
+#    module Commitid_Form()
+#
+# And we provide
 #
-#    function Commitid_Form_size(pixelsz=$Commitid_pixelsz) => [ xsz, ysz ]
-#         
+#   function Commitid_pixelsz()    // $Commitid_pixelsz * $Commitid_scale
+#   function Commitid_depth()      // see above
 #
 # We can generate these forms:
 #
@@ -58,6 +61,23 @@ $SIG{__WARN__} = sub { die @_; };
 
 sub p { print @_ or die $!; }
 
+p <<'END';
+function Commitid_pixelsz() =
+  ($Commitid_pixelsz       ? $Commitid_pixelsz       : 0.4) *
+  ($Commitid_scale         ? $Commitid_scale         : 1.0);
+function Commitid_depth() =
+  ($Commitid_depth         ? $Commitid_depth         : Commitid_pixelsz()) *
+  ($Commitid_depth_scale   ? $Commitid_depth_scale   : 1.0);
+function Commitid__scale() =
+  Commitid_pixelsz() / 0.1;
+END
+
+sub chrmodname ($) {
+    my ($chr) = @_;
+    my $chrx = sprintf '%#x', ord $chr;
+    return "Commitid__chr_$chrx";
+}
+
 sub parsefont () {
     my %cellmap;
     for (;;) {
@@ -71,6 +91,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) {
@@ -92,8 +113,8 @@ sub parsefont () {
                    } elsif (s{^\S}{}) {
                        my $f = $cellmap{$&};
                        die unless $f;
-                       $f =~ s/\b\d/ sprintf '%05d', $col*4000 + $&*2050 /ge;
-                       $f =~ s/\d\b/ sprintf '%05d', $row*4000 + $&*2050 /ge;
+                       $f =~ s/\b\d/ sprintf '%05d', $col*2000 + $&*1025 /ge;
+                       $f =~ s/\d\b/ sprintf '%05d', $row*2000 + $&*1025 /ge;
                        push @{ $chrpolys{$chr} }, [ split / /, $f ];
                    } else {
                        die "$_ ?";
@@ -107,8 +128,7 @@ sub parsefont () {
     my @demo;
     my $democols = 6;
     foreach my $chr (sort keys %chrpolys) {
-       my $chrx = sprintf '%#x', ord $chr;
-       my $mod = "Commitid__chr_$chrx";
+       my $mod = chrmodname $chr;
        p "module $mod () {\n";
        foreach my $poly (@{ $chrpolys{$chr} }) {
            p " polygon([";
@@ -125,7 +145,8 @@ sub parsefont () {
        p "}\n";
        my $px = @demo % $democols;
        my $py = int(@demo / $democols);
-       push @demo, " translate([$px * 1.600, $py * 2.400]) $mod ();\n";
+       push @demo, " scale( Commitid__scale() ) translate([$px * 0.800, $py * 1.200]) 
+ $mod ();\n";
     }
     p "module Commitid_FontDemo(){\n";
     p $_ foreach @demo;
@@ -160,8 +181,8 @@ R 20 22 02
 a b c d e f
 
     #         #     /##
-/## ##\ /## /## /#\ #
-# # # # #   # # #r/ ###
+    #   /##   # /#\ #
+/## ##\ #   /## #r# ###
 # # # # #   # # #/  #
 \## ##/ \## \## \#/ #