X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=1e92b1ebdcdeed1a7f352ef9ff54f96a1b657e5b;hb=2efdc6f1d99e8b97963a7aa63df0e96a091825d3;hp=ea04217518f2089ffb2a741925dde93860c4a8ca;hpb=f0422ed330506fd1a382afb625f886bcf7158822;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index ea04217..1e92b1e 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -10,12 +10,15 @@ PROG_NAME=$(basename $0)
 
 # Set default values
 bg_layer_name="background"
+ref_layer_prefix="ref"
 
 # Pour conversion vidéo:
 fps=8
 
 debug=0
 trames=1
+dry_run=0
+
 SED=sed
 FFMPEG_OPTS="-hide_banner -loglevel error -y"
 
@@ -43,45 +46,37 @@ 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
 function get_label()
 {
-    frame=$(echo "${1}" | grep -e "label:.*," | ${SED} "s/label:\(.*\),.*/\1/g")
-
-    if [ x"${frame}" = x"" ]; then
-        echo ""
-        return 1
-    else
-        echo "${frame}"
-        return 0
-    fi
+    local token
+    token=$(echo "${1}" | ${SED} "s/.*label:\(.*\),geometry.*/\1/g")
+    echo "${token}"
 }
 
 # Arg1: line
 function get_frame_id()
 {
-    frame=$(echo "${1}" | grep -e "label:[0-9]\+," | ${SED} "s/label:\([0-9]\+\),.*/\1/g")
-
-    if [ x"${frame}" = x"" ]; then
-        echo ""
-    else
-        echo "${frame}"
-    fi
+    frame=$(echo "${1}" | grep -e "label:[0-9]\+" | ${SED} "s/.*label:\([0-9]\+\).*,geometry.*/\1/g")
+    echo "${frame}"
 }
 
-# Arg1: label
-function is_skip_label()
+# Arg1: line
+function get_scene_id()
 {
-    skip=$(echo "${1}" | grep -e "A8_.*")
+    local token
+    token=$(echo "${1}" | ${SED} "s/.*scene:\([0-9]\+\),.*/\1/g")
+    echo "${token}"
+}
 
-    if [ x"${skip}" = x"" ]; then
-        return 1
-    else
-        return 0
-    fi
+# Arg1: line
+function get_group_id()
+{
+    group=$(echo "${1}" | grep -e "label:groupe.*" | ${SED} "s/.*label:groupe-\(.*\),geometry.*/\1/g")
+    echo "${group}"
 }
 
 print_usage()
@@ -92,11 +87,12 @@ print_usage()
     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 "  -n   mode de test (dry-run)"
     echo "  -r   nombre de trames par seconde (FPS)"
     echo "  -h   affiche ce message d'aide"
 }
 
-while getopts "dhfr:" flag ;do
+while getopts "dhfnr:" flag ;do
     case ${flag} in
         d)
             debug="1"
@@ -104,6 +100,9 @@ while getopts "dhfr:" flag ;do
         f)
             trames=0
             ;;
+        n)
+            dry_run=1
+            ;;
         r)
             fps="${OPTARG}"
             ;;
@@ -156,9 +155,10 @@ for tool in convert composite identify; do
 done
 
 if [ ${trames} -eq 1 ]; then
-    identify ${IM_OPS} -verbose -format "label:%l,geometry:%g\n" ${src} > ${layers}
+    # %s: scene number
+    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" ${src} > ${layers}
 
-    # Ignore empty labels:
+    # Remove line(s) with empty label:
     ${SED} -i -e /label:,.*/d ${layers}
 
     # Extract global frame size:
@@ -174,33 +174,51 @@ if [ ${trames} -eq 1 ]; then
     # Remove background line:
     ${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
 
+    # Remove reference lines:
+    ${SED} -i -e /label:${ref_layer_prefix}.*/d ${layers}
+
     # Create background frame:
     convert -size ${size} xc:none ${dest}/background.png
 
-    # Will start at frame 2 at first loop iteration
-    f=1
-
     nf=""
     oldnf=""
     files=""
+    group=""
 
     while read l; do
-        f=$((${f} + 1))
-
+        scene=$(get_scene_id "${l}")
         label=$(get_label "${l}")
         p=$(get_pos "${l}")
         nf=$(get_frame_id "${l}")
+        ng=$(get_group_id "${l}")
+
+        # Only change group if ng is set...
+        if [ x"${ng}" != x"" ]; then
+            if which ffmpeg 1> /dev/null 2>&1; then
+                if [ -f ${dest}/${group}-f1.png ]; then
+                    if [ ${dry_run} -eq 0 ]; then
+                        # Conversion vidéo:
+                        ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4
+                    fi
+                fi
+            fi
 
-        log_dbg "Couche ${f}"
-        log_dbg "  nom: ${label}"
-        log_dbg "  pos: ${p}"
+            group="${ng}"
+            log_dbg "New group: ${ng}"
 
-        if is_skip_label "${label}"; then
-            log_dbg "  skip..."
+            nf=""
+            oldnf=""
+            files=""
+
+            # Skip image from group ID...
             continue
         fi
 
-        files="${files} -page ${p} ${src}[${f}]"
+        log_dbg "Layer ${scene}"
+        log_dbg "  nom: ${label}"
+        log_dbg "  pos: ${p}"
+
+        files="${files} -page ${p} ${src}[${scene}]"
 
         if [ x"${nf}" != x"" ]; then
             # Only check expected frame if oldnf is set...
@@ -217,14 +235,17 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             log_dbg "New frame ID: ${nf}"
-            convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png
+
+            if [ ${dry_run} -eq 1 ]; then
+                touch ${dest}/${group}-f${nf}.png
+            else
+                convert -colorspace sRGB -page +0+0 ${dest}/background.png \
+                        ${files} -background none -layers merge \
+                        ${dest}/${group}-f${nf}.png
+            fi
+
             files=""
             oldnf="${nf}"
         fi
     done <${layers}
 fi
-
-if which ffmpeg 1> /dev/null 2>&1; then
-    # Conversion vidéo:
-    ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/f%d.png ${dest}/sequence.mp4
-fi