From 0b2149fff63b346192148b7eb334e00ad3b9283d Mon Sep 17 00:00:00 2001 From: adrianna Date: Tue, 1 Mar 2016 22:36:10 +0200 Subject: [PATCH] moved bitmaps into actual images directory and updated path in script --- .../images}/roach/eyes_1.png | Bin .../images}/roach/eyes_2.png | Bin .../images}/roach/eyes_3.png | Bin .../images}/roach/eyes_4.png | Bin .../images}/roach/roach_1.png | Bin .../images}/roach/roach_2.png | Bin .../images}/roach/roach_3.png | Bin .../images}/roach/roach_4.png | Bin .../images}/roach_21/eyes_1.png | Bin .../images}/roach_21/eyes_2.png | Bin .../images}/roach_21/eyes_3.png | Bin .../images}/roach_21/eyes_4.png | Bin .../images}/roach_21/roach_1.png | Bin .../images}/roach_21/roach_2.png | Bin .../images}/roach_21/roach_3.png | Bin .../images}/roach_21/roach_4.png | Bin .../images}/roach_32/eyes_1.png | Bin .../images}/roach_32/eyes_2.png | Bin .../images}/roach_32/eyes_3.png | Bin .../images}/roach_32/eyes_4.png | Bin .../images}/roach_32/roach_1.png | Bin .../images}/roach_32/roach_2.png | Bin .../images}/roach_32/roach_3.png | Bin .../images}/roach_32/roach_4.png | Bin .../images}/roach_nonet/eyes_1.png | Bin .../images}/roach_nonet/eyes_2.png | Bin .../images}/roach_nonet/eyes_3.png | Bin .../images}/roach_nonet/eyes_4.png | Bin .../images}/roach_nonet/roach_1.png | Bin .../images}/roach_nonet/roach_2.png | Bin .../images}/roach_nonet/roach_3.png | Bin .../images}/roach_nonet/roach_4.png | Bin .../images}/roach_quartet/eyes_1.png | Bin .../images}/roach_quartet/eyes_2.png | Bin .../images}/roach_quartet/eyes_3.png | Bin .../images}/roach_quartet/eyes_4.png | Bin .../images}/roach_quartet/roach_1.png | Bin .../images}/roach_quartet/roach_2.png | Bin .../images}/roach_quartet/roach_3.png | Bin .../images}/roach_quartet/roach_4.png | Bin sources/vector/generate_bitmaps.sh | 18 ++++++++++-------- 41 files changed, 10 insertions(+), 8 deletions(-) rename {images => koperkapel/images}/roach/eyes_1.png (100%) rename {images => koperkapel/images}/roach/eyes_2.png (100%) rename {images => koperkapel/images}/roach/eyes_3.png (100%) rename {images => koperkapel/images}/roach/eyes_4.png (100%) rename {images => koperkapel/images}/roach/roach_1.png (100%) rename {images => koperkapel/images}/roach/roach_2.png (100%) rename {images => koperkapel/images}/roach/roach_3.png (100%) rename {images => koperkapel/images}/roach/roach_4.png (100%) rename {images => koperkapel/images}/roach_21/eyes_1.png (100%) rename {images => koperkapel/images}/roach_21/eyes_2.png (100%) rename {images => koperkapel/images}/roach_21/eyes_3.png (100%) rename {images => koperkapel/images}/roach_21/eyes_4.png (100%) rename {images => koperkapel/images}/roach_21/roach_1.png (100%) rename {images => koperkapel/images}/roach_21/roach_2.png (100%) rename {images => koperkapel/images}/roach_21/roach_3.png (100%) rename {images => koperkapel/images}/roach_21/roach_4.png (100%) rename {images => koperkapel/images}/roach_32/eyes_1.png (100%) rename {images => koperkapel/images}/roach_32/eyes_2.png (100%) rename {images => koperkapel/images}/roach_32/eyes_3.png (100%) rename {images => koperkapel/images}/roach_32/eyes_4.png (100%) rename {images => koperkapel/images}/roach_32/roach_1.png (100%) rename {images => koperkapel/images}/roach_32/roach_2.png (100%) rename {images => koperkapel/images}/roach_32/roach_3.png (100%) rename {images => koperkapel/images}/roach_32/roach_4.png (100%) rename {images => koperkapel/images}/roach_nonet/eyes_1.png (100%) rename {images => koperkapel/images}/roach_nonet/eyes_2.png (100%) rename {images => koperkapel/images}/roach_nonet/eyes_3.png (100%) rename {images => koperkapel/images}/roach_nonet/eyes_4.png (100%) rename {images => koperkapel/images}/roach_nonet/roach_1.png (100%) rename {images => koperkapel/images}/roach_nonet/roach_2.png (100%) rename {images => koperkapel/images}/roach_nonet/roach_3.png (100%) rename {images => koperkapel/images}/roach_nonet/roach_4.png (100%) rename {images => koperkapel/images}/roach_quartet/eyes_1.png (100%) rename {images => koperkapel/images}/roach_quartet/eyes_2.png (100%) rename {images => koperkapel/images}/roach_quartet/eyes_3.png (100%) rename {images => koperkapel/images}/roach_quartet/eyes_4.png (100%) rename {images => koperkapel/images}/roach_quartet/roach_1.png (100%) rename {images => koperkapel/images}/roach_quartet/roach_2.png (100%) rename {images => koperkapel/images}/roach_quartet/roach_3.png (100%) rename {images => koperkapel/images}/roach_quartet/roach_4.png (100%) diff --git a/images/roach/eyes_1.png b/koperkapel/images/roach/eyes_1.png similarity index 100% rename from images/roach/eyes_1.png rename to koperkapel/images/roach/eyes_1.png diff --git a/images/roach/eyes_2.png b/koperkapel/images/roach/eyes_2.png similarity index 100% rename from images/roach/eyes_2.png rename to koperkapel/images/roach/eyes_2.png diff --git a/images/roach/eyes_3.png b/koperkapel/images/roach/eyes_3.png similarity index 100% rename from images/roach/eyes_3.png rename to koperkapel/images/roach/eyes_3.png diff --git a/images/roach/eyes_4.png b/koperkapel/images/roach/eyes_4.png similarity index 100% rename from images/roach/eyes_4.png rename to koperkapel/images/roach/eyes_4.png diff --git a/images/roach/roach_1.png b/koperkapel/images/roach/roach_1.png similarity index 100% rename from images/roach/roach_1.png rename to koperkapel/images/roach/roach_1.png diff --git a/images/roach/roach_2.png b/koperkapel/images/roach/roach_2.png similarity index 100% rename from images/roach/roach_2.png rename to koperkapel/images/roach/roach_2.png diff --git a/images/roach/roach_3.png b/koperkapel/images/roach/roach_3.png similarity index 100% rename from images/roach/roach_3.png rename to koperkapel/images/roach/roach_3.png diff --git a/images/roach/roach_4.png b/koperkapel/images/roach/roach_4.png similarity index 100% rename from images/roach/roach_4.png rename to koperkapel/images/roach/roach_4.png diff --git a/images/roach_21/eyes_1.png b/koperkapel/images/roach_21/eyes_1.png similarity index 100% rename from images/roach_21/eyes_1.png rename to koperkapel/images/roach_21/eyes_1.png diff --git a/images/roach_21/eyes_2.png b/koperkapel/images/roach_21/eyes_2.png similarity index 100% rename from images/roach_21/eyes_2.png rename to koperkapel/images/roach_21/eyes_2.png diff --git a/images/roach_21/eyes_3.png b/koperkapel/images/roach_21/eyes_3.png similarity index 100% rename from images/roach_21/eyes_3.png rename to koperkapel/images/roach_21/eyes_3.png diff --git a/images/roach_21/eyes_4.png b/koperkapel/images/roach_21/eyes_4.png similarity index 100% rename from images/roach_21/eyes_4.png rename to koperkapel/images/roach_21/eyes_4.png diff --git a/images/roach_21/roach_1.png b/koperkapel/images/roach_21/roach_1.png similarity index 100% rename from images/roach_21/roach_1.png rename to koperkapel/images/roach_21/roach_1.png diff --git a/images/roach_21/roach_2.png b/koperkapel/images/roach_21/roach_2.png similarity index 100% rename from images/roach_21/roach_2.png rename to koperkapel/images/roach_21/roach_2.png diff --git a/images/roach_21/roach_3.png b/koperkapel/images/roach_21/roach_3.png similarity index 100% rename from images/roach_21/roach_3.png rename to koperkapel/images/roach_21/roach_3.png diff --git a/images/roach_21/roach_4.png b/koperkapel/images/roach_21/roach_4.png similarity index 100% rename from images/roach_21/roach_4.png rename to koperkapel/images/roach_21/roach_4.png diff --git a/images/roach_32/eyes_1.png b/koperkapel/images/roach_32/eyes_1.png similarity index 100% rename from images/roach_32/eyes_1.png rename to koperkapel/images/roach_32/eyes_1.png diff --git a/images/roach_32/eyes_2.png b/koperkapel/images/roach_32/eyes_2.png similarity index 100% rename from images/roach_32/eyes_2.png rename to koperkapel/images/roach_32/eyes_2.png diff --git a/images/roach_32/eyes_3.png b/koperkapel/images/roach_32/eyes_3.png similarity index 100% rename from images/roach_32/eyes_3.png rename to koperkapel/images/roach_32/eyes_3.png diff --git a/images/roach_32/eyes_4.png b/koperkapel/images/roach_32/eyes_4.png similarity index 100% rename from images/roach_32/eyes_4.png rename to koperkapel/images/roach_32/eyes_4.png diff --git a/images/roach_32/roach_1.png b/koperkapel/images/roach_32/roach_1.png similarity index 100% rename from images/roach_32/roach_1.png rename to koperkapel/images/roach_32/roach_1.png diff --git a/images/roach_32/roach_2.png b/koperkapel/images/roach_32/roach_2.png similarity index 100% rename from images/roach_32/roach_2.png rename to koperkapel/images/roach_32/roach_2.png diff --git a/images/roach_32/roach_3.png b/koperkapel/images/roach_32/roach_3.png similarity index 100% rename from images/roach_32/roach_3.png rename to koperkapel/images/roach_32/roach_3.png diff --git a/images/roach_32/roach_4.png b/koperkapel/images/roach_32/roach_4.png similarity index 100% rename from images/roach_32/roach_4.png rename to koperkapel/images/roach_32/roach_4.png diff --git a/images/roach_nonet/eyes_1.png b/koperkapel/images/roach_nonet/eyes_1.png similarity index 100% rename from images/roach_nonet/eyes_1.png rename to koperkapel/images/roach_nonet/eyes_1.png diff --git a/images/roach_nonet/eyes_2.png b/koperkapel/images/roach_nonet/eyes_2.png similarity index 100% rename from images/roach_nonet/eyes_2.png rename to koperkapel/images/roach_nonet/eyes_2.png diff --git a/images/roach_nonet/eyes_3.png b/koperkapel/images/roach_nonet/eyes_3.png similarity index 100% rename from images/roach_nonet/eyes_3.png rename to koperkapel/images/roach_nonet/eyes_3.png diff --git a/images/roach_nonet/eyes_4.png b/koperkapel/images/roach_nonet/eyes_4.png similarity index 100% rename from images/roach_nonet/eyes_4.png rename to koperkapel/images/roach_nonet/eyes_4.png diff --git a/images/roach_nonet/roach_1.png b/koperkapel/images/roach_nonet/roach_1.png similarity index 100% rename from images/roach_nonet/roach_1.png rename to koperkapel/images/roach_nonet/roach_1.png diff --git a/images/roach_nonet/roach_2.png b/koperkapel/images/roach_nonet/roach_2.png similarity index 100% rename from images/roach_nonet/roach_2.png rename to koperkapel/images/roach_nonet/roach_2.png diff --git a/images/roach_nonet/roach_3.png b/koperkapel/images/roach_nonet/roach_3.png similarity index 100% rename from images/roach_nonet/roach_3.png rename to koperkapel/images/roach_nonet/roach_3.png diff --git a/images/roach_nonet/roach_4.png b/koperkapel/images/roach_nonet/roach_4.png similarity index 100% rename from images/roach_nonet/roach_4.png rename to koperkapel/images/roach_nonet/roach_4.png diff --git a/images/roach_quartet/eyes_1.png b/koperkapel/images/roach_quartet/eyes_1.png similarity index 100% rename from images/roach_quartet/eyes_1.png rename to koperkapel/images/roach_quartet/eyes_1.png diff --git a/images/roach_quartet/eyes_2.png b/koperkapel/images/roach_quartet/eyes_2.png similarity index 100% rename from images/roach_quartet/eyes_2.png rename to koperkapel/images/roach_quartet/eyes_2.png diff --git a/images/roach_quartet/eyes_3.png b/koperkapel/images/roach_quartet/eyes_3.png similarity index 100% rename from images/roach_quartet/eyes_3.png rename to koperkapel/images/roach_quartet/eyes_3.png diff --git a/images/roach_quartet/eyes_4.png b/koperkapel/images/roach_quartet/eyes_4.png similarity index 100% rename from images/roach_quartet/eyes_4.png rename to koperkapel/images/roach_quartet/eyes_4.png diff --git a/images/roach_quartet/roach_1.png b/koperkapel/images/roach_quartet/roach_1.png similarity index 100% rename from images/roach_quartet/roach_1.png rename to koperkapel/images/roach_quartet/roach_1.png diff --git a/images/roach_quartet/roach_2.png b/koperkapel/images/roach_quartet/roach_2.png similarity index 100% rename from images/roach_quartet/roach_2.png rename to koperkapel/images/roach_quartet/roach_2.png diff --git a/images/roach_quartet/roach_3.png b/koperkapel/images/roach_quartet/roach_3.png similarity index 100% rename from images/roach_quartet/roach_3.png rename to koperkapel/images/roach_quartet/roach_3.png diff --git a/images/roach_quartet/roach_4.png b/koperkapel/images/roach_quartet/roach_4.png similarity index 100% rename from images/roach_quartet/roach_4.png rename to koperkapel/images/roach_quartet/roach_4.png 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 } -- 2.34.1