From: Ian Jackson Date: Fri, 5 Feb 2016 15:57:29 +0000 (+0000) Subject: commitid.scad.pl: fix Commitid_pixelsz (and docs) to be right (nfc in current tree... X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3664073bb550e76c3739314db8cb839d8eba79c5;p=reprap-play.git commitid.scad.pl: fix Commitid_pixelsz (and docs) to be right (nfc in current tree apart from debug output in commitid-cube-test --- diff --git a/commitid.scad.pl b/commitid.scad.pl index e7aee60..e4da3b5 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 ($) {