X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=d60da59eef5e8bf2c5ce9f79d4a8d1e90aa134a9;hb=cd5c11f0677c753ec3c2fd15d0c293dafeed35dd;hp=45b30010139d8b06e2b4528af0eb05a0e2ccfafa;hpb=d320a80b42e7b6bd47a056d54d807c6320b7dc2f;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 45b3001..d60da59 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -17,6 +17,8 @@ fps=8
 
 debug=0
 trames=1
+dry_run=0
+
 SED=sed
 FFMPEG_OPTS="-hide_banner -loglevel error -y"
 
@@ -50,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
@@ -81,6 +72,29 @@ function get_scene_id()
     echo "${token}"
 }
 
+# Arg1: line
+function get_group_id()
+{
+    group=$(echo "${1}" | grep -e "label:groupe.*" | ${SED} "s/.*label:groupe-\(.*\),geometry.*/\1/g")
+    echo "${group}"
+}
+
+# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1
+# Arg1: line
+function get_dup_from()
+{
+    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup\([0-9]\+\)-.*,geometry.*/\1/g")
+    echo "${dup}"
+}
+
+# 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}"
+}
+
 print_usage()
 {
     echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
@@ -89,11 +103,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"
@@ -101,6 +116,9 @@ while getopts "dhfr:" flag ;do
         f)
             trames=0
             ;;
+        n)
+            dry_run=1
+            ;;
         r)
             fps="${OPTARG}"
             ;;
@@ -181,12 +199,44 @@ 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
+
+        # 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
+
+            group="${ng}"
+            log_dbg "New group: ${ng}"
+
+            nf=""
+            oldnf=""
+            files=""
+
+            # Skip image from group ID...
+            continue
+        fi
 
         log_dbg "Layer ${scene}"
         log_dbg "  nom: ${label}"
@@ -209,14 +259,30 @@ 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