Fix bug in get_pos() for negative positions

[fgen.git] / fgen.sh

diff --git a/fgen.sh b/fgen.sh
index c7065c8..c4c6fe9 100755 (executable)
--- a/fgen.sh
+++ b/fgen.sh
@@ -68,7 +68,7 @@ function get_size()
 # Arg1: layer
 function get_pos()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\(+[0-9]\++[0-9]\+\),.*/\1/g"
+    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\([+-][0-9]\+[+-][0-9]\+\),.*/\1/g"
 }
 
 # Arg1: line
@@ -136,7 +136,7 @@ function get_frame_name()
     local index
 
     index=$(printf "${F_FMT}" ${1})
-    echo "${dest}/${group}-f${index}.png"
+    echo "${dest}/${dest}-${group}-f${index}.png"
 }
 
 # Arg1: start frame
@@ -160,21 +160,33 @@ function insert_empty_frames()
     done
 }
 
+function record_max_nf()
+{
+    if [ ${nf} -gt ${max_nf} ]; then
+        max_nf="${nf}"
+    fi
+}
+
 function generate_video()
 {
     local png_files
 
     if which ffmpeg 1> /dev/null 2>&1; then
-        set +e
-        png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
-        set -e
+        png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null || echo "")
 
         if [ x"${png_files}" != x"" ]; then
+            group_list="${group_list} ${group}"
+
             log_dbg "generate_video start"
+
+            local outfile
+
+            outfile=${dest}/${dest}-${group}.mp4
+
             if [ ${dry_run} -eq 1 ]; then
-                touch ${dest}/${group}.mp4
+                touch ${outfile}
             else
-                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${group}-f*.png" ${dest}/${group}.mp4
+                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${dest}-${group}-f*.png" ${outfile}
             fi
 
             log_dbg "generate_video: end"
@@ -182,10 +194,54 @@ function generate_video()
     fi
 }
 
+function generate_global()
+{
+    local g
+    local w
+    local files
+    local group
+    local fname
+
+    log_dbg "generate_global: start"
+    log_dbg "  list:   ${group_list}"
+    log_dbg "  max_nf: ${max_nf}"
+
+    for w in $(seq 1 ${max_nf}); do
+        files=""
+
+        for g in ${group_list}; do
+            group=${g}
+            fname=$(get_frame_name ${w})
+
+            if [ -f "${fname}" ]; then
+                files="${files} ${fname}"
+            fi
+        done
+
+        if [ "${files}" != "" ]; then
+            group="global"
+            fname=$(get_frame_name ${w})
+
+            if [ ${dry_run} -eq 1 ]; then
+                touch ${fname}
+            else
+                convert -colorspace sRGB -page +0+0 ${dest}/background-white.png \
+                        ${files} -background none -layers merge \
+                        PNG32:${fname}
+            fi
+        fi
+    done
+
+    group="global"
+    generate_video
+
+    log_dbg "generate_global: end"
+}
+
 print_usage()
 {
-    echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
-    echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-PSD"
+    echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD/PSB)."
+    echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-PHOTOSHOP"
     echo
     echo "Options:"
     echo "  -d   affiche les informations de debug"
@@ -233,11 +289,23 @@ fi
 src="${*}"
 
 if [ ! -f "${src}" ]; then
-    log_err "Error: PSD source file not found"
+    log_err "Erreur: fichier source non trouvé"
     exit 1
 fi
 
-dest=$(basename -s .psd "${src}")
+ext=$(echo "${src##*.}" | awk '{print tolower($0)}')
+
+case ${ext} in
+    psd|psb)
+        # Ok: PSD or PSB format detected
+        ;;
+    *)
+        log_err "Format non-supporté: ${ext}"
+        exit 1
+        ;;
+esac
+
+dest=$(basename -s .${ext} "${src}")
 layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
@@ -271,13 +339,18 @@ if [ ${trames} -eq 1 ]; then
     # Remove background line:
     ${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
 
-    # Create background frame:
+    # Create transparent background frame:
     convert -size ${size} xc:none ${dest}/background.png
 
+    # Create white background frame:
+    convert -size ${size} xc:white ${dest}/background-white.png
+
     nf=""
+    max_nf="0"
     oldnf=""
     files=""
     group="default"
+    group_list=""
 
     while read l; do
         scene=$(get_scene_id "${l}")
@@ -340,6 +413,7 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             log_dbg "New frame ID: ${nf}"
+            record_max_nf
 
             fname=$(get_frame_name ${nf})
 
@@ -376,3 +450,5 @@ fi
 
 # Special case for last group...
 generate_video
+
+generate_global