diff --git a/Makefile b/Makefile index bbff511..774198a 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ b: build/allparts.svg build: mkdir -p build -build/%.scad: src/*.rs ag24.dat sd8020.dat sd7062.dat m1-il.dat +build/%.scad: src/*.rs ag24.dat m1-il.dat mkdir -p build cargo run diff --git a/src/main.rs b/src/main.rs index e2d1a01..3c3f278 100644 --- a/src/main.rs +++ b/src/main.rs @@ -325,16 +325,15 @@ fn spar(length: f32, center: bool) -> ScadObject { //register_part(scad!(Square(vec2(length, SPAR_SIDE_WIDTH * 3.0)))); - for i in 0..3 { - let mut panel = scad!(Cube(vec3(SPAR_SIDE_WIDTH, length, CARDBOARD_WIDTH))); - if center { - panel = scad!(Translate(vec3(0.0, -length/2.0, 0.0)); panel) - } - let rot = 120.0 * i as f32; - spar.add_child(scad!( - Rotate(rot, vec3(0.0, 1.0, 0.0)); panel - )); - } + let top = centered_cube(vec3(SPAR_SIDE_WIDTH, length, CARDBOARD_WIDTH), (true,false,false)); + let mut left = centered_cube(vec3(SPAR_SIDE_WIDTH, length, CARDBOARD_WIDTH), (false,false,false)); + left = scad!(Rotate(120.0, vec3(0.0, 1.0, 0.0)); left); + left = scad!(Translate(vec3(SPAR_SIDE_WIDTH/2.0, 1.0, 0.0)); left); + let right = scad!(Mirror(vec3(1.0, 0.0, 0.0)); left.clone()); + + spar.add_child(left); + spar.add_child(right); + spar.add_child(top); spar }