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

diff --git a/fgen.sh b/fgen.sh
index 1e92b1e..385e211 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -79,6 +79,42 @@ function get_group_id()
     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()
+{
+    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}"
+}
+
+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
+}
+
 print_usage()
 {
     echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
@@ -174,9 +210,6 @@ 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
 
@@ -191,16 +224,25 @@ if [ ${trames} -eq 1 ]; then
         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}"
+
+        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 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
+            if [ x"${group_ref}" != x"ref" ]; then
+                generate_video
             fi
 
             group="${ng}"
@@ -214,9 +256,11 @@ if [ ${trames} -eq 1 ]; then
             continue
         fi
 
-        log_dbg "Layer ${scene}"
-        log_dbg "  nom: ${label}"
-        log_dbg "  pos: ${p}"
+        if [ x"${group_ref}" != x"" ]; then
+            # Ignore all images in groupe-ref:
+            log_dbg "  ignore (groupe-ref)"
+            continue
+        fi
 
         files="${files} -page ${p} ${src}[${scene}]"
 
@@ -244,8 +288,24 @@ if [ ${trames} -eq 1 ]; then
                         ${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
+
+# Special case for last group...
+generate_video