mirror of
https://github.com/freedoom/freedoom.git
synced 2025-09-02 16:25:47 -04:00
Merge branch 'titlepic' of gh:Voros2/freedoom
This commit is contained in:
commit
0b3edc9548
4 changed files with 27 additions and 18 deletions
|
@ -6,12 +6,18 @@ m_doom.gif: ../m_doom.gif
|
|||
m_dm.gif: ../m_dm.gif
|
||||
convert -transparent '#00ffff' ../m_dm.gif m_dm.gif
|
||||
|
||||
fd1title.gif: titlepic.gif m_doom.gif
|
||||
./create_caption titlepic.gif m_doom.gif "Phase 1" $@
|
||||
t_phase1.gif: ../t_phase1.gif
|
||||
convert -transparent '#00ffff' ../t_phase1.gif t_phase1.gif
|
||||
|
||||
t_phase2.gif: ../t_phase2.gif
|
||||
convert -transparent '#00ffff' ../t_phase2.gif t_phase2.gif
|
||||
|
||||
fd1title.gif: titlepic.gif m_doom.gif t_phase1.gif
|
||||
./create_caption titlepic.gif m_doom.gif t_phase1.gif $@
|
||||
cp $@ ../
|
||||
|
||||
fd2title.gif: titlepic.gif m_doom.gif
|
||||
./create_caption titlepic.gif m_doom.gif "Phase 2" $@
|
||||
fd2title.gif: titlepic.gif m_doom.gif t_phase2.gif
|
||||
./create_caption titlepic.gif m_doom.gif t_phase2.gif $@
|
||||
cp $@ ../
|
||||
|
||||
fdmtitle.gif: freedm_titlepic.gif
|
||||
|
@ -19,7 +25,8 @@ fdmtitle.gif: freedm_titlepic.gif
|
|||
cp $@ ../
|
||||
|
||||
clean:
|
||||
rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \
|
||||
../fd1title.gif ../fd2title.gif ../fdmtitle.gif
|
||||
rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \
|
||||
../fd1title.gif ../fd2title.gif ../fdmtitle.gif t_phase1.gif \
|
||||
t_phase2.gif
|
||||
|
||||
.PHONY: clean
|
||||
|
|
|
@ -19,13 +19,13 @@ draw_with_footer() {
|
|||
output_file=$2;
|
||||
shift; shift
|
||||
|
||||
convert $input_file -fill white -font "$font" +dither \
|
||||
-pointsize 11 \
|
||||
-gravity southwest \
|
||||
-draw "text 5,5 'https://freedoom.github.io/'" \
|
||||
-gravity southeast \
|
||||
-draw "text 10,5 'Version: $VERSION'" \
|
||||
"$@" \
|
||||
convert $input_file -fill orange -font "$font" +dither \
|
||||
-pointsize 11 \
|
||||
-gravity southwest \
|
||||
-draw "text 5,5 'Freedoom, © 2001-2017'" \
|
||||
-gravity southeast \
|
||||
-draw "text 10,5 '$VERSION'" \
|
||||
"$@" \
|
||||
$output_file
|
||||
}
|
||||
|
||||
|
@ -33,9 +33,8 @@ if [ $# = 4 ]; then
|
|||
draw_with_footer "$1" "$4" \
|
||||
-gravity north \
|
||||
-draw "image over 0,18 0,0 '$2'" \
|
||||
-pointsize 20 \
|
||||
-draw "fill black stroke-width 4 stroke black text -5,160 '$3'" \
|
||||
-draw "text -5,160 '$3'"
|
||||
-gravity south \
|
||||
-draw "image over 0,30 0,0 '$3'"
|
||||
else
|
||||
draw_with_footer "$1" "$2"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue