Merge branch 'master' of https://github.com/RAMilewski/BOSL2

Author: RAMilewski

attachments.scad

@@ -3871,34 +3871,37 @@ module show_anchors(s=10, std=true, custom=true) {
             }
         }
     }
+    textsize = s/4;
     if (custom) {
         for (anchor=last($parent_geom)) {
-            attach(anchor[0],BOT) {
+            attach(anchor[0]) {
                 if(two_d) {
                     anchor_arrow2d(s, color="cyan");
                 } else {
                     anchor_arrow(s, color="cyan");
                 }
-                color("black")
+
+                color("white")
                 tag("anchor-arrow") {
-                    xrot(two_d? 0 : 90) {
-                        back(s/3) {
-                            yrot_copies(n=2)
-                            up(two_d? 0.51 : s/30) {
-                                linear_extrude(height=0.01, convexity=12, center=true) {
-                                    text(text=anchor[0], size=s/4, halign="center", valign="center", font="Helvetica", $fn=36);
-                                }
-                            }
-                        }
-                    }
+                    if(two_d)
+                        back(s/2)
+                        square([s/4.5*len(anchor[0]), s*.37], center=true);
+                    else
+                        up(s*.45)
+                        xrot(90)
+                        cube([s/4.5*len(anchor[0]), s*.37, 0.01], center=true);
                 }
-                color([1, 1, 1, 1])
+                color("black")
                 tag("anchor-arrow") {
-                    xrot(two_d? 0 : 90) {
-                        back(s/3) {
-                             cube([s/4.5*len(anchor[0]), s/3, 0.01], center=true);
-                        }
-                   }
+                    if(two_d)
+                        back(s/2)
+                            text(text=anchor[0], size=textsize, halign="center", valign="center", font="Helvetica", $fn=36);
+                    else
+                        up(s*.45)
+                        xrot(90)
+                        yrot_copies(n=2)
+                        up(s/30)
+                              text3d(text=anchor[0],h=.01, size=textsize, center=true, font="Helvetica", $fn=36);
                 }
             }
         }
@@ -3956,12 +3959,12 @@ module anchor_arrow(s=10, color=[0.333,0.333,1], flag=true, $tag="anchor-arrow",
 // Description:
 //   Show an anchor orientation arrow.
 // Arguments:
-//   s = Length of the arrows.
+//   s = Length of the arrows.  Default: 10
 //   color = Color of the arrow.
 // Example:
 //   anchor_arrow2d(s=20);
-module anchor_arrow2d(s=15, color=[0.333,0.333,1], $tag="anchor-arrow") {
-    color(color) stroke([[0,0],[0,s]], width=s/10, endcap1="butt", endcap2="arrow2");
+module anchor_arrow2d(s=10, color=[0.333,0.333,1], $tag="anchor-arrow") {
+    color(color) stroke([[0,0],[0,s]], width=s/15, endcap1="butt", endcap2="arrow2");
 }
 
 

rounding.scad

@@ -2429,15 +2429,19 @@ module rounded_prism(bottom, top, joint_bot=0, joint_top=0, joint_sides=0, k_bot
   dummy1 = assert(in_list(atype, ["intersect","hull","surf_intersect","surf_hull","prismoid"]),
                   "Anchor type must be one of: \"hull\", \"intersect\", \"surf_hull\", \"surf_intersect\" or \"prismoid\"")
            assert(atype!="prismoid" || len(bottom)==4, "Anchor type \"prismoid\" requires that len(bottom)=4");
+
+  top_path = force_path(top,"top");
+  bot_path = force_path(bottom,"bottom");
 
-  result = rounded_prism(bottom=bottom, top=top, joint_bot=joint_bot, joint_top=joint_top, joint_sides=joint_sides,
+  result = rounded_prism(bottom=bot_path, top=top_path, joint_bot=joint_bot, joint_top=joint_top, joint_sides=joint_sides,
                          k_bot=k_bot, k_top=k_top, k_sides=k_sides, k=k, splinesteps=splinesteps, h=h, length=length, height=height, l=l,
                          debug=debug, _full_info=true);
   height = one_defined([l,h,height,length], "l,h,height,length", dflt=undef);
-  top = is_undef(top) ? path3d(bottom,height/2) :
-        len(top[0])==2 ? path3d(top,height/2) :
-        top;
-  bottom = len(bottom[0])==2 ? path3d(bottom,-height/2) : bottom;
+  top = is_undef(top_path) ? path3d(bot_path,height/2) :
+        len(top_path[0])==2 ? path3d(top_path,height/2) :
+        top_path;
+  bottom = len(bot_path[0])==2 ? path3d(bot_path,-height/2) : bot_path;
+  
   unrounded = vnf_vertex_array([top,bottom],caps=true, col_wrap=true,reverse=true);
 
   vnf = result[1];

shapes3d.scad

@@ -3347,7 +3347,10 @@ function sphere(r, d, anchor=CENTER, spin=0, orient=UP) =
 //   vnf = spheroid(r|d, [circum], [style]);
 // Description:
 //   Creates a spheroid object, with support for anchoring and attachments.
-//   This is a drop-in replacement for the built-in `sphere()` module.
+//   This is a drop-in replacement for the built-in `sphere()` module.  The `r` or `d` value can
+//   be a 3-vector to produce an ellipsoid.  This differs from scaling the ellipsoid manually because
+//   it doesn't rescale children that you attach to the ellipsoid.
+//   . 
 //   When called as a function, returns a [VNF](vnf.scad) for a spheroid.
 //   The exact triangulation of this spheroid can be controlled via the `style=`
 //   argument, where the value can be one of `"orig"`, `"aligned"`, `"stagger"`,
@@ -3379,10 +3382,10 @@ function sphere(r, d, anchor=CENTER, spin=0, orient=UP) =
 //   The "octa" style has the property that it blends neatly with a cylinder of the same $fn along any of the coordinate axes.
 //   This is true for both the regular and circumscribed "octa" spheroid.  
 // Arguments:
-//   r = Radius of the spheroid.
+//   r = Radius of the spheroid or 3-vector giving the 3 semiaxes.
 //   style = The style of the spheroid's construction. One of "orig", "aligned", "stagger", "octa", or "icosa".  Default: "aligned"
 //   ---
-//   d = Diameter of the spheroid.
+//   d = Diameter of the spheroid or 3-vector giving three axes lengths.
 //   circum = If true, the approximate sphere circumscribes the true sphere of the requested size.  Otherwise inscribes.  Note that for some styles, the circumscribed sphere looks different than the inscribed sphere.  Default: false (inscribes)
 //   anchor = Translate so anchor point is at origin (0,0,0).  See [anchor](attachments.scad#subsection-anchor).  Default: `CENTER`
 //   spin = Rotate this many degrees around the Z axis after anchor.  See [spin](attachments.scad#subsection-spin).  Default: `0`
@@ -3415,6 +3418,8 @@ function sphere(r, d, anchor=CENTER, spin=0, orient=UP) =
 //   $fn=16;
 //   color("lightblue")spheroid(r=10, style="octa", circum=true);
 //   xcyl(r=10.01, h=15, anchor=RIGHT, circum=true);
+// Example: Ellipsoid
+//   spheroid(r=[100,50,35]);
 // Example: Anchoring
 //   spheroid(d=100, anchor=FRONT);
 // Example: Spin
@@ -3445,10 +3450,11 @@ function sphere(r, d, anchor=CENTER, spin=0, orient=UP) =
 module spheroid(r, style="aligned", d, circum=false, dual=false, anchor=CENTER, spin=0, orient=UP)
 {
     r = get_radius(r=r, d=d, dflt=1);
-    sides = segs(r);
-    vsides = ceil(sides/2);
+    assert((is_finite(r) && r>=0) || (is_vector(r,3) && all_positive(r)),"\nr/d must be a nonnegative value or a positive 3-vector");
     attachable(anchor,spin,orient, r=r) {
         if (style=="orig" && !circum) {
+            sides = segs(min(r));
+            vsides = ceil(sides/2);
             merids = [ for (i=[0:1:vsides-1]) 90-(i+0.5)*180/vsides ];
             path = [
                 let(a = merids[0]) [0, sin(a)],
@@ -3460,9 +3466,11 @@ module spheroid(r, style="aligned", d, circum=false, dual=false, anchor=CENTER,
         // Don't now how to construct faces for these efficiently, so use hull_points, which
         // is much faster than using hull() as happens in the spheroid() function
         else if (circum && (style=="octa" || style=="icosa")) {
-            orig_sphere = spheroid(r,style,circum=false);
+            minr = min(r);
+            scale = r/minr;
+            orig_sphere = spheroid(minr,style,circum=false);
             dualvert = _dual_vertices(orig_sphere);
-            hull_points(dualvert,fast=true);
+            hull_points(scale(scale,dualvert),fast=true);
         } else {
             vnf = spheroid(r=r, circum=circum, style=style);
             vnf_polyhedron(vnf, convexity=2);
@@ -3651,8 +3659,16 @@ let(
 function spheroid(r, style="aligned", d, circum=false, anchor=CENTER, spin=0, orient=UP) =
     assert(in_list(style, ["orig", "aligned", "stagger", "octa", "icosa"]))
     let(
-        r = get_radius(r=r, d=d, dflt=1),
-        hsides = segs(r),
+        r = get_radius(r=r, d=d, dflt=1)
+    )
+    is_vector(r,3) ? let(
+                         minr = min(r),
+                         scale = r/minr
+                     )
+                     scale(scale,spheroid(minr, style=style, circum=circum, anchor=anchor,
+                                          spin=spin, orient=orient))
+  : let(
+        hsides = segs(min(r)),
         vsides = max(2,ceil(hsides/2)),
         icosa_steps = round(max(5,hsides)/5),
         stagger = style=="stagger"

threading.scad

@@ -2029,26 +2029,29 @@ module generic_threaded_rod(
       assert(r1adj+pmax-clip_bev1>0, "bevel1 is too large to fit screw diameter")
       assert(r2adj+pmax-clip_bev2>0, "bevel2 is too large to fit screw diameter")
       assert(abs(clip_bev1)+abs(clip_bev2)<len, "Combined bevel size exceeds length of screw");
+    
     attachable(anchor,spin,orient, r1=r1adj, r2=r2adj, l=len) {
         union(){
           difference() {
-              vnf_polyhedron(thread_vnf,convexity=10);              
-              if (clip_bev1>0)
-                  rotate_extrude()
-                      polygon([[                         0,-len/2],
-                               [r1adj+pmax-clip_bev1      ,-len/2],
-                               [r1adj+pmax-slope*clip_bev1,-len/2+clip_bev1],
-                               [                    rmax+1,-len/2+clip_bev1],
-                               [                    rmax+1, len1-1],
-                               [                         0, len1-1]]);
-              if (clip_bev2>0)
-                  rotate_extrude()
-                      polygon([[                         0, len/2],
-                               [r2adj+pmax-clip_bev2      , len/2],
-                               [r2adj+pmax+slope*clip_bev2, len/2-clip_bev2],
-                               [                    rmax+1, len/2-clip_bev2],
-                               [                    rmax+1, len2+1],
-                               [                         0, len2+1]]);
+              vnf_polyhedron(thread_vnf,convexity=10);
+              __rot_if_old(){    // works around change in rotate_extrude starting point
+                  if (clip_bev1>0)
+                      rotate_extrude(angle=360)
+                          polygon([[                         0,-len/2],
+                                   [r1adj+pmax-clip_bev1      ,-len/2],
+                                   [r1adj+pmax-slope*clip_bev1,-len/2+clip_bev1],
+                                   [                    rmax+1,-len/2+clip_bev1],
+                                   [                    rmax+1, len1-1],
+                                   [                         0, len1-1]]);
+                  if (clip_bev2>0)
+                      rotate_extrude(angle=360)
+                          polygon([[                         0, len/2],
+                                   [r2adj+pmax-clip_bev2      , len/2],
+                                   [r2adj+pmax+slope*clip_bev2, len/2-clip_bev2],
+                                   [                    rmax+1, len/2-clip_bev2],
+                                   [                    rmax+1, len2+1],
+                                   [                         0, len2+1]]);
+              }
               if (!blunt_start1 && clip_bev1<=0)
                   down(len/2) cuboid([2*rmax+1,2*rmax+1, -len1+1], anchor=TOP);                     
               if (!blunt_start2 && clip_bev2<=0)
@@ -2094,6 +2097,13 @@ module generic_threaded_rod(
 
 
 
+module __rot_if_old()
+{  
+  if (version_num()>=20250106) children();
+  else zrot(180) children();
+}
+
+
 // Module: generic_threaded_nut()
 // Synopsis: Creates a generic threaded nut.
 // SynTags: Geom

version.scad

@@ -14,7 +14,7 @@ _BOSL2_VERSION = is_undef(_BOSL2_STD) && (is_undef(BOSL2_NO_STD_WARNING) || !BOS
 
 
 
-BOSL_VERSION = [2,0,743];
+BOSL_VERSION = [2,0,744];