diff --git a/Makefile b/Makefile index 135f172..0f9a7c7 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ ifeq ($(UNAME), Darwin) endif AIRFOILS = ag24.dat m1-il.dat +TAIL = t-tail b: build/allparts.svg @@ -15,15 +16,15 @@ build: build/assembly.scad: src/*.rs $(AIRFOILS) mkdir -p build - cargo run t-tail assembly + cargo run $(TAIL) assembly build/part%.scad: src/*.rs $(AIRFOILS) mkdir -p build - cargo run parts t-tail + cargo run parts $(TAIL) build/allparts.scad: src/*.rs $(AIRFOILS) mkdir -p build - cargo run sheet t-tail + cargo run sheet $(TAIL) e393.dat: curl http://airfoiltools.com/airfoil/seligdatfile?airfoil=e393-il -o e393.dat @@ -59,11 +60,11 @@ build/%.dxf: build/%.scad build/%.dwg: build/%.svg svg2dwg -no-gui -no-dock-icon -o $@ $< -.PHONY: svgs dxfs clean b -svgs: build/%.scad +.PHONY: svgs dxfs clean b v-tail +svgs: build/part%.scad ls build/part*.scad | sed 's/scad/svg/' | xargs make -dxfs: build/%.scad +dxfs: build/part%.scad ls build/part*.scad | sed 's/scad/dxf/' | xargs make clean: @@ -74,12 +75,18 @@ clean: vis: build/assembly-clear.scad openscad build/assembly-clear.scad +v-tail: src/*.rs $(AIRFOILS) + cargo run v-tail assembly sheet parts + +t-tail: src/*.rs $(AIRFOILS) + cargo run t-tail assembly sheet parts + build/testwing-clear.scad: build/testwing.scad sed 's/color("clear-red")/color([1.0,1.0,0.0,0.9])/g' $< > $@ sed 's/color("clear-blue")/color([0.0,1.0,1.0,1.0])/g' -i $@ build/assembly-clear.scad: build/assembly.scad - cargo run --features assembly t-tail film + cargo run --features assembly $(TAIL) film sed 's/color("clear-red")/color([1.0,0.0,0.0,0.5])/g' $< > $@ sed 's/color("clear-blue")/color([0.0,1.0,0.0,0.9])/g' -i $@ sed 's/color("clear-blue")/color([0.0,0.0,1.0,0.9])/g' -i $@ diff --git a/src/main.rs b/src/main.rs index ac0c177..32d65f2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -161,6 +161,8 @@ fn v_tail( ruddervator.add_child(struts.visualization); ruddervator.add_child(spar.visualization); ruddervator = scad!(Translate(vec3(0.0, FUSELAGE_GAP, 0.0)); ruddervator); + parts.append(struts.parts.clone().as_mut()); + parts.append(spar.parts.clone().as_mut()); parts.append(struts.parts.as_mut()); parts.append(spar.parts.as_mut()); ruddervators.add_child(scad!(Mirror(vec3(0.0, 1.0, 0.0)); ruddervator.clone()));