X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=commitid-cube-test.scad;h=0a5f21a5dc1056588a3a1784df63cf577fe68567;hp=a5251a4252e4b178ca6e7e31ceef2a8c5f00b56c;hb=21b6c2f5610d1a91ca5333a1f24cfe0492a4581f;hpb=c715d551a6a484c0857dd4521100563c47caa0e5

diff --git a/commitid-cube-test.scad b/commitid-cube-test.scad
index a5251a4..0a5f21a 100644
--- a/commitid-cube-test.scad
+++ b/commitid-cube-test.scad
@@ -6,16 +6,11 @@ baseh= 1;
 
 sz = 20;
 
-h = 0.4;
-
-d = h;
+fdo = [1, 3, 0];
 
 module FD () {
-  scale([2,2,1]) {
-    translate([0.5,1.5,-d])
-    linear_extrude(height= h + d)
+    translate(fdo)
       Commitid_FontDemo();
-  }
 }
 
 module TC () { ////toplevel
@@ -33,21 +28,47 @@ module TC () { ////toplevel
 w = 3;
 t = 2;
 
-module TT () { ////toplevel
+fdsz = Commitid_FontDemo_sz();
+d = Commitid_depth();
+ru = Commitid_pixelsz();
+
+module TTWall () {
   difference(){
-    union(){
-      translate([-sz, 0, -t])
-	cube([sz*2 + w, sz, t]);
-      translate([0, 0, -t])
-	cube([w, sz, sz]);
-    }
+    translate([0, 0, -0.1])
+      cube([w, sz, sz - t + 0.1]);
+
     translate([0,sz,0]) rotate([90,0,-90]) FD();
-    translate([w,0,-t]) rotate([0,180,0]) FD();
-    translate([w,0,0]) rotate([0,0,0]) FD();
+    translate([0, sz, 0])
+      rotate([90, 0, -90])
+      translate(fdo + [0, -ru*2, -d]) cube([fdsz[0], ru, d*2]);
   }
   translate([w,0,0]) rotate([90,0,90]) FD();
+
+  translate([0, sz+d, 0])
+    rotate([90,0,0])
+    translate([0, fdo[1], 0]) cube([d*2, fdsz[1], ru]);
+}
+
+module TT () { ////toplevel
+  difference(){
+    translate([-sz, 0, -t])
+      cube([sz*2 + w, sz, t]);
+
+    translate([0,0,-t]) rotate([0,180,0]) FD();
+    translate([w,0,0]) rotate([0,0,0]) FD();
+
+    translate([(sz+w), 0, -t]) rotate([0,180,0])
+      Commitid_BestCount([sz+w, sz]);
+  }
   translate([-sz,0,0]) rotate([0,0,0]) FD();
+
+  TTWall();
+  translate([0,0,-t]) rotate([90,0,0]) TTWall();
 }
 
+echo("pixelsz:", str(Commitid_pixelsz()),
+     "depth:", Commitid_depth(),
+     "sz:", Commitid_FontDemo_sz());
+
 //TC();
 TT();