projects
/
fgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add record_max_nf()
[fgen.git]
/
fgen.sh
diff --git
a/fgen.sh
b/fgen.sh
index
c7065c8
..
5ffb9d7
100755
(executable)
--- a/
fgen.sh
+++ b/
fgen.sh
@@
-136,7
+136,7
@@
function get_frame_name()
local index
index=$(printf "${F_FMT}" ${1})
local index
index=$(printf "${F_FMT}" ${1})
- echo "${dest}/${group}-f${index}.png"
+ echo "${dest}/${
dest}-${
group}-f${index}.png"
}
# Arg1: start frame
}
# Arg1: start frame
@@
-160,21
+160,31
@@
function insert_empty_frames()
done
}
done
}
+function record_max_nf()
+{
+ if [ ${nf} -gt ${max_nf} ]; then
+ max_nf="${nf}"
+ fi
+}
+
function generate_video()
{
local png_files
if which ffmpeg 1> /dev/null 2>&1; then
function generate_video()
{
local png_files
if which ffmpeg 1> /dev/null 2>&1; then
- set +e
- png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
- set -e
+ png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null || echo "")
if [ x"${png_files}" != x"" ]; then
log_dbg "generate_video start"
if [ x"${png_files}" != x"" ]; then
log_dbg "generate_video start"
+
+ local outfile
+
+ outfile=${dest}/${dest}-${group}.mp4
+
if [ ${dry_run} -eq 1 ]; then
if [ ${dry_run} -eq 1 ]; then
- touch ${
dest}/${group}.mp4
+ touch ${
outfile}
else
else
- ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${
group}-f*.png" ${dest}/${group}.mp4
+ ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${
dest}-${group}-f*.png" ${outfile}
fi
log_dbg "generate_video: end"
fi
log_dbg "generate_video: end"
@@
-184,8
+194,8
@@
function generate_video()
print_usage()
{
print_usage()
{
- echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
- echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-P
SD
"
+ echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD
/PSB
)."
+ echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-P
HOTOSHOP
"
echo
echo "Options:"
echo " -d affiche les informations de debug"
echo
echo "Options:"
echo " -d affiche les informations de debug"
@@
-233,11
+243,23
@@
fi
src="${*}"
if [ ! -f "${src}" ]; then
src="${*}"
if [ ! -f "${src}" ]; then
- log_err "Err
or: PSD source file not found
"
+ log_err "Err
eur: fichier source non trouvé
"
exit 1
fi
exit 1
fi
-dest=$(basename -s .psd "${src}")
+ext=$(echo "${src##*.}" | awk '{print tolower($0)}')
+
+case ${ext} in
+ psd|psb)
+ # Ok: PSD or PSB format detected
+ ;;
+ *)
+ log_err "Format non-supporté: ${ext}"
+ exit 1
+ ;;
+esac
+
+dest=$(basename -s .${ext} "${src}")
layers=${dest}/layers.txt
if [ ! -d ${dest} ]; then
layers=${dest}/layers.txt
if [ ! -d ${dest} ]; then
@@
-275,6
+297,7
@@
if [ ${trames} -eq 1 ]; then
convert -size ${size} xc:none ${dest}/background.png
nf=""
convert -size ${size} xc:none ${dest}/background.png
nf=""
+ max_nf="0"
oldnf=""
files=""
group="default"
oldnf=""
files=""
group="default"
@@
-340,6
+363,7
@@
if [ ${trames} -eq 1 ]; then
fi
log_dbg "New frame ID: ${nf}"
fi
log_dbg "New frame ID: ${nf}"
+ record_max_nf
fname=$(get_frame_name ${nf})
fname=$(get_frame_name ${nf})