diff --git a/examples/floor_stand/floor_stand.scad b/examples/floor_stand/floor_stand.scad index f7eeefd8..411ffe02 100644 --- a/examples/floor_stand/floor_stand.scad +++ b/examples/floor_stand/floor_stand.scad @@ -50,19 +50,18 @@ module floor_stand(width, height, thickness, spacing) { } module board_T() { - linear_extrude(thickness, center = true) - union() { - difference() { - board_base(); - square([width, height / 3], center = true); - } - - translate([0, -height / 12 - spacing / 2, 0]) - difference() { - square([width / 1.5 - double_spacing, height / 6 + spacing], center = true); - square([width / 1.5 - thickness * 2, height / 6], center = true); - } + linear_extrude(thickness, center = true) { + difference() { + board_base(); + square([width, height / 3], center = true); } + + translate([0, -height / 12 - spacing / 2, 0]) + difference() { + square([width / 1.5 - double_spacing, height / 6 + spacing], center = true); + square([width / 1.5 - thickness * 2, height / 6], center = true); + } + } rotate([0, 90, 0]) { linear_extrude(width / 1.5 - double_spacing, center = true) diff --git a/examples/floor_stand/floor_stand_symbol.scad b/examples/floor_stand/floor_stand_symbol.scad index 183e7bc8..b6e7e391 100644 --- a/examples/floor_stand/floor_stand_symbol.scad +++ b/examples/floor_stand/floor_stand_symbol.scad @@ -30,17 +30,16 @@ module content(text, font, font_size, symbol_png, symbol_unicode, symbol_font, s translate([0, -height / 1.8, thickness]) { color("black") linear_extrude(half_th / 2) - union() { - translate([0, -half_h / 3, 0]) - multi_line_text( - split_str(text, " "), - font = font, - size = font_size, - line_spacing = line_spacing, - valign = "center", - halign = "center" - ); - } + translate([0, -half_h / 3, 0]) + multi_line_text( + split_str(text, " "), + font = font, + size = font_size, + line_spacing = line_spacing, + valign = "center", + halign = "center" + ); + if(symbol_source == "DEFAULT") { color("green") @@ -62,14 +61,13 @@ module content(text, font, font_size, symbol_png, symbol_unicode, symbol_font, s color("black") translate([0, half_h / 5, half_th / 4]) scale([symbol_png_scale, symbol_png_scale, 1]) - difference() { - cube([symbol_png_size * 0.99, symbol_png_size * 0.99, stand_thickness / 4], center = true); - - translate([0, 0, -50]) - scale([1, 1, 100]) - surface(symbol_png, center = true); - } - + difference() { + cube([symbol_png_size * 0.99, symbol_png_size * 0.99, stand_thickness / 4], center = true); + + translate([0, 0, -50]) + scale([1, 1, 100]) + surface(symbol_png, center = true); + } } } } diff --git a/examples/hollow_out/hollow_out_square.scad b/examples/hollow_out/hollow_out_square.scad index dd75cb56..7be39ace 100644 --- a/examples/hollow_out/hollow_out_square.scad +++ b/examples/hollow_out/hollow_out_square.scad @@ -24,8 +24,9 @@ function hollow_out_square(size, width) = rows = size[1] ) [ - for(y = [0:width:width * rows - width]) - for(x = [0:width:width * columns - width]) - for(line = h_lines_in_square(width)) - [for(p = line) p + [x, y]] + for(y = [0:width:width * rows - width], + x = [0:width:width * columns - width], + line = h_lines_in_square(width) + ) + [for(p = line) p + [x, y]] ]; \ No newline at end of file diff --git a/examples/hollow_out/hollow_torus_knot.scad b/examples/hollow_out/hollow_torus_knot.scad index be032c06..40d2f7b2 100644 --- a/examples/hollow_out/hollow_torus_knot.scad +++ b/examples/hollow_out/hollow_torus_knot.scad @@ -20,14 +20,12 @@ else { } module hollow_out_torus_knot(shape, p, q, phi_step, thickness, line_style) { - function angy_angz(p1, p2) = - let( - dx = p2[0] - p1[0], - dy = p2[1] - p1[1], - dz = p2[2] - p1[2], - ya = atan2(dz, sqrt(dx * dx + dy * dy)), - za = atan2(dy, dx) - ) [ya, za]; + function __angy_angz(p1, p2) = + let(v = p2 - p1) + [ + atan2(v.z, norm([v.x, v.y])), + atan2(v.y, v.x) + ]; function sects_by_path(shape, path) = let( @@ -37,7 +35,7 @@ module hollow_out_torus_knot(shape, p, q, phi_step, thickness, line_style) { ], angles = [ for(line = lines) - let(a = angy_angz(line[0], line[1])) + let(a = __angy_angz(line[0], line[1])) [0, 90 - a[0], a[1]] ] )