Showing with 29 additions and 19 deletions.
  1. +2 −1 graphics/.gitignore
  2. +1 −1 graphics/text/Makefile
  3. +4 −1 graphics/text/config.py
  4. +13 −6 graphics/titlepic/Makefile
  5. +9 −10 graphics/titlepic/create_caption
3 graphics/.gitignore
View file
@@ -75,6 +75,8 @@ m_wad.gif
m_wadopt.gif
m_weap.gif
prboom.gif
t_phase1.gif
t_phase2.gif
wibp1.gif
wibp2.gif
wibp3.gif
@@ -99,4 +101,3 @@ wiscrt2.gif
wisucks.gif
witime.gif
wivctms.gif

2 graphics/text/Makefile
View file
@@ -15,7 +15,7 @@ TEXTGEN_GRAPHIC_LUMPS = \
m_mess.gif m_mouse.gif m_multi.gif m_player.gif m_serial.gif \
m_setup.gif m_sound.gif m_stat.gif m_status.gif m_tcpip.gif \
m_versen.gif m_video.gif m_wad.gif m_wadopt.gif m_weap.gif \
prboom.gif \
prboom.gif t_phase1.gif t_phase2.gif \
m_ultra.gif wibp1.gif wibp2.gif wibp3.gif wibp4.gif \
wicolon.gif wienter.gif wif.gif wifrgs.gif wipcnt.gif \
wiminus.gif wimstar.gif wimstt.gif wiostf.gif wiosti.gif \
5 graphics/text/config.py
View file
@@ -65,6 +65,10 @@
'wibp4': 'P4',
'wicolon': ':',

# These files are for the title screens of Phase 1 and Phase 2
't_phase1': 'PHASE 1',
't_phase2': 'PHASE 2',

# Note: level names are also included in this dictionary, with
# the data added programatically from the DEHACKED lump, see
# code below.
@@ -244,4 +248,3 @@ def update_level_name(lumpname, bexdata, bexname):
update_level_name('cwilv%02i' % m, freedoom_bex, 'HUSTR_%i' % (m + 1))
# HUSTR_1 => dmwilv00 (from freedm.bex)
update_level_name('dmwilv%02i' % m, freedm_bex, 'HUSTR_%i' % (m + 1))

19 graphics/titlepic/Makefile
View file
@@ -6,20 +6,27 @@ 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
./create_caption $< $@
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 graphics/titlepic/create_caption
View file
@@ -19,23 +19,22 @@ 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
}

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