X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=commitid.scad.pl;h=863e04df260bf780ced52115f9b350d764c4a0df;hb=ac3a8531acd97d6c0f6a71059a6f304e986d68ca;hp=e7aee601745ce94cfde957a4b9a11ab2d9909cbb;hpb=1196805d0dafd3aae7759e89ee147404d5ad5d32;p=reprap-play.git

diff --git a/commitid.scad.pl b/commitid.scad.pl
index e7aee60..863e04d 100755
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -8,15 +8,16 @@ $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() { ... }
 #    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
@@ -69,13 +70,13 @@ 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 ($) {
@@ -88,6 +89,7 @@ sub gentextmodule ($@) {
     my ($form, @lines) = @_;
     my $modb = "Commitid_$form";
     p "module ${modb}_2D(){\n";
+    p " // |$_|\n" foreach @lines;
     p " scale(Commitid__scale()){\n";
     my $y = @lines;
     my $cols = 1;
@@ -109,7 +111,7 @@ sub gentextmodule ($@) {
     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 * (@lines * 6 - 1), 2 * ($cols * 4 - 1);
+	$modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1);
 }
 
 our @demo;
@@ -188,6 +190,9 @@ parsefont();
 
 gentextmodule('FontDemo', @demo);
 
+flush STDOUT or die $!;
+close STDOUT or die $!;
+
 __DATA__
 
 # 00 20 22 02
@@ -214,3 +219,10 @@ a b c d e f
 # # # # #   # # #/  #
 \## ##/ \## \## \#/ #
 
++ *
+
+      r
+ #  ###
+###  #
+ #  ###
+    L