From 22b7aa956c9951fac0f2764bfa47638e2ac06b38 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Tue, 2 Feb 2021 17:32:44 +0000 Subject: [PATCH 1/2] Renamed rounded_rectangle_* to rounded_cube_*. --- tests/rounded_rectangle.scad | 7 +++++-- utils/core/rounded_rectangle.scad | 14 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/rounded_rectangle.scad b/tests/rounded_rectangle.scad index fbb9b67..9daeb08 100644 --- a/tests/rounded_rectangle.scad +++ b/tests/rounded_rectangle.scad @@ -27,10 +27,13 @@ module rounded_rectangles() { rounded_rectangle([30, 20, 10], 3); translate([80, 0]) - rounded_rectangle_xz([30, 20, 10], 3); + rounded_cube_xy([30, 20, 10], 3); translate([120, 0]) - rounded_rectangle_yz([30, 20, 10], 3); + rounded_cube_xz([30, 20, 10], 3); + + translate([160, 0]) + rounded_cube_yz([30, 20, 10], 3); } rounded_rectangles(); diff --git a/utils/core/rounded_rectangle.scad b/utils/core/rounded_rectangle.scad index ea7a231..bda28a9 100644 --- a/utils/core/rounded_rectangle.scad +++ b/utils/core/rounded_rectangle.scad @@ -32,16 +32,22 @@ module rounded_rectangle(size, r, center = true, xy_center = true) //! Like `cub rounded_square([size.x, size.y], r, xy_center); } -module rounded_rectangle_xz(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. +module rounded_cube_xy(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. +{ + linear_extrude(size.z, center = center) + rounded_square([size.x, size.y], r, xy_center); +} + +module rounded_cube_xz(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. { translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2]) rotate([90, 0, 0]) - rounded_rectangle([size.x, size.z, size.y], r, center = true, xy_center = true); + rounded_cube_xy([size.x, size.z, size.y], r, center = true, xy_center = true); } -module rounded_rectangle_yz(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. +module rounded_cube_yz(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. { translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2]) rotate([90, 0, 90]) - rounded_rectangle([size.y, size.z, size.x], r, center = true, xy_center = true); + rounded_cube_xy([size.y, size.z, size.x], r, center = true, xy_center = true); } From c4fe1d10986411f759f63813a448dab7181bc9ed Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sun, 7 Feb 2021 07:29:02 +0000 Subject: [PATCH 2/2] Added assertion to check r value. Used extrud_if. --- utils/core/rounded_rectangle.scad | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/utils/core/rounded_rectangle.scad b/utils/core/rounded_rectangle.scad index bda28a9..205a009 100644 --- a/utils/core/rounded_rectangle.scad +++ b/utils/core/rounded_rectangle.scad @@ -22,32 +22,33 @@ // module rounded_square(size, r, center = true) //! Like `square()` but with with rounded corners { + assert(r < min(size.x, size.y) / 2); $fn = r2sides4n(r); offset(r) offset(-r) square(size, center = center); } module rounded_rectangle(size, r, center = true, xy_center = true) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. { - linear_extrude(size.z, center = center) + extrude_if(size.z, center = center) rounded_square([size.x, size.y], r, xy_center); } -module rounded_cube_xy(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. +module rounded_cube_xy(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in XY plane and separate centre options for xy and z. { - linear_extrude(size.z, center = center) + extrude_if(size.z, center = z_center) rounded_square([size.x, size.y], r, xy_center); } -module rounded_cube_xz(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. +module rounded_cube_xz(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in XZ plane and separate centre options for xy and z. { - translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2]) + translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, z_center ? 0 : size.z / 2]) rotate([90, 0, 0]) - rounded_cube_xy([size.x, size.z, size.y], r, center = true, xy_center = true); + rounded_cube_xy([size.x, size.z, size.y], r, xy_center = true, z_center = true); } -module rounded_cube_yz(size, r, center = false, xy_center = false) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. +module rounded_cube_yz(size, r = 0, xy_center = false, z_center = false) //! Like `cube()` but corners rounded in YX plane and separate centre options for xy and z. { - translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, center ? 0 : size.z / 2]) + translate([xy_center ? 0 : size.x / 2, xy_center ? 0 : size.y / 2, z_center ? 0 : size.z / 2]) rotate([90, 0, 90]) - rounded_cube_xy([size.y, size.z, size.x], r, center = true, xy_center = true); + rounded_cube_xy([size.y, size.z, size.x], r, xy_center = true, z_center = true); }