utils: Move oval from lock-inframe-bracket

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/diziet-utils/utils.scad b/diziet-utils/utils.scad
index 6a0964d3fb4906e4e2c7c32ccfad06ff5d2cc9fb..58b2be8de8e61dcdadc0608bb77a4281e99196ce 100644 (file)
--- a/diziet-utils/utils.scad
+++ b/diziet-utils/utils.scad
@@ -55,3 +55,13 @@ module ellipse(radii) {
   scale(radii / r)
     circle(r);
 }
+module oval(sz){ // sz[0] > sz[1]
+  xr = sz[0];
+  yr = sz[1];
+  hull(){
+    for (sx=[-1,+1]) {
+      translate([sx * (xr-yr), 0])
+       circle(r=yr);
+    }
+  }
+}

diff --git a/lock-inframe-bracket.scad b/lock-inframe-bracket.scad
index bfa6e39699b9a8297c509adaf1ffb3143e294c47..92df9dfce0c43d887b4e9a893e05f74ebc54ae8d 100644 (file)
--- a/lock-inframe-bracket.scad
+++ b/lock-inframe-bracket.scad
@@ -4,6 +4,7 @@
 // use fill density 40%
 
 include <funcs.scad>
+include <utils.scad>
 
 tube_dia = 27.5 + 1.625 + 1.32;
 lock_w = 42.5 + 0.5;
@@ -64,17 +65,6 @@ lock_0 = [lock_0x,lock_0y];
 
 lock_or = [lock_w, lock_d]/2 + [front_th,front_th];
 
-module oval(sz){ // sz[0] > sz[1]
-  xr = sz[0];
-  yr = sz[1];
-  hull(){
-    for (sx=[-1,+1]) {
-      translate([sx * (xr-yr), 0])
-       circle(r=yr);
-    }
-  }
-}
-
 module JoinCircs(jr){
   // http://mathworld.wolfram.com/Circle-CircleIntersection.html
   R = tube_or + join_cr;