djsundog/NopSCADlib
1
0
Fork 0
mirror of https://github.com/DJSundog/NopSCADlib.git synced 2024-11-27 09:10:02 -05:00
Code Issues Projects Releases Wiki Activity

Removed redundant rounded_rectangle center = false.

Browse Source
This commit is contained in:
Chris Palmer 2021-02-08 09:41:07 +00:00
parent d75aff2ccd
commit f573a91a09
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
printed/box.scad
View File

@ -227,7 +227,7 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
translate_z(-box_profile_overlap(type)) difference() { translate_z(-box_profile_overlap(type)) difference() {
tw = w + 2 * outset; tw = w + 2 * outset;
td = d + 2 * outset; td = d + 2 * outset;
rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type), false); rounded_rectangle([tw, td, feet ? foot_height : height], box_corner_rad(type));
// //
// Remove edges between the feet // Remove edges between the feet
// //
@ -264,7 +264,7 @@ module box_bezel(type, bottom) { //! Generates top and bottom bezel STLs
// recess for top / bottom panel // recess for top / bottom panel
// //
translate_z(cgap) translate_z(cgap)
rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2, false); rounded_rectangle([w + bezel_clearance, d + bezel_clearance, height], inner_r + bezel_clearance / 2);
// //
// leave plastic over the corner profiles // leave plastic over the corner profiles
// //

2
printed/door_latch.scad
View File

