yrriban/dcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix demo_in; add a dsda path selector; add a text generation without the MAP prefix.

Browse source
This commit is contained in:
yrriban 2025-03-12 22:26:53 -04:00
parent 56d4f3012e
commit c40eb28e71
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dcc
View file

@ -8,13 +8,14 @@ fi
PWAD="$2" PWAD="$2"
MAP="$3" MAP="$3"
COMMAND=() COMMAND=()
DSDA="${HOME}/dsda-doom/dsda-0.28.3"
PWADPATH="${HOME}/doom/pwads/${PWAD}" PWADPATH="${HOME}/doom/pwads/${PWAD}"
DEMOPATH="${HOME}/doom/demos/${PWAD}" DEMOPATH="${HOME}/doom/demos/${PWAD}"
VIDPATH="${HOME}/doom/fabricate/${PWAD}" VIDPATH="${HOME}/doom/fabricate/${PWAD}"
MAPSTR="$(tr ' ' '-' <<< "${MAP}")" MAPSTR="$(tr ' ' '-' <<< "${MAP}")"
MAPFILE="${PWAD}_map${MAPSTR}" MAPFILE="${PWAD}_map${MAPSTR}"
DEMONAME="${MAPFILE}.lmp" DEMONAME="${MAPFILE}.lmp"
DEMO_IN="$(find "${DEMOPATH}" -name "${MAPFILE}"'*' | tail -2 | head -1)" DEMO_IN="$(ls "${DEMOPATH}/${MAPFILE}"* -t | head -1)"
if ! [[ -e "${PWADPATH}" ]]; then if ! [[ -e "${PWADPATH}" ]]; then
echo "PWAD ${PWAD} not found." >&2 echo "PWAD ${PWAD} not found." >&2
@ -49,6 +50,15 @@ case $1 in
display "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}_base.png" display "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}_base.png"
exit $? exit $?
;; ;;
"nmtext")
LABEL="$(printf "%s\nUV-Max Demo" "$(cat -)")"
convert -background transparent -fill white -font "League-Spartan-Bold" -strokewidth 10 \
-stroke "srgb(176,0,0)" -interline-spacing -10 -pointsize 64 -trim +repage -border 5 \
-bordercolor transparent -gravity NorthWest \
label:"${LABEL}" -stroke none -strokewidth 0 -annotate +8+6 "${LABEL}" \
"${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}_text.png"
exit $?
;;
"text") "text")
LABEL="$(printf "MAP%s: %s\nUV-Max Demo" "${MAPSTR}" "$(cat -)")" LABEL="$(printf "MAP%s: %s\nUV-Max Demo" "${MAPSTR}" "$(cat -)")"
convert -background transparent -fill white -font "League-Spartan-Bold" -strokewidth 10 \ convert -background transparent -fill white -font "League-Spartan-Bold" -strokewidth 10 \
@ -103,6 +113,5 @@ if [[ -e "${PWADPATH}/options" ]]; then
OPTIONS=("-assign" "$(< "${PWADPATH}/options")") OPTIONS=("-assign" "$(< "${PWADPATH}/options")")
fi fi
# TODO: properly split MAP into an array in case this is a UDoom wad. # TODO: properly split MAP into an array in case this is a UDoom wad.
/home/tynan/src/dsda-doom/prboom2/cmake/dsda-doom \ "${DSDA}" -skill 4 -warp ${MAP} \
-skill 4 -warp ${MAP} \
"${IWAD[@]}" "${WADS[@]}" "${DEH[@]}" "${COMPLEVEL[@]}" "${OPTIONS[@]}" "${COMMAND[@]}" "${IWAD[@]}" "${WADS[@]}" "${DEH[@]}" "${COMPLEVEL[@]}" "${OPTIONS[@]}" "${COMMAND[@]}"