Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
6ca0fe9cc0
|
@ -11,14 +11,13 @@ WIDTH=323
|
||||||
HEIGHT=242
|
HEIGHT=242
|
||||||
|
|
||||||
if [[ "${INVERT}" != "" ]]; then
|
if [[ "${INVERT}" != "" ]]; then
|
||||||
INVERT="-vf negate"
|
INVERT="negate,"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "${OUTPUT}"
|
mkdir -p "${OUTPUT}"
|
||||||
|
|
||||||
ffmpeg -re -i "${INPUT}" \
|
ffmpeg -y -re -i "${INPUT}" \
|
||||||
-f image2 \
|
-f image2 \
|
||||||
-r ${RATE} \
|
-r ${RATE} \
|
||||||
"${INVERT}" \
|
-vf ${INVERT}crop=in_h/3*4:in_h,scale=$WIDTH:$HEIGHT,setsar=1:1 \
|
||||||
-vf crop=in_h/3*4:in_h,scale=$WIDTH:$HEIGHT,setsar=1:1 \
|
|
||||||
"${OUTPUT}/image_%06d.png"
|
"${OUTPUT}/image_%06d.png"
|
27
stipple.sh
27
stipple.sh
|
@ -1,24 +1,33 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ "${1}" == "" ]]; then
|
||||||
|
echo "Please provide a directory of images as the first argument"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
INPUT=`realpath "${1}"`
|
INPUT=`realpath "${1}"`
|
||||||
OUTPUT=`realpath "${2}"`
|
OUTPUT=`realpath "${2}"`
|
||||||
INVERT="${3}"
|
INVERT="${3}"
|
||||||
|
|
||||||
if [[ "${INVERT}" == "" ]]; then
|
if [ ! -d "${INPUT}" ]; then
|
||||||
INVERT="false"
|
echo "Directory ${1} doesn't exist"
|
||||||
else
|
exit 2
|
||||||
INVERT="true"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mkdir -p "${OUTPUT}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
WIDTH=404
|
WIDTH=404
|
||||||
HEIGHT=374
|
HEIGHT=374
|
||||||
DOTSIZE=4
|
DOTSIZE=4
|
||||||
MAXGENERATIONS=25
|
MAXGENERATIONS=25
|
||||||
MAXPARTICLES=500
|
MAXPARTICLES=400
|
||||||
MINDOTSIZE=0.8
|
MINDOTSIZE=0.8
|
||||||
LINE=0.8
|
LINE=0.8
|
||||||
FILL=true
|
FILL=true
|
||||||
MODE="stipple"
|
MODE="stipple"
|
||||||
|
INVERT="false"
|
||||||
|
|
||||||
IMAGES=""
|
IMAGES=""
|
||||||
|
|
||||||
|
@ -36,6 +45,7 @@ for png in "${INPUT}/"*.png ; do
|
||||||
VIDEO="${OUTPUT}/${part}.mov"
|
VIDEO="${OUTPUT}/${part}.mov"
|
||||||
fi
|
fi
|
||||||
bash stipple_gen.sh \
|
bash stipple_gen.sh \
|
||||||
|
--display "false" \
|
||||||
--inputImage "${tmp}" \
|
--inputImage "${tmp}" \
|
||||||
--outputImage "${OUTPUT}/${name}_rendered.png" \
|
--outputImage "${OUTPUT}/${name}_rendered.png" \
|
||||||
--outputSVG "${OUTPUT}/${name}.svg" \
|
--outputSVG "${OUTPUT}/${name}.svg" \
|
||||||
|
@ -51,6 +61,11 @@ for png in "${INPUT}/"*.png ; do
|
||||||
--maxParticles $MAXPARTICLES \
|
--maxParticles $MAXPARTICLES \
|
||||||
--mode $MODE \
|
--mode $MODE \
|
||||||
--invert $INVERT
|
--invert $INVERT
|
||||||
|
|
||||||
|
if [[ "${INVERT}" != "" ]]; then
|
||||||
|
convert "${OUTPUT}/${name}_rendered.png" -channel RGB -negate "${OUTPUT}/${name}_rendered.png"
|
||||||
|
fi
|
||||||
|
|
||||||
rm "${tmp}"
|
rm "${tmp}"
|
||||||
cd ~/src/animation/
|
cd ~/src/animation/
|
||||||
if [ "${MODE}" != "tsp" ]; then
|
if [ "${MODE}" != "tsp" ]; then
|
||||||
|
@ -60,6 +75,6 @@ for png in "${INPUT}/"*.png ; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
ffmpeg -r 12 -f image2 -i "${IMAGES}" \
|
ffmpeg -y -r 12 -f image2 -i "${IMAGES}" \
|
||||||
-c:v prores_ks -profile:v 3 \
|
-c:v prores_ks -profile:v 3 \
|
||||||
"${VIDEO}"
|
"${VIDEO}"
|
||||||
|
|
Loading…
Reference in New Issue