@ -44,7 +44,7 @@ module door_latch_stl() { //! Generates the STL for the printed part
difference() { difference() {
union() { union() {
hull() { hull() {
rounded_rectangle([length, width, thickness - tan(30) * (width - ridge) / 2], rad, center = false); rounded_rectangle([length, width, thickness - tan(30) * (width - ridge) / 2], rad);
translate_z(thickness / 2) translate_z(thickness / 2)
cube([length, ridge, thickness], center = true); cube([length, ridge, thickness], center = true);

2
printed/printed_box.scad
View File

@ -182,7 +182,7 @@ module pbox(type) { //! Generate the STL for the main case
if(ledge_h) if(ledge_h)
translate_z(top_thickness + height - ledge_h) translate_z(top_thickness + height - ledge_h)
difference() { difference() {
rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1, center = false); rounded_rectangle([pbox_width(type) + 2 * outset, pbox_depth(type) + 2 * outset, ledge_h], 1);
hull() { hull() {
linear_extrude(ledge_h + eps) linear_extrude(ledge_h + eps)

2
printed/psu_shroud.scad
View File

@ -110,7 +110,7 @@ module psu_shroud(type, cable_d, name, cables = 1) { //! Generate the STL file f
stl(str("psu_shroud_", name)) { stl(str("psu_shroud_", name)) {
// base and sides // base and sides
translate([centre_x, -centre_y]) { translate([centre_x, -centre_y]) {
rounded_rectangle([depth - eps, width - eps, top], rad, center = false); rounded_rectangle([depth - eps, width - eps, top], rad);
linear_extrude(height) linear_extrude(height)
difference() { difference() {

2
printed/ssr_shroud.scad
View File

@ -71,7 +71,7 @@ module ssr_shroud(type, cable_d, name) { //! Generate the STL file for a spec
stl(str("ssr_shroud_", name)) { stl(str("ssr_shroud_", name)) {
// base and sides // base and sides
translate([center_x, 0]) { translate([center_x, 0]) {
rounded_rectangle([depth - eps, width - eps, top], rad, center = false); rounded_rectangle([depth - eps, width - eps, top], rad);
linear_extrude(height) difference() { linear_extrude(height) difference() {
round(or = wall / 2 - eps, ir = 0) difference() { round(or = wall / 2 - eps, ir = 0) difference() {

8
utils/rounded_right_triangle.scad
View File

@ -31,15 +31,15 @@ module rounded_right_triangle(x, y, z, fillet, center = true, offset = false) {
hull() { hull() {
translate([0, fillet, size.z / 2]) translate([0, fillet, size.z / 2])
rotate([90, 90, 0]) rotate([90, 90, 0])
rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false); rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
translate([0, size.y, size.z / 2]) translate([0, size.y, size.z / 2])
rotate([90, 90, 0]) rotate([90, 90, 0])
rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false); rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
translate([fillet, 0, size.z / 2]) translate([fillet, 0, size.z / 2])
rotate([0, 90, 0]) rotate([0, 90, 0])
rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false); rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
translate([size.x, 0, size.z / 2]) translate([size.x, 0, size.z / 2])
rotate([0, 90, 0]) rotate([0, 90, 0])
rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, center = false, xy_center = false); rounded_rectangle([size.z, 2 * fillet, eps], fillet - eps, xy_center = false);
} }
} }

2
vitamins/battery.scad
View File

@ -128,7 +128,7 @@ module battery_contact(type, pos = true) { //! Draw a positive or negative batte
t = contact_thickness(type); t = contact_thickness(type);
color("silver") { color("silver") {
rounded_rectangle([contact_width(type), h, t], r = 1, center = false); rounded_rectangle([contact_width(type), h, t], r = 1);
translate([0, -h / 2, t]) translate([0, -h / 2, t])
rotate([90, 0, 0]) rotate([90, 0, 0])

2
vitamins/button.scad
View File

@ -47,7 +47,7 @@ module square_button(type, colour = "yellow") { //! Draw square button with spec
stem = square_button_cap_stem(type); stem = square_button_cap_stem(type);
color(grey(20)) { color(grey(20)) {
rounded_rectangle([w, w, h - 0.5], r = wall, center = false); rounded_rectangle([w, w, h - 0.5], r = wall);
for(x = [-1, 1], y = [-1, 1]) for(x = [-1, 1], y = [-1, 1])
translate([x * pitch, y * pitch]) translate([x * pitch, y * pitch])

4
vitamins/camera.scad
View File

@ -37,7 +37,7 @@ module camera_lens(type, offset = 0, show_lens = true) //! Draw the lens stack,
r = p[1] + offset; r = p[1] + offset;
app = p[2]; app = p[2];
if(size.x) if(size.x)
rounded_rectangle(size + [2 * offset, 2 * offset, round_to_layer(offset)], r, center = false); rounded_rectangle(size + [2 * offset, 2 * offset, round_to_layer(offset)], r);
else else
if (show_lens) if (show_lens)
translate_z(size.y) translate_z(size.y)
@ -72,7 +72,7 @@ module camera(type, show_lens = true) { //! Draw specified PCB camera
pos = camera_connector_pos(type); pos = camera_connector_pos(type);
color(grey(20)) color(grey(20))
translate(pos) translate(pos)
rounded_rectangle(conn, 0.5, center = false); rounded_rectangle(conn, 0.5);
flex = [5, 0.1]; flex = [5, 0.1];
color("orange") color("orange")

2
vitamins/component.scad
View File

@ -326,7 +326,7 @@ module panel_USBA() { //! Draw a panel mount USBA connector
dx = (length2 / 2 - r2); dx = (length2 / 2 - r2);
dy = (width / 2 - r1); dy = (width / 2 - r1);
translate_z(l) translate_z(l)
rounded_rectangle([length2, width, 1], r = r1, center = false); rounded_rectangle([length2, width, 1], r = r1);
translate([-dx, -dy, height2 - r2]) translate([-dx, -dy, height2 - r2])
rotate([90, 0, 0]) rotate([90, 0, 0])

2
vitamins/display.scad
View File

@ -80,7 +80,7 @@ module display(type) { //! Draw specified display
translate_z(display_ts_thickness(type)) { translate_z(display_ts_thickness(type)) {
difference() { difference() {
color("silver") color("silver")
rounded_rectangle([w, h, t], 0.5, center = false); rounded_rectangle([w, h, t], 0.5);
color("black") color("black")
translate([aperture[0].x, aperture[0].y, - eps]) translate([aperture[0].x, aperture[0].y, - eps])

8
vitamins/panel_meter.scad
View File

@ -59,7 +59,7 @@ module panel_meter_button(type) { //! Draw panel meter button
color(pmeter_button_colour(type)) color(pmeter_button_colour(type))
translate(pmeter_button_pos(type)) translate(pmeter_button_pos(type))
if(size.x) if(size.x)
rounded_rectangle(pmeter_button_size(type), r, center = false); rounded_rectangle(pmeter_button_size(type), r);
else else
cylinder(r = r, h = size.z); cylinder(r = r, h = size.z);
} }
@ -93,8 +93,8 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
difference() { difference() {
if(is_list(bevel)) if(is_list(bevel))
hull() { hull() {
rounded_rectangle([bezel.x - 2 * bevel.x, bezel.y - 2 * bevel.x, bezel.z], r - bevel.x, center = false); rounded_rectangle([bezel.x - 2 * bevel.x, bezel.y - 2 * bevel.x, bezel.z], r - bevel.x);
rounded_rectangle([bezel.x, bezel.y, bevel[1]], r, center = false); rounded_rectangle([bezel.x, bezel.y, bevel[1]], r);
} }
else else
hull() { hull() {
@ -111,7 +111,7 @@ module panel_meter(type) { //! Draw panel mounted LCD meter module
cube([ap.x + ap.z, ap.y + ap.z, eps], center = true); cube([ap.x + ap.z, ap.y + ap.z, eps], center = true);
translate_z(bezel.z + eps) translate_z(bezel.z + eps)
rounded_rectangle([ap.x, ap.y, bezel.z * 2], r, center = true); rounded_rectangle([ap.x, ap.y, bezel.z * 2], r, true);
} }
} }
// //

2
vitamins/pcb.scad
View File

@ -126,7 +126,7 @@ module usb_A(h, v_flange_l, bar, cutout) {
if(cutout) if(cutout)
rotate([90, 0, 90]) rotate([90, 0, 90])
rounded_rectangle([w + 2 * v_flange_h + 2 * panel_clearance, rounded_rectangle([w + 2 * v_flange_h + 2 * panel_clearance,
h + 2 * h_flange_h + 2 * panel_clearance, 100], r = cnc_bit_r, center = false); h + 2 * h_flange_h + 2 * panel_clearance, 100], r = cnc_bit_r);
else { else {
color("silver") rotate([0, 90, 0]) { color("silver") rotate([0, 90, 0]) {
linear_extrude(l, center = true) linear_extrude(l, center = true)

2
vitamins/ziptie.scad
View File

@ -62,7 +62,7 @@ module ziptie(type, r, t = 0) //! Draw specified ziptie wrapped around radius `r
translate([lx, -r]) translate([lx, -r])
rotate([90, 0, 0]) rotate([90, 0, 0])
union() { union() {
rounded_rectangle(latch, 0.5, center = false); rounded_rectangle(latch, 0.5);
translate_z((latch.z + 1) / 2) translate_z((latch.z + 1) / 2)
cube([ziptie_thickness(type), ziptie_width(type), latch.z + 1], center = true); cube([ziptie_thickness(type), ziptie_width(type), latch.z + 1], center = true);