X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=07507d74a14d6ff3f3e1162ee394b38110892a28;hb=b7c8901b98e3e1f0c13fbd35cac3980daa367678;hp=b3b1d2633b1e1f5767ec28f7a338f48cb2265099;hpb=5eb0bf1a92d68847057aa2303ee5bd371cf7477b;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index b3b1d26..07507d7 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -3,16 +3,19 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2023 Hugo Villeneuve <hugo@hugovil.com>
 
+# Abort on all errors
+set -e
+
 PROG_NAME=$(basename $0)
 
 # Set default values
 main_layer="Layer 558"
 
 # Pour conversion vidéo:
-fps=3
+fps=8
 
 debug=0
-
+trames=1
 SED=sed
 
 # -limit memory 5000mb -limit disk 5gb
@@ -33,7 +36,7 @@ function log_dbg() {
 # Arg1: layer
 function get_size()
 {
-    cat ${layers} | grep "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
+    cat ${layers} | grep -m 1 "${1}" | ${SED} "s/.*geometry:\([0-9]\+x[0-9]\+\).*/\1/g"
 }
 
 # Arg1: layer
@@ -59,13 +62,12 @@ function get_label()
 # Arg1: line
 function get_frame_id()
 {
-    frame=$(echo "${1}" | grep -e "label:[0-9]" | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
+    frame=$(echo "${1}" | grep -e "label:[0-9]\+," | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
 
     if [ x"${frame}" = x"" ]; then
-        return 1
+        echo ""
     else
         echo "${frame}"
-        return 0
     fi
 }
 
@@ -88,14 +90,22 @@ print_usage()
     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 "  -r   nombre de trames par seconde (FPS)"
     echo "  -h   affiche ce message d'aide"
 }
 
-while getopts "dh" flag ;do
+while getopts "dhfr:" flag ;do
     case ${flag} in
         d)
             debug="1"
             ;;
+        f)
+            trames=0
+            ;;
+        r)
+            fps="${OPTARG}"
+            ;;
 	h)
 	    print_usage
             exit 0
@@ -135,7 +145,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do
@@ -145,61 +154,55 @@ for tool in convert composite identify; do
     fi
 done
 
-identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
+if [ ${trames} -eq 1 ]; then
+    identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
 
-# Ignore empty labels:
-${SED} -i -e /label:,.*/d ${layers}
+    # Ignore empty labels:
+    ${SED} -i -e /label:,.*/d ${layers}
 
-# Extract global frame size:
-size=$(get_size "${main_layer}")
+    # Extract global frame size:
+    size=$(get_size "${main_layer}")
 
-log_dbg "CANVAS SIZE=${size}"
+    log_dbg "CANVAS SIZE=${size}"
 
-rm -f ${dest}/frame*.png
+    # Create background frame:
+    convert -size ${size} xc:none ${dest}/background.png
 
-# Extract global frame:
-convert ${IM_OPS} ${src}[1] ${dest}/psd0.png
+    # Remove first line (Layer 558):
+    ${SED} -i -e '1d' ${layers}
 
-cp ${dest}/psd0.png ${dest}/temp.png
+    # Will start at frame 2 at first loop iteration
+    f=1
 
-# Remove first line (Layer 558):
-${SED} -i -e '1d' ${layers}
+    files=""
 
-# Will start at frame 2 at first loop iteration
-f=1
+    while read l; do
+        f=$((${f} + 1))
 
-while read l; do
-    f=$((${f} + 1))
+        label=$(get_label "${l}")
+        p=$(get_pos "${l}")
+        nf=$(get_frame_id "${l}")
 
-    label=$(get_label "${l}")
-    p=$(get_pos "${l}")
-    nf=$(get_frame_id "${l}")
+        log_dbg "Couche ${f}"
+        log_dbg "  nom: ${label}"
+        log_dbg "  pos: ${p}"
 
-    log_dbg "Couche ${f}"
-    log_dbg "  nom: ${label}"
-    log_dbg "  pos: ${p}"
+        if is_skip_label "${label}"; then
+            log_dbg "  skip..."
+            continue
+        fi
 
-    if is_skip_label "${label}"; then
-        log_dbg "  skip..."
-        continue
-    fi
-
-    convert ${IM_OPS} ${src}[${f}] ${dest}/psd${f}.png
+        files="${files} -page ${p} ${src}[${f}]"
 
-    composite ${IM_OPS} -geometry ${p} ${dest}/psd${f}.png ${dest}/temp.png ${dest}/temp.png
-
-if [ x"${nf}" != x"" ]; then
-        log_dbg "New frame ID: ${nf}"
-        cp ${dest}/temp.png ${dest}/f${nf}.png
-        cp ${dest}/psd0.png ${dest}/temp.png
-    fi
-done <${layers}
+        if [ x"${nf}" != x"" ]; then
+            log_dbg "New frame ID: ${nf}"
+            convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png
+            files=""
+        fi
+    done <${layers}
+fi
 
 if which ffmpeg 1> /dev/null 2>&1; then
     # Conversion vidéo:
     ffmpeg -y -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
 fi
-
-rm -f ${dest}/temp.png
-
-#rm -f ${dest}/psd*.png