diff options
| -rwxr-xr-x | nekowatchlet/original-resources/makeatlas.sh | 6 | ||||
| -rw-r--r-- | nekowatchlet/res/makeatlas.sh | 32 |
2 files changed, 3 insertions, 35 deletions
diff --git a/nekowatchlet/original-resources/makeatlas.sh b/nekowatchlet/original-resources/makeatlas.sh index e04a50f..60449ae 100755 --- a/nekowatchlet/original-resources/makeatlas.sh +++ b/nekowatchlet/original-resources/makeatlas.sh @@ -12,7 +12,7 @@ do if [[ $i =~ ^([a-z]+)[1-9].png ]] then stem=${BASH_REMATCH[1]} - output=atlas/$stem.png + output=$stem.png.tmp if [[ $atlasfiles != *$output* ]] then montage $stem?.png -geometry 32x32 $output @@ -22,11 +22,11 @@ do fi done -montage $atlasfiles -geometry 64x32+0+0 -gravity NorthWest -tile 1x atlas/atlas.png +montage $atlasfiles -geometry 64x32+0+0 -gravity NorthWest -tile 1x atlas.png rm -f $atlasfiles -echo $stems | tr ' ' '\n' > atlas/atlas.txt +echo $stems | tr ' ' '\n' > atlas.txt exit 0 diff --git a/nekowatchlet/res/makeatlas.sh b/nekowatchlet/res/makeatlas.sh deleted file mode 100644 index 60449ae..0000000 --- a/nekowatchlet/res/makeatlas.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -set -e - -allfiles=$(echo *.png | sort) -atlasfiles="" -stems="" - -for i in $allfiles -do - echo $i - if [[ $i =~ ^([a-z]+)[1-9].png ]] - then - stem=${BASH_REMATCH[1]} - output=$stem.png.tmp - if [[ $atlasfiles != *$output* ]] - then - montage $stem?.png -geometry 32x32 $output - atlasfiles="$atlasfiles $output" - stems="$stems $stem" - fi - fi -done - -montage $atlasfiles -geometry 64x32+0+0 -gravity NorthWest -tile 1x atlas.png - -rm -f $atlasfiles - -echo $stems | tr ' ' '\n' > atlas.txt - -exit 0 - |