X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=385e211acf131659344edd974d8ee0bc6c94cb11;hb=13302ad320d01d4b0a931b91d4deb03c35fb5b7c;hp=8de4036d72c2543dfe3bff07b7b36ae523cbf0b9;hpb=75efbf87ea3f7b4ba4a557ba016ff8cc4a4c703f;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 8de4036..385e211 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"
 
@@ -49,27 +52,16 @@ function get_pos()
 # Arg1: line
 function get_label()
 {
-    frame=$(echo "${1}" | ${SED} "s/.*label:\(.*\),geometry.*/\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: line
@@ -80,15 +72,46 @@ function get_scene_id()
     echo "${token}"
 }
 
-# Arg1: label
-function is_skip_label()
+# Arg1: line
+function get_group_id()
+{
+    group=$(echo "${1}" | grep -e "label:groupe.*" | ${SED} "s/.*label:groupe-\(.*\),geometry.*/\1/g")
+    echo "${group}"
+}
+
+# Arg1: group name
+function get_group_ref()
+{
+    local token
+    token=$(echo "${1}" | grep -e "^ref" | ${SED} "s/^\(ref\).*/\1/g")
+    echo "${token}"
+}
+
+# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1
+# Arg1: line
+function get_dup_from()
 {
-    skip=$(echo "${1}" | grep -e "A8_.*")
+    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup\([0-9]\+\)-.*,geometry.*/\1/g")
+    echo "${dup}"
+}
 
-    if [ x"${skip}" = x"" ]; then
-        return 1
-    else
-        return 0
+# Get duplicate to. Ex: "label:dup1-7 planXYZ,geometry..." will return 7
+# Arg1: line
+function get_dup_to()
+{
+    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup[0-9]\+-\([0-9]\+\).*,geometry.*/\1/g")
+    echo "${dup}"
+}
+
+function generate_video()
+{
+    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
 }
 
@@ -100,11 +123,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"
@@ -112,6 +136,9 @@ while getopts "dhfr:" flag ;do
         f)
             trames=0
             ;;
+        n)
+            dry_run=1
+            ;;
         r)
             fps="${OPTARG}"
             ;;
@@ -189,19 +216,49 @@ if [ ${trames} -eq 1 ]; then
     nf=""
     oldnf=""
     files=""
+    group=""
 
     while read l; do
         scene=$(get_scene_id "${l}")
         label=$(get_label "${l}")
         p=$(get_pos "${l}")
         nf=$(get_frame_id "${l}")
+        ng=$(get_group_id "${l}")
+        dup_from=$(get_dup_from "${l}")
+        dup_to=$(get_dup_to "${l}")
+
+        # Also indicate a new frame, but to be copied from..to:
+        if [ x"${dup_from}" != x"" ]; then
+            nf=${dup_from}
+        fi
 
         log_dbg "Layer ${scene}"
         log_dbg "  nom: ${label}"
         log_dbg "  pos: ${p}"
 
-        if is_skip_label "${label}"; then
-            log_dbg "  skip..."
+        group_ref=$(get_group_ref "${group}")
+        log_dbg "  group_ref: ${group_ref}"
+
+        # Only change group if ng is set...
+        if [ x"${ng}" != x"" ]; then
+            if [ x"${group_ref}" != x"ref" ]; then
+                generate_video
+            fi
+
+            group="${ng}"
+            log_dbg "New group: ${ng}"
+
+            nf=""
+            oldnf=""
+            files=""
+
+            # Skip image from group ID...
+            continue
+        fi
+
+        if [ x"${group_ref}" != x"" ]; then
+            # Ignore all images in groupe-ref:
+            log_dbg "  ignore (groupe-ref)"
             continue
         fi
 
@@ -222,14 +279,33 @@ 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
+
+            if [ x"${dup_from}" != x"" ]; then
+                log_dbg "  dup from: ${dup_from}"
+                log_dbg "  dup to:   ${dup_to}"
+
+                dup_start=$((${dup_from} + 1))
+                for w in $(seq ${dup_start} ${dup_to}); do
+                    log_dbg "New frame ID: ${w} (duplicate)"
+
+                    # Use symlink???
+                    cp ${dest}/${group}-f${nf}.png ${dest}/${group}-f${w}.png
+                done
+            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
+# Special case for last group...
+generate_video