X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk-img.git;a=blobdiff_plain;f=bin%2Fspriter.sh;h=1ced8ca418c61df67d4f69e468ca0b6ec36c54b3;hp=f8df9dd33d7f069e7304e9cd1a400121add342c2;hb=80162d45880bee6dd6e29059ec9a6772f8fb4d63;hpb=8ac36a06471cfdf2f0f43d1f350e2ba38a65e471

diff --git a/bin/spriter.sh b/bin/spriter.sh
index f8df9dd..1ced8ca 100755
--- a/bin/spriter.sh
+++ b/bin/spriter.sh
@@ -5,24 +5,28 @@
 # set -x
 
 
-if [ $# -ne 3 -o "$1" = "-h" -o "$1" = "--help" ]; then
-    echo "$0 <folder_in> <suffix> <file_out_without_extension>"
+if [ $# -ne 2 -o "$1" = "-h" -o "$1" = "--help" ]; then
+    echo "$0 <folder_in> <deck>"
     exit 1
 fi
 fold=$1
-sfx=$2
-fou=$3
+deck=$2
 
-w=$(identify -format "%w" ${fold}/00${sfx}.png)
-h=$(identify -format "%h" ${fold}/00${sfx}.png)
+fold_in="${fold}/${deck}_tmp"
+fold_ou="${fold}/${deck}_out"
 
-convert -size $((w * 9))x$((h * 5)) xc:none ${fou}${sfx}_bg.png
-convert -size $((h * 9))x$((w * 5)) xc:none ${fou}${sfx}_oriz_bg.png
+# sfx=$2
 
-convert -size ${w}x${h} xc:none ${fou}${sfx}_empty.png
-convert -size ${h}x${w} xc:none ${fou}${sfx}_empty_ea.png
-cp ${fou}${sfx}_empty_ea.png ${fou}${sfx}_empty_we.png
-cssname="${fou}${sfx}.css"
+w=$(identify -format "%w" ${fold_in}/00.png)
+h=$(identify -format "%h" ${fold_in}/00.png)
+
+convert -size $((w * 9))x$((h * 5)) xc:none ${fold_in}/${deck}_bg.png
+convert -size $((h * 9))x$((w * 5)) xc:none ${fold_in}/${deck}_oriz_bg.png
+
+convert -size ${w}x${h} xc:none ${fold_ou}/cards_${deck}_empty.png
+convert -size ${h}x${w} xc:none ${fold_ou}/cards_${deck}_empty_ea.png
+cp ${fold_ou}/cards_${deck}_empty_ea.png ${fold_ou}/cards_${deck}_empty_we.png
+cssname="${fold_ou}/cards_${deck}.css"
 rm -f $cssname
 touch $cssname
 
@@ -31,7 +35,7 @@ for direction in "" "_ea" "_we"; do
     if [ "$direction" != "" ]; then
         horiz_sfx="_oriz"
     fi
-    argz="${fou}${sfx}${horiz_sfx}_bg.png"
+    argz="${fold_in}/${deck}${horiz_sfx}_bg.png"
 
     for seed in 0 1 2 3 4; do
         for card in $(seq 0 9); do
@@ -47,7 +51,7 @@ for direction in "" "_ea" "_we"; do
             if [ "$card_id" = "40" ]; then
                 card_id="cover"
             fi
-            card_url=$(echo "$fou" | sed 's@.*/\([^/]\+/[^/]\+$\)@\1@g')
+            card_url="img/cards_${deck}"
             cat <<EOF >> $cssname
 img[data-card-id="${card_id}${direction}"] {
     background: url('${card_url}${direction}.png') -${x}px -${y}px;
@@ -55,18 +59,24 @@ img[data-card-id="${card_id}${direction}"] {
 
 EOF
             
-            fin_no=$(printf "%s/%02d%s.png" "$fold" "$((seed * 10 + card))" "$sfx")
-            fin=$(printf "%s/%02d%s%s.png" "$fold" "$((seed * 10 + card))" "$sfx" "$direction")
-            if [ $seed -lt 4 ]; then
+            if [ "$card_id" = "40" ]; then
+                fin_no=$(printf "%s/%s_src/cover${direction}.png" "$fold_in" "$deck" "$((seed * 10 + card))")
+                fin=$(printf "%s/%02d%s.png" "$fold_in" "$((seed * 10 + card))" "$direction")
                 if [ "$direction" == "" ]; then
-                    :
-                elif [ "$direction" == "_ea" ]; then
-                    convert -rotate 270 "$fin_no" "$fin"
-                elif [ "$direction" == "_we" ]; then
-                    convert -rotate 90 "$fin_no" "$fin"                
-                else
-                    exit 1
+                    cp "$fin_no" "$fin"
                 fi
+            else
+                fin_no=$(printf "%s/%02d.png" "$fold_in" "$((seed * 10 + card))")
+                fin=$(printf "%s/%02d%s.png" "$fold_in" "$((seed * 10 + card))" "$direction")
+            fi
+            if [ "$direction" == "" ]; then
+                :
+            elif [ "$direction" == "_ea" ]; then
+                convert -rotate 270 "$fin_no" "$fin"
+            elif [ "$direction" == "_we" ]; then
+                convert -rotate 90 "$fin_no" "$fin"                
+            else
+                exit 1
             fi
             
             argz="$argz $fin -geometry +${x}+${y} -composite "
@@ -75,10 +85,11 @@ EOF
             fi
         done
     done
-    # full color: argz="$argz ${fou}${sfx}.png"
-    argz="$argz +dither -colors 255 ${fou}${sfx}${direction}.png"
+    # full color: argz="$argz ${fold_ou}${deck}.png"
+    full_out="${fold_ou}/cards_${deck}${direction}.png"
+    argz="$argz +dither -colors 255 $full_out"
     convert $argz
-    echo "Created ${fou}${sfx}${direction}.png"
+    echo "Created $full_out"
 done
 
-rm  ${fold}/[0-3][0-9]${sfx}*.png ${fou}${sfx}_bg.png ${fou}${sfx}_oriz_bg.png
+# rm  ${fold}/[0-3][0-9]${deck}*.png ${fold_ou}${deck}_bg.png ${fold_ou}${deck}_oriz_bg.png