X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=63957b817f4f9c6d8c6e040614eae9a4a148fa21;hb=6d22532756bb5f3409f51146ed7d0d189be5fd2b;hp=5ffb9d775aedc5770edb0e63f59a16a161982ccd;hpb=58b228f01c3ee64d5934428f416b4416d807b5c8;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 5ffb9d7..63957b8 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -65,10 +65,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 +89,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()
 {
@@ -175,6 +197,8 @@ function generate_video()
         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
@@ -192,6 +216,50 @@ 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/PSB)."
@@ -202,10 +270,11 @@ print_usage()
     echo "  -f   ne regénère pas les trames, mais uniquement la séquence vidéo"
     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 "dhfnr:s:" flag ;do
     case ${flag} in
         d)
             debug="1"
@@ -219,6 +288,9 @@ while getopts "dhfnr:" flag ;do
         r)
             fps="${OPTARG}"
             ;;
+        s)
+            ref_layer_prefix="${ref_layer_prefix} ${OPTARG}"
+            ;;
 	h)
 	    print_usage
             exit 0
@@ -293,14 +365,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}")
@@ -321,6 +397,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}"
 
@@ -347,6 +424,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
@@ -400,3 +484,5 @@ fi
 
 # Special case for last group...
 generate_video
+
+generate_global