Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Matt McWilliams 2021-09-16 01:19:38 -04:00
commit 6ca0fe9cc0
2 changed files with 24 additions and 10 deletions

View File

@ -11,14 +11,13 @@ WIDTH=323
HEIGHT=242
if [[ "${INVERT}" != "" ]]; then
INVERT="-vf negate"
INVERT="negate,"
fi
mkdir -p "${OUTPUT}"
ffmpeg -re -i "${INPUT}" \
ffmpeg -y -re -i "${INPUT}" \
-f image2 \
-r ${RATE} \
"${INVERT}" \
-vf crop=in_h/3*4:in_h,scale=$WIDTH:$HEIGHT,setsar=1:1 \
-vf ${INVERT}crop=in_h/3*4:in_h,scale=$WIDTH:$HEIGHT,setsar=1:1 \
"${OUTPUT}/image_%06d.png"

View File

@ -1,24 +1,33 @@
#!/bin/bash
if [[ "${1}" == "" ]]; then
echo "Please provide a directory of images as the first argument"
exit 1
fi
INPUT=`realpath "${1}"`
OUTPUT=`realpath "${2}"`
INVERT="${3}"
if [[ "${INVERT}" == "" ]]; then
INVERT="false"
else
INVERT="true"
if [ ! -d "${INPUT}" ]; then
echo "Directory ${1} doesn't exist"
exit 2
fi
mkdir -p "${OUTPUT}"
WIDTH=404
HEIGHT=374
DOTSIZE=4
MAXGENERATIONS=25
MAXPARTICLES=500
MAXPARTICLES=400
MINDOTSIZE=0.8
LINE=0.8
FILL=true
MODE="stipple"
INVERT="false"
IMAGES=""
@ -36,6 +45,7 @@ for png in "${INPUT}/"*.png ; do
VIDEO="${OUTPUT}/${part}.mov"
fi
bash stipple_gen.sh \
--display "false" \
--inputImage "${tmp}" \
--outputImage "${OUTPUT}/${name}_rendered.png" \
--outputSVG "${OUTPUT}/${name}.svg" \
@ -51,6 +61,11 @@ for png in "${INPUT}/"*.png ; do
--maxParticles $MAXPARTICLES \
--mode $MODE \
--invert $INVERT
if [[ "${INVERT}" != "" ]]; then
convert "${OUTPUT}/${name}_rendered.png" -channel RGB -negate "${OUTPUT}/${name}_rendered.png"
fi
rm "${tmp}"
cd ~/src/animation/
if [ "${MODE}" != "tsp" ]; then
@ -60,6 +75,6 @@ for png in "${INPUT}/"*.png ; do
fi
done
ffmpeg -r 12 -f image2 -i "${IMAGES}" \
ffmpeg -y -r 12 -f image2 -i "${IMAGES}" \
-c:v prores_ks -profile:v 3 \
"${VIDEO}"