projects
/
fgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify get_label() and get_frame_id()
[fgen.git]
/
fgen.sh
diff --git
a/fgen.sh
b/fgen.sh
index
8de4036
..
6e66b49
100755
(executable)
--- a/
fgen.sh
+++ b/
fgen.sh
@@
-10,6
+10,7
@@
PROG_NAME=$(basename $0)
# Set default values
bg_layer_name="background"
# Set default values
bg_layer_name="background"
+ref_layer_prefix="ref"
# Pour conversion vidéo:
fps=8
# Pour conversion vidéo:
fps=8
@@
-49,27
+50,16
@@
function get_pos()
# Arg1: line
function get_label()
{
# 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")
}
# 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
+ echo "${frame}"
}
# Arg1: line
}
# Arg1: line
@@
-80,18
+70,6
@@
function get_scene_id()
echo "${token}"
}
echo "${token}"
}
-# Arg1: label
-function is_skip_label()
-{
- skip=$(echo "${1}" | grep -e "A8_.*")
-
- if [ x"${skip}" = x"" ]; then
- return 1
- else
- return 0
- fi
-}
-
print_usage()
{
echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
print_usage()
{
echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
@@
-183,6
+161,9
@@
if [ ${trames} -eq 1 ]; then
# Remove background line:
${SED} -i -e /label:${bg_layer_name},.*/d ${layers}
# 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
# Create background frame:
convert -size ${size} xc:none ${dest}/background.png
@@
-200,11
+181,6
@@
if [ ${trames} -eq 1 ]; then
log_dbg " nom: ${label}"
log_dbg " pos: ${p}"
log_dbg " nom: ${label}"
log_dbg " pos: ${p}"
- if is_skip_label "${label}"; then
- log_dbg " skip..."
- continue
- fi
-
files="${files} -page ${p} ${src}[${scene}]"
if [ x"${nf}" != x"" ]; then
files="${files} -page ${p} ${src}[${scene}]"
if [ x"${nf}" != x"" ]; then