salfter/snappy-reprap
1
0
Fork 0
mirror of https://github.com/revarbat/snappy-reprap.git synced 2025-11-02 15:46:45 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed generation of wiki for new layout.

Browse Source
This commit is contained in:
Revar Desmera
2017-03-30 05:13:48 -07:00
parent 70e5ce205b
commit f578b5998a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Makefile
View File

@@ -3,7 +3,7 @@ CONVERT=convert
PARTFILES=$(sort $(wildcard *_parts.scad)) PARTFILES=$(sort $(wildcard *_parts.scad))
TARGETS=$(patsubst %.scad,STLs/%.stl,${PARTFILES}) TARGETS=$(patsubst %.scad,STLs/%.stl,${PARTFILES})
ROTFILES=$(shell seq -f 'wiki/snappy_rot%03g.png' 0 10 359.99) ROTFILES=$(shell seq -f 'wiki/v1.1-snappy_rot%03g.png' 0 10 359.99)
ASM_MODULES=$(shell grep 'module [a-z0-9_]*_assembly' full_assembly.scad | sed 's/^module //' | sed 's/[^a-z0-9_].*$$//' | sed '1!G;h;$$!d') ASM_MODULES=$(shell grep 'module [a-z0-9_]*_assembly' full_assembly.scad | sed 's/^module //' | sed 's/[^a-z0-9_].*$$//' | sed '1!G;h;$$!d')
ASM_BEFORE_TARGETS=$(patsubst %,docs/assembly/%_before.png,${ASM_MODULES}) ASM_BEFORE_TARGETS=$(patsubst %,docs/assembly/%_before.png,${ASM_MODULES})
ASM_AFTER_TARGETS=$(patsubst %,docs/assembly/%_after.png,${ASM_MODULES}) ASM_AFTER_TARGETS=$(patsubst %,docs/assembly/%_after.png,${ASM_MODULES})
@@ -19,13 +19,13 @@ pull:
git pull --recurse-submodules git pull --recurse-submodules
clean: clean:
rm -f tmp_*.png tmp_*.scad wiki/snappy_rot*.png rm -f tmp_*.png tmp_*.scad wiki/v1.1-snappy_rot*.png
cleaner: clean cleaner: clean
rm -f ${TARGETS} rm -f ${TARGETS}
cleanwiki: cleanwiki:
rm -f wiki/snappy_*.gif wiki/snappy_*.png wiki/*_parts.png rm -f wiki/v1.1-snappy_*.gif wiki/v1.1-snappy_*.png wiki/v1.1-*_parts.png
instructions: docs/assembly/index.html instructions: docs/assembly/index.html
@@ -55,38 +55,38 @@ ${ASM_AFTER_TARGETS}: full_assembly.scad
rm -f $(subst docs/assembly/,tmp_asm2_,$@) $(patsubst docs/assembly/%.png,tmp_%.scad,$@) rm -f $(subst docs/assembly/,tmp_asm2_,$@) $(patsubst docs/assembly/%.png,tmp_%.scad,$@)
${ROTFILES}: full_assembly.scad $(wildcard *.scad) ${ROTFILES}: full_assembly.scad $(wildcard *.scad)
${OPENSCAD} -o $(subst wiki/,tmp_,$@) --imgsize=1024,1024 \ ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --imgsize=1024,1024 \
--projection=p --csglimit=2000000 \ --projection=p --csglimit=2000000 \
-D '$$t=$(shell echo $(patsubst wiki/snappy_rot%.png,%/360.0,$@) | bc -l)' \ -D '$$t=$(shell echo $(patsubst wiki/v1.1-snappy_rot%.png,%/360.0,$@) | bc -l)' \
-D '$$do_prerender=false' --camera=0,0,255,65,0,30,2200 $< -D '$$do_prerender=false' --camera=0,0,255,65,0,30,2200 $<
${CONVERT} -strip -resize 512x512 $(subst wiki/,tmp_,$@) $@ ${CONVERT} -strip -resize 512x512 $(subst wiki/v1.1-,tmp_,$@) $@
rm -f $(subst wiki/,tmp_,$@) rm -f $(subst wiki/v1.1-,tmp_,$@)
wiki/%.png: %.scad config.scad GDMUtils.scad wiki/v1.1-%.png: %.scad config.scad GDMUtils.scad
${OPENSCAD} -o $(subst wiki/,tmp_,$@) --render --imgsize=3200,3200 \ ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --render --imgsize=3200,3200 \
--projection=p --csglimit=2000000 --camera=0,0,50,65,0,30,2000 $< --projection=p --csglimit=2000000 --camera=0,0,50,65,0,30,2000 $<
${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/,tmp_,$@) $@ ${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/v1.1-,tmp_,$@) $@
rm -f $(subst wiki/,tmp_,$@) rm -f $(subst wiki/v1.1-,tmp_,$@)
wiki/snappy_full.png: full_assembly.scad $(wildcard *.scad) wiki/v1.1-snappy_full.png: full_assembly.scad $(wildcard *.scad)
${OPENSCAD} -o $(subst wiki/,tmp_,$@) --imgsize=3200,3200 --projection=p \ ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --imgsize=3200,3200 --projection=p \
--csglimit=2000000 --camera=0,0,245,65,0,30,3000 -D '$$t=0.5' $< --csglimit=2000000 --camera=0,0,245,65,0,30,3000 -D '$$t=0.5' $<
${CONVERT} -trim -resize 800x800 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/,tmp_,$@) $@ ${CONVERT} -trim -resize 800x800 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/v1.1-,tmp_,$@) $@
rm -f $(subst wiki/,tmp_,$@) rm -f $(subst wiki/v1.1-,tmp_,$@)
wiki/snappy_small.png: wiki/snappy_full.png wiki/v1.1-snappy_small.png: wiki/v1.1-snappy_full.png
${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $< $@ ${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $< $@
wiki/snappy_animated.gif: ${ROTFILES} wiki/v1.1-snappy_animated.gif: ${ROTFILES}
${CONVERT} -delay 10 -loop 0 ${ROTFILES} $@ ${CONVERT} -delay 10 -loop 0 ${ROTFILES} $@
rm -f ${ROTFILES} rm -f ${ROTFILES}
wiki/snappy_anim_small.gif: wiki/snappy_animated.gif wiki/v1.1-snappy_anim_small.gif: wiki/v1.1-snappy_animated.gif
${CONVERT} -resize 200x200 $< $@ ${CONVERT} -resize 200x200 $< $@
renderparts: $(patsubst %.scad,wiki/%.png,${PARTFILES}) renderparts: $(patsubst %.scad,wiki/v1.1-%.png,${PARTFILES})
rendering: wiki/snappy_full.png wiki/snappy_small.png rendering: wiki/v1.1-snappy_full.png wiki/v1.1-snappy_small.png
animation: wiki/snappy_animated.gif wiki/snappy_anim_small.gif animation: wiki/v1.1-snappy_animated.gif wiki/v1.1-snappy_anim_small.gif
wiki: rendering renderparts animation wiki: rendering renderparts animation