openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-08-07 07:56:42 +02:00
Code Issues Projects Releases Wiki Activity

Fixed cube(), cylinder(), and square() prims when not given size.

Browse Source
This commit is contained in:
Revar Desmera
2019-10-23 22:52:42 -07:00
parent 22e6ced9f4
commit 3e278e6a52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
primitives.scad
View File

@@ -33,7 +33,7 @@
// square([40,30], anchor=FRONT, spin=30); // square([40,30], anchor=FRONT, spin=30);
// Example(NORENDER): Called as Function // Example(NORENDER): Called as Function
// path = square([40,30], anchor=FRONT, spin=30); // path = square([40,30], anchor=FRONT, spin=30);
module square(size, center=undef, anchor=FRONT+LEFT, spin=0) { module square(size=1, center=undef, anchor=FRONT+LEFT, spin=0) {
size = is_num(size)? [size,size] : point2d(size); size = is_num(size)? [size,size] : point2d(size);
pts = [[0,0], [0,size.y], size, [size.x,0]]; pts = [[0,0], [0,size.y], size, [size.x,0]];
orient_and_anchor(point3d(size), UP, anchor, spin=spin, center=center, noncentered=FRONT+LEFT, two_d=true, chain=true) { orient_and_anchor(point3d(size), UP, anchor, spin=spin, center=center, noncentered=FRONT+LEFT, two_d=true, chain=true) {
@@ -42,7 +42,7 @@ module square(size, center=undef, anchor=FRONT+LEFT, spin=0) {
} }
} }
function square(size, center=undef, anchor=FRONT+LEFT, spin=0) = function square(size=1, center=undef, anchor=FRONT+LEFT, spin=0) =
let( let(
anchor = center==true? CENTER : center==false? FRONT+LEFT : anchor, anchor = center==true? CENTER : center==false? FRONT+LEFT : anchor,
size = is_num(size)? [size,size] : point2d(size), size = is_num(size)? [size,size] : point2d(size),
@@ -119,7 +119,7 @@ function circle(r=undef, d=undef, anchor=CENTER, spin=0) =
// cube([20,40,50], anchor=BOTTOM+FRONT, spin=30, orient=FWD); // cube([20,40,50], anchor=BOTTOM+FRONT, spin=30, orient=FWD);
// Example: Standard Connectors. // Example: Standard Connectors.
// cube(40, center=true) show_anchors(); // cube(40, center=true) show_anchors();
module cube(size, center=undef, anchor=ALLNEG, spin=0, orient=UP) module cube(size=1, center=undef, anchor=ALLNEG, spin=0, orient=UP)
{ {
size = scalar_vec3(size); size = scalar_vec3(size);
orient_and_anchor(size, orient, anchor, center, spin=spin, noncentered=ALLNEG, chain=true) { orient_and_anchor(size, orient, anchor, center, spin=spin, noncentered=ALLNEG, chain=true) {
@@ -175,7 +175,7 @@ module cylinder(r=undef, d=undef, r1=undef, r2=undef, d1=undef, d2=undef, h=unde
{ {
r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1); r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1);
r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1); r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1);
l = first_defined([h, l]); l = first_defined([h, l, 1]);
hh = l/2; hh = l/2;
sides = segs(max(r1,r2)); sides = segs(max(r1,r2));
size = [r1*2, r1*2, l]; size = [r1*2, r1*2, l];