X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=2eb48cc4873b297f7dfe42c5282ee603cb158007;hb=HEAD;hp=2f1fb5bc0bde3f88f640c260ff85b4df108e5c25;hpb=3d7398e0e43e197abb05f20b29ca3355f01f132f;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 2f1fb5b..2eb48cc 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -18,6 +18,7 @@ fps=8
 debug=0
 trames=1
 dry_run=0
+global=0
 
 SED=sed
 
@@ -65,10 +66,12 @@ function get_size()
     cat ${layers} | grep -m 1 "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
 }
 
-# Arg1: layer
+# Arg1: line
 function get_pos()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\(+[0-9]\++[0-9]\+\),.*/\1/g"
+    local token
+    token=$(echo "${1}" | ${SED} "s/.*geometry:[0-9]\+x[0-9]\+\([+-][0-9]\+[+-][0-9]\+\),.*/\1/g")
+    echo "${token}"
 }
 
 # Arg1: line
@@ -87,6 +90,26 @@ function get_frame_id()
     echo "${token}"
 }
 
+# Arg1: label
+function get_prefix_ref()
+{
+    local w
+    local token
+
+    for w in ${ref_layer_prefix}; do
+        token=$(echo "${1}" | grep -e "^${w}" || echo "")
+
+        if [ "${token}" != "" ]; then
+            # Ignore image.
+            echo "${token}"
+            return 0
+        fi
+    done
+
+    # Do not ignore image
+    echo ""
+}
+
 # Arg1: line
 function get_scene_id()
 {
@@ -136,7 +159,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 +183,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,20 +217,66 @@ 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"
     echo "  -f   ne regénère pas les trames, mais uniquement la séquence vidéo"
+    echo "  -g   génère les fichiers globaux"
     echo "  -n   mode de test (dry-run)"
     echo "  -r   nombre de trames par seconde (FPS)"
+    echo "  -s   préfixe d'image à ignorer"
     echo "  -h   affiche ce message d'aide"
 }
 
-while getopts "dhfnr:" flag ;do
+while getopts "dhfgnr:s:" flag ;do
     case ${flag} in
         d)
             debug="1"
@@ -203,12 +284,18 @@ while getopts "dhfnr:" flag ;do
         f)
             trames=0
             ;;
+        g)
+            global=1
+            ;;
         n)
             dry_run=1
             ;;
         r)
             fps="${OPTARG}"
             ;;
+        s)
+            ref_layer_prefix="${ref_layer_prefix} ${OPTARG}"
+            ;;
 	h)
 	    print_usage
             exit 0
@@ -230,20 +317,26 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 
-if [ $# -gt 1 ]; then
-    echo "${PROG_NAME}: Trop d'arguments."
-    echo "Essayez \`${PROG_NAME} -h' pour plus d'informations."
-    exit 1
-fi
+src="${*}"
 
-if [ ! -f "${1}" ]; then
-    log_err "Error: PSD source file not found"
+if [ ! -f "${src}" ]; then
+    log_err "Erreur: fichier source non trouvé"
     exit 1
 fi
 
-src=${1}
+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 .psd ${1})
+dest=$(basename -s .${ext} "${src}")
 layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
@@ -259,7 +352,7 @@ done
 
 if [ ${trames} -eq 1 ]; then
     # %s: scene number
-    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" ${src} > ${layers}
+    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" "${src}" > ${layers}
 
     # Remove line(s) with empty label:
     ${SED} -i -e /label:,.*/d ${layers}
@@ -277,13 +370,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}")
@@ -304,6 +402,7 @@ if [ ${trames} -eq 1 ]; then
         log_dbg "  nom: ${label}"
         log_dbg "  pos: ${p}"
 
+        prefix_ref=$(get_prefix_ref "${label}")
         group_ref=$(get_group_ref "${group}")
         log_dbg "  group_ref: ${group_ref}"
 
@@ -330,6 +429,13 @@ if [ ${trames} -eq 1 ]; then
             continue
         fi
 
+        # Ignore images beginning with a specific reference prefix:
+        if [ x"${prefix_ref}" != x"" ]; then
+            # Ignore all images in prefix-ref:
+            log_dbg "  ignore (prefix-ref)"
+            continue
+        fi
+
         files="${files} -page ${p} ${src}[${scene}]"
 
         if [ x"${nf}" != x"" ]; then
@@ -346,6 +452,7 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             log_dbg "New frame ID: ${nf}"
+            record_max_nf
 
             fname=$(get_frame_name ${nf})
 
@@ -354,7 +461,7 @@ if [ ${trames} -eq 1 ]; then
             else
                 convert -colorspace sRGB -page +0+0 ${dest}/background.png \
                         ${files} -background none -layers merge \
-                        ${fname}
+                        PNG32:${fname}
             fi
 
             if [ x"${dup_from}" != x"" ]; then
@@ -382,3 +489,7 @@ fi
 
 # Special case for last group...
 generate_video
+
+if [ x"${global}" = x"1" ]; then
+    generate_global
+fi