From: adrianna Date: Tue, 1 Mar 2016 20:36:10 +0000 (+0200) Subject: moved bitmaps into actual images directory and updated path in script X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=commitdiff_plain;h=0b2149fff63b346192148b7eb334e00ad3b9283d moved bitmaps into actual images directory and updated path in script --- diff --git a/images/roach/eyes_1.png b/images/roach/eyes_1.png deleted file mode 100644 index c77fa0c..0000000 Binary files a/images/roach/eyes_1.png and /dev/null differ diff --git a/images/roach/eyes_2.png b/images/roach/eyes_2.png deleted file mode 100644 index 3545635..0000000 Binary files a/images/roach/eyes_2.png and /dev/null differ diff --git a/images/roach/eyes_3.png b/images/roach/eyes_3.png deleted file mode 100644 index c77fa0c..0000000 Binary files a/images/roach/eyes_3.png and /dev/null differ diff --git a/images/roach/eyes_4.png b/images/roach/eyes_4.png deleted file mode 100644 index 6273074..0000000 Binary files a/images/roach/eyes_4.png and /dev/null differ diff --git a/images/roach/roach_1.png b/images/roach/roach_1.png deleted file mode 100644 index 7227eba..0000000 Binary files a/images/roach/roach_1.png and /dev/null differ diff --git a/images/roach/roach_2.png b/images/roach/roach_2.png deleted file mode 100644 index 4e4f5d6..0000000 Binary files a/images/roach/roach_2.png and /dev/null differ diff --git a/images/roach/roach_3.png b/images/roach/roach_3.png deleted file mode 100644 index c967f99..0000000 Binary files a/images/roach/roach_3.png and /dev/null differ diff --git a/images/roach/roach_4.png b/images/roach/roach_4.png deleted file mode 100644 index 314e742..0000000 Binary files a/images/roach/roach_4.png and /dev/null differ diff --git a/images/roach_21/eyes_1.png b/images/roach_21/eyes_1.png deleted file mode 100644 index 4b964ee..0000000 Binary files a/images/roach_21/eyes_1.png and /dev/null differ diff --git a/images/roach_21/eyes_2.png b/images/roach_21/eyes_2.png deleted file mode 100644 index 71ee549..0000000 Binary files a/images/roach_21/eyes_2.png and /dev/null differ diff --git a/images/roach_21/eyes_3.png b/images/roach_21/eyes_3.png deleted file mode 100644 index 4b964ee..0000000 Binary files a/images/roach_21/eyes_3.png and /dev/null differ diff --git a/images/roach_21/eyes_4.png b/images/roach_21/eyes_4.png deleted file mode 100644 index 24a72d8..0000000 Binary files a/images/roach_21/eyes_4.png and /dev/null differ diff --git a/images/roach_21/roach_1.png b/images/roach_21/roach_1.png deleted file mode 100644 index e38ccb7..0000000 Binary files a/images/roach_21/roach_1.png and /dev/null differ diff --git a/images/roach_21/roach_2.png b/images/roach_21/roach_2.png deleted file mode 100644 index 4ef0c77..0000000 Binary files a/images/roach_21/roach_2.png and /dev/null differ diff --git a/images/roach_21/roach_3.png b/images/roach_21/roach_3.png deleted file mode 100644 index f8fb51b..0000000 Binary files a/images/roach_21/roach_3.png and /dev/null differ diff --git a/images/roach_21/roach_4.png b/images/roach_21/roach_4.png deleted file mode 100644 index e8ad8d3..0000000 Binary files a/images/roach_21/roach_4.png and /dev/null differ diff --git a/images/roach_32/eyes_1.png b/images/roach_32/eyes_1.png deleted file mode 100644 index c6bc80f..0000000 Binary files a/images/roach_32/eyes_1.png and /dev/null differ diff --git a/images/roach_32/eyes_2.png b/images/roach_32/eyes_2.png deleted file mode 100644 index 4132fe1..0000000 Binary files a/images/roach_32/eyes_2.png and /dev/null differ diff --git a/images/roach_32/eyes_3.png b/images/roach_32/eyes_3.png deleted file mode 100644 index c6bc80f..0000000 Binary files a/images/roach_32/eyes_3.png and /dev/null differ diff --git a/images/roach_32/eyes_4.png b/images/roach_32/eyes_4.png deleted file mode 100644 index 7b38368..0000000 Binary files a/images/roach_32/eyes_4.png and /dev/null differ diff --git a/images/roach_32/roach_1.png b/images/roach_32/roach_1.png deleted file mode 100644 index 6dd6516..0000000 Binary files a/images/roach_32/roach_1.png and /dev/null differ diff --git a/images/roach_32/roach_2.png b/images/roach_32/roach_2.png deleted file mode 100644 index b293fc7..0000000 Binary files a/images/roach_32/roach_2.png and /dev/null differ diff --git a/images/roach_32/roach_3.png b/images/roach_32/roach_3.png deleted file mode 100644 index 6a9237d..0000000 Binary files a/images/roach_32/roach_3.png and /dev/null differ diff --git a/images/roach_32/roach_4.png b/images/roach_32/roach_4.png deleted file mode 100644 index ca3bffa..0000000 Binary files a/images/roach_32/roach_4.png and /dev/null differ diff --git a/images/roach_nonet/eyes_1.png b/images/roach_nonet/eyes_1.png deleted file mode 100644 index ff82b8e..0000000 Binary files a/images/roach_nonet/eyes_1.png and /dev/null differ diff --git a/images/roach_nonet/eyes_2.png b/images/roach_nonet/eyes_2.png deleted file mode 100644 index 1ed3637..0000000 Binary files a/images/roach_nonet/eyes_2.png and /dev/null differ diff --git a/images/roach_nonet/eyes_3.png b/images/roach_nonet/eyes_3.png deleted file mode 100644 index 7b7f304..0000000 Binary files a/images/roach_nonet/eyes_3.png and /dev/null differ diff --git a/images/roach_nonet/eyes_4.png b/images/roach_nonet/eyes_4.png deleted file mode 100644 index 8c584f5..0000000 Binary files a/images/roach_nonet/eyes_4.png and /dev/null differ diff --git a/images/roach_nonet/roach_1.png b/images/roach_nonet/roach_1.png deleted file mode 100644 index aa357aa..0000000 Binary files a/images/roach_nonet/roach_1.png and /dev/null differ diff --git a/images/roach_nonet/roach_2.png b/images/roach_nonet/roach_2.png deleted file mode 100644 index 4d1d8ef..0000000 Binary files a/images/roach_nonet/roach_2.png and /dev/null differ diff --git a/images/roach_nonet/roach_3.png b/images/roach_nonet/roach_3.png deleted file mode 100644 index f0f1160..0000000 Binary files a/images/roach_nonet/roach_3.png and /dev/null differ diff --git a/images/roach_nonet/roach_4.png b/images/roach_nonet/roach_4.png deleted file mode 100644 index d830eab..0000000 Binary files a/images/roach_nonet/roach_4.png and /dev/null differ diff --git a/images/roach_quartet/eyes_1.png b/images/roach_quartet/eyes_1.png deleted file mode 100644 index 1ee83f6..0000000 Binary files a/images/roach_quartet/eyes_1.png and /dev/null differ diff --git a/images/roach_quartet/eyes_2.png b/images/roach_quartet/eyes_2.png deleted file mode 100644 index b1df069..0000000 Binary files a/images/roach_quartet/eyes_2.png and /dev/null differ diff --git a/images/roach_quartet/eyes_3.png b/images/roach_quartet/eyes_3.png deleted file mode 100644 index d28b5ac..0000000 Binary files a/images/roach_quartet/eyes_3.png and /dev/null differ diff --git a/images/roach_quartet/eyes_4.png b/images/roach_quartet/eyes_4.png deleted file mode 100644 index 5af7a66..0000000 Binary files a/images/roach_quartet/eyes_4.png and /dev/null differ diff --git a/images/roach_quartet/roach_1.png b/images/roach_quartet/roach_1.png deleted file mode 100644 index 9654f1f..0000000 Binary files a/images/roach_quartet/roach_1.png and /dev/null differ diff --git a/images/roach_quartet/roach_2.png b/images/roach_quartet/roach_2.png deleted file mode 100644 index dbb1ac0..0000000 Binary files a/images/roach_quartet/roach_2.png and /dev/null differ diff --git a/images/roach_quartet/roach_3.png b/images/roach_quartet/roach_3.png deleted file mode 100644 index 0ac48e4..0000000 Binary files a/images/roach_quartet/roach_3.png and /dev/null differ diff --git a/images/roach_quartet/roach_4.png b/images/roach_quartet/roach_4.png deleted file mode 100644 index 66d08c6..0000000 Binary files a/images/roach_quartet/roach_4.png and /dev/null differ diff --git a/koperkapel/images/roach/eyes_1.png b/koperkapel/images/roach/eyes_1.png new file mode 100644 index 0000000..c77fa0c Binary files /dev/null and b/koperkapel/images/roach/eyes_1.png differ diff --git a/koperkapel/images/roach/eyes_2.png b/koperkapel/images/roach/eyes_2.png new file mode 100644 index 0000000..3545635 Binary files /dev/null and b/koperkapel/images/roach/eyes_2.png differ diff --git a/koperkapel/images/roach/eyes_3.png b/koperkapel/images/roach/eyes_3.png new file mode 100644 index 0000000..c77fa0c Binary files /dev/null and b/koperkapel/images/roach/eyes_3.png differ diff --git a/koperkapel/images/roach/eyes_4.png b/koperkapel/images/roach/eyes_4.png new file mode 100644 index 0000000..6273074 Binary files /dev/null and b/koperkapel/images/roach/eyes_4.png differ diff --git a/koperkapel/images/roach/roach_1.png b/koperkapel/images/roach/roach_1.png new file mode 100644 index 0000000..7227eba Binary files /dev/null and b/koperkapel/images/roach/roach_1.png differ diff --git a/koperkapel/images/roach/roach_2.png b/koperkapel/images/roach/roach_2.png new file mode 100644 index 0000000..4e4f5d6 Binary files /dev/null and b/koperkapel/images/roach/roach_2.png differ diff --git a/koperkapel/images/roach/roach_3.png b/koperkapel/images/roach/roach_3.png new file mode 100644 index 0000000..c967f99 Binary files /dev/null and b/koperkapel/images/roach/roach_3.png differ diff --git a/koperkapel/images/roach/roach_4.png b/koperkapel/images/roach/roach_4.png new file mode 100644 index 0000000..314e742 Binary files /dev/null and b/koperkapel/images/roach/roach_4.png differ diff --git a/koperkapel/images/roach_21/eyes_1.png b/koperkapel/images/roach_21/eyes_1.png new file mode 100644 index 0000000..4b964ee Binary files /dev/null and b/koperkapel/images/roach_21/eyes_1.png differ diff --git a/koperkapel/images/roach_21/eyes_2.png b/koperkapel/images/roach_21/eyes_2.png new file mode 100644 index 0000000..71ee549 Binary files /dev/null and b/koperkapel/images/roach_21/eyes_2.png differ diff --git a/koperkapel/images/roach_21/eyes_3.png b/koperkapel/images/roach_21/eyes_3.png new file mode 100644 index 0000000..4b964ee Binary files /dev/null and b/koperkapel/images/roach_21/eyes_3.png differ diff --git a/koperkapel/images/roach_21/eyes_4.png b/koperkapel/images/roach_21/eyes_4.png new file mode 100644 index 0000000..24a72d8 Binary files /dev/null and b/koperkapel/images/roach_21/eyes_4.png differ diff --git a/koperkapel/images/roach_21/roach_1.png b/koperkapel/images/roach_21/roach_1.png new file mode 100644 index 0000000..e38ccb7 Binary files /dev/null and b/koperkapel/images/roach_21/roach_1.png differ diff --git a/koperkapel/images/roach_21/roach_2.png b/koperkapel/images/roach_21/roach_2.png new file mode 100644 index 0000000..4ef0c77 Binary files /dev/null and b/koperkapel/images/roach_21/roach_2.png differ diff --git a/koperkapel/images/roach_21/roach_3.png b/koperkapel/images/roach_21/roach_3.png new file mode 100644 index 0000000..f8fb51b Binary files /dev/null and b/koperkapel/images/roach_21/roach_3.png differ diff --git a/koperkapel/images/roach_21/roach_4.png b/koperkapel/images/roach_21/roach_4.png new file mode 100644 index 0000000..e8ad8d3 Binary files /dev/null and b/koperkapel/images/roach_21/roach_4.png differ diff --git a/koperkapel/images/roach_32/eyes_1.png b/koperkapel/images/roach_32/eyes_1.png new file mode 100644 index 0000000..c6bc80f Binary files /dev/null and b/koperkapel/images/roach_32/eyes_1.png differ diff --git a/koperkapel/images/roach_32/eyes_2.png b/koperkapel/images/roach_32/eyes_2.png new file mode 100644 index 0000000..4132fe1 Binary files /dev/null and b/koperkapel/images/roach_32/eyes_2.png differ diff --git a/koperkapel/images/roach_32/eyes_3.png b/koperkapel/images/roach_32/eyes_3.png new file mode 100644 index 0000000..c6bc80f Binary files /dev/null and b/koperkapel/images/roach_32/eyes_3.png differ diff --git a/koperkapel/images/roach_32/eyes_4.png b/koperkapel/images/roach_32/eyes_4.png new file mode 100644 index 0000000..7b38368 Binary files /dev/null and b/koperkapel/images/roach_32/eyes_4.png differ diff --git a/koperkapel/images/roach_32/roach_1.png b/koperkapel/images/roach_32/roach_1.png new file mode 100644 index 0000000..6dd6516 Binary files /dev/null and b/koperkapel/images/roach_32/roach_1.png differ diff --git a/koperkapel/images/roach_32/roach_2.png b/koperkapel/images/roach_32/roach_2.png new file mode 100644 index 0000000..b293fc7 Binary files /dev/null and b/koperkapel/images/roach_32/roach_2.png differ diff --git a/koperkapel/images/roach_32/roach_3.png b/koperkapel/images/roach_32/roach_3.png new file mode 100644 index 0000000..6a9237d Binary files /dev/null and b/koperkapel/images/roach_32/roach_3.png differ diff --git a/koperkapel/images/roach_32/roach_4.png b/koperkapel/images/roach_32/roach_4.png new file mode 100644 index 0000000..ca3bffa Binary files /dev/null and b/koperkapel/images/roach_32/roach_4.png differ diff --git a/koperkapel/images/roach_nonet/eyes_1.png b/koperkapel/images/roach_nonet/eyes_1.png new file mode 100644 index 0000000..ff82b8e Binary files /dev/null and b/koperkapel/images/roach_nonet/eyes_1.png differ diff --git a/koperkapel/images/roach_nonet/eyes_2.png b/koperkapel/images/roach_nonet/eyes_2.png new file mode 100644 index 0000000..1ed3637 Binary files /dev/null and b/koperkapel/images/roach_nonet/eyes_2.png differ diff --git a/koperkapel/images/roach_nonet/eyes_3.png b/koperkapel/images/roach_nonet/eyes_3.png new file mode 100644 index 0000000..7b7f304 Binary files /dev/null and b/koperkapel/images/roach_nonet/eyes_3.png differ diff --git a/koperkapel/images/roach_nonet/eyes_4.png b/koperkapel/images/roach_nonet/eyes_4.png new file mode 100644 index 0000000..8c584f5 Binary files /dev/null and b/koperkapel/images/roach_nonet/eyes_4.png differ diff --git a/koperkapel/images/roach_nonet/roach_1.png b/koperkapel/images/roach_nonet/roach_1.png new file mode 100644 index 0000000..aa357aa Binary files /dev/null and b/koperkapel/images/roach_nonet/roach_1.png differ diff --git a/koperkapel/images/roach_nonet/roach_2.png b/koperkapel/images/roach_nonet/roach_2.png new file mode 100644 index 0000000..4d1d8ef Binary files /dev/null and b/koperkapel/images/roach_nonet/roach_2.png differ diff --git a/koperkapel/images/roach_nonet/roach_3.png b/koperkapel/images/roach_nonet/roach_3.png new file mode 100644 index 0000000..f0f1160 Binary files /dev/null and b/koperkapel/images/roach_nonet/roach_3.png differ diff --git a/koperkapel/images/roach_nonet/roach_4.png b/koperkapel/images/roach_nonet/roach_4.png new file mode 100644 index 0000000..d830eab Binary files /dev/null and b/koperkapel/images/roach_nonet/roach_4.png differ diff --git a/koperkapel/images/roach_quartet/eyes_1.png b/koperkapel/images/roach_quartet/eyes_1.png new file mode 100644 index 0000000..1ee83f6 Binary files /dev/null and b/koperkapel/images/roach_quartet/eyes_1.png differ diff --git a/koperkapel/images/roach_quartet/eyes_2.png b/koperkapel/images/roach_quartet/eyes_2.png new file mode 100644 index 0000000..b1df069 Binary files /dev/null and b/koperkapel/images/roach_quartet/eyes_2.png differ diff --git a/koperkapel/images/roach_quartet/eyes_3.png b/koperkapel/images/roach_quartet/eyes_3.png new file mode 100644 index 0000000..d28b5ac Binary files /dev/null and b/koperkapel/images/roach_quartet/eyes_3.png differ diff --git a/koperkapel/images/roach_quartet/eyes_4.png b/koperkapel/images/roach_quartet/eyes_4.png new file mode 100644 index 0000000..5af7a66 Binary files /dev/null and b/koperkapel/images/roach_quartet/eyes_4.png differ diff --git a/koperkapel/images/roach_quartet/roach_1.png b/koperkapel/images/roach_quartet/roach_1.png new file mode 100644 index 0000000..9654f1f Binary files /dev/null and b/koperkapel/images/roach_quartet/roach_1.png differ diff --git a/koperkapel/images/roach_quartet/roach_2.png b/koperkapel/images/roach_quartet/roach_2.png new file mode 100644 index 0000000..dbb1ac0 Binary files /dev/null and b/koperkapel/images/roach_quartet/roach_2.png differ diff --git a/koperkapel/images/roach_quartet/roach_3.png b/koperkapel/images/roach_quartet/roach_3.png new file mode 100644 index 0000000..0ac48e4 Binary files /dev/null and b/koperkapel/images/roach_quartet/roach_3.png differ diff --git a/koperkapel/images/roach_quartet/roach_4.png b/koperkapel/images/roach_quartet/roach_4.png new file mode 100644 index 0000000..66d08c6 Binary files /dev/null and b/koperkapel/images/roach_quartet/roach_4.png differ diff --git a/sources/vector/generate_bitmaps.sh b/sources/vector/generate_bitmaps.sh index f303706..af9d370 100755 --- a/sources/vector/generate_bitmaps.sh +++ b/sources/vector/generate_bitmaps.sh @@ -2,12 +2,14 @@ # Simple generation of 64x64 tiles +imgdir=../../koperkapel/images + for dir in roach do - mkdir -p ../../images/$dir + mkdir -p ${imgdir}/$dir for x in $dir/* do - inkscape -z -e ../../images/${x%.*}.png -w 64 -h 64 $x + inkscape -z -e ${imgdir}/${x%.*}.png -w 64 -h 64 $x done done @@ -15,23 +17,23 @@ done for size in 32 21 do - mkdir -p ../../images/roach_${size} + mkdir -p ${imgdir}/roach_${size} for x in roach/* do xbase=`basename $x` - inkscape -z -e ../../images/roach_${size}/${xbase%.*}.png -w ${size} -h ${size} $x + inkscape -z -e ${imgdir}/roach_${size}/${xbase%.*}.png -w ${size} -h ${size} $x done done # Roach quartet -mkdir -p ../../images/roach_quartet +mkdir -p ${imgdir}/roach_quartet function quartet_tile { for tile in roach eyes do - montage ../../images/roach_32/${tile}_${1}.png ../../images/roach_32/${tile}_${2}.png ../../images/roach_32/${tile}_${3}.png ../../images/roach_32/${tile}_${4}.png -geometry -10+0 -background none ../../images/roach_quartet/${tile}_${1}.png + montage ${imgdir}/roach_32/${tile}_${1}.png ${imgdir}/roach_32/${tile}_${2}.png ${imgdir}/roach_32/${tile}_${3}.png ${imgdir}/roach_32/${tile}_${4}.png -geometry -10+0 -background none ${imgdir}/roach_quartet/${tile}_${1}.png done } @@ -42,12 +44,12 @@ quartet_tile 4 1 2 3 # Roach nonet -mkdir -p ../../images/roach_nonet +mkdir -p ${imgdir}/roach_nonet function nonet_tile { for tile in roach eyes do - montage ../../images/roach_21/${tile}_${1}.png ../../images/roach_21/${tile}_${2}.png ../../images/roach_21/${tile}_${3}.png ../../images/roach_21/${tile}_${4}.png ../../images/roach_21/${tile}_${1}.png ../../images/roach_21/${tile}_${2}.png ../../images/roach_21/${tile}_${3}.png ../../images/roach_21/${tile}_${4}.png ../../images/roach_21/${tile}_${1}.png -geometry +0+0 -background none - | convert - -background none -gravity southeast -splice 1x1 ../../images/roach_nonet/${tile}_${1}.png + montage ${imgdir}/roach_21/${tile}_${1}.png ${imgdir}/roach_21/${tile}_${2}.png ${imgdir}/roach_21/${tile}_${3}.png ${imgdir}/roach_21/${tile}_${4}.png ${imgdir}/roach_21/${tile}_${1}.png ${imgdir}/roach_21/${tile}_${2}.png ${imgdir}/roach_21/${tile}_${3}.png ${imgdir}/roach_21/${tile}_${4}.png ${imgdir}/roach_21/${tile}_${1}.png -geometry +0+0 -background none - | convert - -background none -gravity southeast -splice 1x1 ${imgdir}/roach_nonet/${tile}_${1}.png done }