merge tabs.scad into cubbies.scad

2 files changed, 50 insertions, 44 deletions

diff --git a/cubbies.scad b/cubbies.scad
index d8f26ae..accfdef 100644
--- a/cubbies.scad
+++ b/cubbies.scad
@@ -1,7 +1,4 @@
-include <tabs.scad>;
-
-// https://github.com/revarbat/BOSL2
-include <BOSL2/std.scad>;
+include <BOSL2/std.scad>;       // https://github.com/revarbat/BOSL2
 include <BOSL2/walls.scad>;
 
 $fn=20;
@@ -31,7 +28,7 @@ tab_height=thickness;
 
 if ( part == "bottom" ) {
      rot(90) yrot(90) cubby_bottom(cubby_width, cubby_depth);
- } else if ( part == "divider" ) {
+} else if ( part == "divider" ) {
      yrot(180+90) cubby_divider(cubby_depth, cubby_divider_height);
 } else if ( part == "male tab line" ) {
      print_tab_line(cubby_width, cubby_depth, cubby_divider_height, male=true);
@@ -194,3 +191,51 @@ module strut_wall(w, h) {
           max_bridge=(h+w)/5
     ) children();
 }
+
+
+function tab_spacing (tab_width) = tab_width * 3.5;
+
+module single_tab (
+     tab_width=10,
+     tab_depth=5,
+     tab_height=5,
+     male=true,
+     tolerance=1
+) {
+     size=male
+          ? [tab_width, tab_depth, tab_height]
+          : [tab_width + tolerance, tab_depth + tolerance, tab_height + tolerance];
+     if (male) {
+          #cuboid(size) children();
+     } else {
+          cuboid(size) children();
+     }
+}
+
+/* module single_hole ( size_of_yo_hole = 2000mm )  { */
+/*      if (male) { */
+/*           #cylinder(size_of_yo_hole) children(); */
+/*      } else { */
+/*           cylinder(size_of_yo_hole) children(); */
+/*      } */
+
+/* } */
+
+module tab_line (
+     distance=100,
+     tab_width=10,
+     tab_depth=5,
+     tab_height=5,
+     tab_padding=5,
+     male=true,
+     tolerance=1,
+     edge_padding=0,
+     between=false,
+) {
+     start = between ? ((tab_padding * 2) + tab_width) : tab_padding;
+     tab_spacing = (tab_width * 2) + (tab_padding * 2);
+     shift = (distance - (tab_padding * 2)) / -2;
+     for ( i = [shift+start:tab_spacing:(shift * -1) - tab_padding] ) {
+          right(i) #single_tab(tab_width, tab_depth, tab_height, male, tolerance);
+     }
+}
diff --git a/tabs.scad b/tabs.scad
deleted file mode 100644
index de14cb1..0000000
--- a/tabs.scad
+++ /dev/null
@@ -1,39 +0,0 @@
-include <BOSL2/std.scad>;
-
-function tab_spacing (tab_width) = tab_width * 3.5;
-
-module single_tab (
-     tab_width=10,
-     tab_depth=5,
-     tab_height=5,
-     male=true,
-     tolerance=1
-) {
-     size=male
-          ? [tab_width, tab_depth, tab_height]
-          : [tab_width + tolerance, tab_depth + tolerance, tab_height + tolerance];
-     if (male) {
-          #cuboid(size) children();
-     } else {
-          cuboid(size) children();
-     }
-}
-
-module tab_line (
-     distance=100,
-     tab_width=10,
-     tab_depth=5,
-     tab_height=5,
-     tab_padding=5,
-     male=true,
-     tolerance=1,
-     edge_padding=0,
-     between=false,
-) {
-     start = between ? ((tab_padding * 2) + tab_width) : tab_padding;
-     tab_spacing = (tab_width * 2) + (tab_padding * 2);
-     shift = (distance - (tab_padding * 2)) / -2;
-     for ( i = [shift+start:tab_spacing:(shift * -1) - tab_padding] ) {
-          right(i) #single_tab(tab_width, tab_depth, tab_height, male, tolerance);
-     }
-}