diff --git a/README.rst b/README.rst index 6e357b1..a4a1191 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -.. image:: docs/nutNbolt.png +.. image:: docs/imgs/nutNbolt.png :width: 20% :alt: bolt-in-nut logo @@ -37,7 +37,7 @@ To create a bolt (without head) with 5 turns of M4 thread: bolt("M4", turns=5); -.. image:: docs/bolt-M4.png +.. image:: docs/imgs/bolt-M4.png :width: 30% :alt: Bolt with M4 thread @@ -47,7 +47,7 @@ A nut: nut("M12x0.5", turns=10, Douter=40); -.. image:: docs/nut-M12x0.5.png +.. image:: docs/imgs/nut-M12x0.5.png :width: 30% :alt: M12x0.5 nut diff --git a/docs/Makefile b/docs/Makefile index 57bb209..b9772d5 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,19 +1,19 @@ os = /usr/local/bin/openscad opts = -imgs = bolt-M4.png nut-M12x0.5.png nutNbolt.png +imgs = imgs/bolt-M4.png imgs/nut-M12x0.5.png imgs/nutNbolt.png .PHONY: all all: $(imgs) -bolt-M4.png: bolt.scad +imgs/bolt-M4.png: bolt.scad $(os) $(opts) --D 'type="M4"' --camera=0.49,-0.26,1.55,74.6,0.0,78.9,20 --imgsize=2048,2048 -o $@ $< -nut-M12x0.5.png: nut.scad +imgs/nut-M12x0.5.png: nut.scad $(os) $(opts) --D 'type="M12x0.5"' --D 'turns=10' --D 'Douter=16' --camera=-2.2,1.2,1.8,66,0,73,52 --imgsize=2048,2048 --projection=ortho -o $@ $< -nutNbolt.png: nutNbolt.scad +imgs/nutNbolt.png: nutNbolt.scad $(os) $(opts) --camera=-0.24,1.19,4.24,83,0,326.9,40.3 --imgsize=2048,2048 --projection=ortho -o $@ $< .PHONY: clean clean: - rm *.png + rm imgs/*.png diff --git a/img/BSPthread.jpg b/docs/imgs/BSPthread.jpg similarity index 100% rename from img/BSPthread.jpg rename to docs/imgs/BSPthread.jpg diff --git a/docs/imgs/bolt-M4.png b/docs/imgs/bolt-M4.png new file mode 100644 index 0000000..c7398ea Binary files /dev/null and b/docs/imgs/bolt-M4.png differ diff --git a/docs/imgs/nut-M12x0.5.png b/docs/imgs/nut-M12x0.5.png new file mode 100644 index 0000000..5f180b3 Binary files /dev/null and b/docs/imgs/nut-M12x0.5.png differ diff --git a/docs/imgs/nutNbolt.png b/docs/imgs/nutNbolt.png new file mode 100644 index 0000000..92e26f4 Binary files /dev/null and b/docs/imgs/nutNbolt.png differ