From 4f74a6302ea3338fbe52966e35a1f66af4927510 Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Tue, 28 Jan 2020 09:06:08 +0800
Subject: [PATCH] refactor

---
 examples/text_box.scad | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/examples/text_box.scad b/examples/text_box.scad
index 340ca133..8355b187 100644
--- a/examples/text_box.scad
+++ b/examples/text_box.scad
@@ -1,3 +1,5 @@
+use <box_extrude.scad>;
+
 model_type = "Both"; // [Both, Lid, Container]
 t = "XD"; 
 font_size = 30;
@@ -8,7 +10,6 @@ lid_height = 10;
 thickness = 1;
 spacing = 0.6;
 
-
 module minkowski_text(t, size, font, r_round_edge) {
     $fn = 24;
     minkowski() {
@@ -18,34 +19,20 @@ module minkowski_text(t, size, font, r_round_edge) {
 }
 
 module text_container(t, font_size, font_name, r_round_edge, container_height, thickness) {
-    difference() {
-        linear_extrude(container_height) 
-            minkowski_text(t, font_size, font_name, r_round_edge);
-
-        translate([0, 0, thickness]) 
-        linear_extrude(container_height - thickness) 
-        offset(r = -thickness) 
-            minkowski_text(t, font_size, font_name, r_round_edge);
-    }
+    box_extrude(height = container_height, shell_thickness = thickness) 
+        minkowski_text(t, font_size, font_name, r_round_edge);
 }
 
-module text_lid(t, font_size, font_name, r_round_edge, container_height, lid_height, thickness, spacing) {
-    translate([0, 0, lid_height - thickness]) 
-    linear_extrude(thickness) 
+module text_lid(t, font_size, font_name, r_round_edge, lid_height, thickness, spacing) {
+    translate([0, 0, lid_height])
+    mirror([0, 0, 1])
+    box_extrude(height = lid_height, shell_thickness = thickness) 
+    mirror([0, 0, 1])
     offset(r = spacing + thickness) 
         minkowski_text(t, font_size, font_name, r_round_edge); 
-
-    linear_extrude(lid_height)
-    difference() {
-        offset(r = spacing + thickness) 
-            minkowski_text(t, font_size, font_name, r_round_edge);    
-        offset(r = spacing) 
-            minkowski_text(t, font_size, font_name, r_round_edge);
-    }
 }
  
 module text_box(model_type, t, font_size, font_name, r_round_edge, container_height, lid_height, thickness, spacing) {
-   
     if(model_type == "Both" || model_type == "Container") {
         text_container(t, font_size, font_name, r_round_edge, container_height, thickness);    
     }
@@ -54,7 +41,7 @@ module text_box(model_type, t, font_size, font_name, r_round_edge, container_hei
         offset_y = (font_size + r_round_edge) * 2;
 
         translate([0, offset_y, 0]) 
-            text_lid(t, font_size, font_name, r_round_edge, container_height, lid_height, thickness, spacing);
+            text_lid(t, font_size, font_name, r_round_edge, lid_height, thickness, spacing);
 
         translate([0, offset_y, lid_height]) 
             linear_extrude(thickness) 
@@ -62,4 +49,4 @@ module text_box(model_type, t, font_size, font_name, r_round_edge, container_hei
     }
 }
 
-text_box(model_type, t, font_size, font_name, r_round_edge, container_height, lid_height, thickness, spacing );
\ No newline at end of file
+text_box(model_type, t, font_size, font_name, r_round_edge, container_height, lid_height, thickness, spacing);
\ No newline at end of file