From 9261d53eb830a418e434fea98f8d2b5e6df8a988 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 10:44:04 +0600 Subject: [PATCH 01/11] create_caption: footer and text updates Use blue as fill color rather than white. Add oblique style to footer text. Replace URL with copyright notice. Removed "Version: " text from version footer. Use image rather than text to generate "Phase 1" and "Phase 2" words --- graphics/titlepic/create_caption | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index 73a9cd73..84235620 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -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 blue -font "$font" +dither -style oblique \ + -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,-25 0,0 '$3'" else draw_with_footer "$1" "$2" fi From 0cdc7c2330ec3a2f90bfebbdba4637c1d0014bad Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 10:51:50 +0600 Subject: [PATCH 02/11] Makefile: generate t_phase images for titlepic --- graphics/titlepic/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index bb03f6e4..772cfb11 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -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: ../captainw/fdmtitle.gif @@ -19,7 +25,8 @@ fdmtitle.gif: ../captainw/fdmtitle.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_phase1.gif ../t-phase2.gif t_phase2.gif .PHONY: clean From 7c00def304512c913147932ccab9169abe7d7912 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 10:57:50 +0600 Subject: [PATCH 03/11] config.py: add t_phase images to generate --- graphics/text/config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphics/text/config.py b/graphics/text/config.py index fa6870a0..3e87865e 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -75,6 +75,10 @@ blue_graphics = { 'm_episod': 'Choose Chapter:', 'm_optttl': 'OPTIONS', 'm_skill': 'Choose Skill Level:', + + # These files are for the title screens of Phase 1 and Phase 2 + 't_phase1': 'PHASE 1', + 't_phase2': 'PHASE 2', } red_graphics = { From 4f3acc1325bda7a4d16212b2162d260845c0fcb1 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 11:00:55 +0600 Subject: [PATCH 04/11] text/Makefile: select t_phase images for copying --- graphics/text/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/text/Makefile b/graphics/text/Makefile index 627f9b04..69c34500 100644 --- a/graphics/text/Makefile +++ b/graphics/text/Makefile @@ -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 \ From 5efe26a29b203bee49c2b0950301b85b4d15408f Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 11:02:21 +0600 Subject: [PATCH 05/11] titlepic/Makefile: fix typo --- graphics/titlepic/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index 772cfb11..5629bff7 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -27,6 +27,6 @@ fdmtitle.gif: ../captainw/fdmtitle.gif clean: rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \ ../fd1title.gif ../fd2title.gif ../fdmtitle.gif ../t_phase1.gif \ - t_phase1.gif ../t-phase2.gif t_phase2.gif + t_phase1.gif ../t_phase2.gif t_phase2.gif .PHONY: clean From 2326d4a741d6ca72015b40f446ae86b80141b008 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 18:37:43 +0600 Subject: [PATCH 06/11] create_caption: change color to orange For better visibility. --- graphics/titlepic/create_caption | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index 84235620..8cfb8196 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -19,13 +19,13 @@ draw_with_footer() { output_file=$2; shift; shift - convert $input_file -fill blue -font "$font" +dither -style oblique \ - -pointsize 11 \ - -gravity southwest \ - -draw "text 5,5 'Freedoom, © 2001-2017'" \ - -gravity southeast \ - -draw "text 10,5 '$VERSION'" \ - "$@" \ + convert $input_file -fill orange -font "$font" +dither -style oblique \ + -pointsize 11 \ + -gravity southwest \ + -draw "text 5,5 'Freedoom, © 2001-2017'" \ + -gravity southeast \ + -draw "text 10,5 '$VERSION'" \ + "$@" \ $output_file } From 4a39a7730ea6a950011ff204e085ebab85687323 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 18:42:08 +0600 Subject: [PATCH 07/11] create_caption: align line 37 properly --- graphics/titlepic/create_caption | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index 8cfb8196..f5feb608 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -34,7 +34,7 @@ if [ $# = 4 ]; then -gravity north \ -draw "image over 0,18 0,0 '$2'" \ -gravity south \ - -draw "image over 0,-25 0,0 '$3'" + -draw "image over 0,-25 0,0 '$3'" else draw_with_footer "$1" "$2" fi From 943ccbb1260eb24616686ace12cd1d6b0d17553a Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 18:55:21 +0600 Subject: [PATCH 08/11] create_caption: make y offset positive --- graphics/titlepic/create_caption | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index f5feb608..91fb3d1e 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -34,7 +34,7 @@ if [ $# = 4 ]; then -gravity north \ -draw "image over 0,18 0,0 '$2'" \ -gravity south \ - -draw "image over 0,-25 0,0 '$3'" + -draw "image over 0,25 0,0 '$3'" else draw_with_footer "$1" "$2" fi From 209f14f071cc850ca4f9fab7837a8ac759cb59ca Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 19:15:00 +0600 Subject: [PATCH 09/11] create_caption: increase height, remove -style --- graphics/titlepic/create_caption | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index 91fb3d1e..da2a0494 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -19,7 +19,7 @@ draw_with_footer() { output_file=$2; shift; shift - convert $input_file -fill orange -font "$font" +dither -style oblique \ + convert $input_file -fill orange -font "$font" +dither \ -pointsize 11 \ -gravity southwest \ -draw "text 5,5 'Freedoom, © 2001-2017'" \ @@ -34,7 +34,7 @@ if [ $# = 4 ]; then -gravity north \ -draw "image over 0,18 0,0 '$2'" \ -gravity south \ - -draw "image over 0,25 0,0 '$3'" + -draw "image over 0,30 0,0 '$3'" else draw_with_footer "$1" "$2" fi From 758c53fb542c6b9383341769094f1e8910571e60 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Sat, 11 Mar 2017 21:05:25 +0600 Subject: [PATCH 10/11] text/config.py: make t_phase images white --- graphics/text/config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/text/config.py b/graphics/text/config.py index 3e87865e..8eec788e 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -64,6 +64,10 @@ white_graphics = { 'wibp3': 'P3', '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 @@ -75,10 +79,6 @@ blue_graphics = { 'm_episod': 'Choose Chapter:', 'm_optttl': 'OPTIONS', 'm_skill': 'Choose Skill Level:', - - # These files are for the title screens of Phase 1 and Phase 2 - 't_phase1': 'PHASE 1', - 't_phase2': 'PHASE 2', } red_graphics = { From b1a9fe95e513b2b0e3853d322afe9ff95738e876 Mon Sep 17 00:00:00 2001 From: Ayub Ahmed Date: Mon, 13 Mar 2017 06:03:13 +0600 Subject: [PATCH 11/11] titlepic/Makefile: clean only generated t_phase... images within the directory. --- graphics/titlepic/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index 5629bff7..854b3ec5 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -25,8 +25,8 @@ fdmtitle.gif: ../captainw/fdmtitle.gif cp $@ ../ clean: - rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif \ - ../fd1title.gif ../fd2title.gif ../fdmtitle.gif ../t_phase1.gif \ - t_phase1.gif ../t_phase2.gif t_phase2.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