Commit graph

95 commits

Author SHA1 Message Date
Simon Howard
78b25d0f22 graphics: Eliminate symlinks for text lumps.
Copy the generated text graphics into the parent directory, removing
the need for symlinks and making more progress towards #202.
2015-12-24 11:47:18 +01:00
Mike Swanson
e17a34d9ea de-symlinkify: fraggle 2015-12-17 01:22:01 -08:00
Mike Swanson
fcff7114b0 graphics: generate wikilrs and wivctms with smtextgen
Previously left alone, and with the old font, due to their special
nature, but since then, the small-text generator exists too!  Only
thing special is that wikilrs is rotated, which is resolved simply by
using ImageMagick.

Closes #184
2015-12-15 00:34:14 -08:00
Mike Swanson
90fd6b1686 Cleanup __pycache__ directories with "make clean" 2014-10-29 00:37:42 -07:00
Simon Howard
02bd566362 Update other scripts to support Python 3 build.
A couple of scripts were not Python 3 compatible. Update smtextgen to
use print() instead of bare print, and update the texture build script
to use the correct binary mode for writing binary files.
2014-10-28 03:55:43 +00:00
Jon Dowland
45908da295 Adjust IDENTIFY_OUTPUT_RE for graphicsmagick
The 'identify' binary supplied in graphicsmagick-imagemagick-compat outputs
lines of the form

     fontchars/font033.gif GIF 9x16+0+0 PseudoClass 32c 8-bit 194 0.000u 0:01

However the IDENTIFY_OUTPUT_RE regex was written against an output which lacked
the +0+0 suffix to the dimensions. This patch adjusts accordingly.
2014-10-13 22:36:06 +01:00
Mike Swanson
7356fe4dfa Use Voltcom9's suggestions for chapter titles in Phase 1
Also more consistently refer to the Phase 1 segments as chapters.
It's just another small bit of distancing from Doom.
2014-10-12 20:15:56 -07:00
Mike Swanson
8f48751792 fix the filenames in the last commit 2014-10-05 04:10:41 -07:00
Mike Swanson
110522f10e graphics/text/Makefile: clean more generated files 2014-10-05 04:06:51 -07:00
Simon Howard
c1ea99b483 dehacked: Use https: version of website link.
Github now provides encrypted https: access to its github.io pages.
Use the https: equivalent URL instead of the unencrypted http:
version. Update the CREDIT screen text to do the same.
2014-10-03 05:16:39 +00:00
Mike Swanson
f1c0909cd9 graphics/text/.gitignore additions 2014-09-26 07:17:26 -07:00
Simon Howard
7a1b49e965 textgen: Generate CREDIT screen.
This is one of the screens of text shown between demos in the demo
loop. Generate this from the contents of a static text file. I
originally wanted to generate this programatically from the CREDITS
file but there are too many contributors to fit them all on the page.
2014-09-07 05:25:12 +00:00
Simon Howard
9968fe0ed1 textgen: Add image include support for smtextgen.
Instead of generating text and image parts in separate stages, add
the ability to include an image in the smtextgen command line. This
makes the command line in the Makefile clearer.
2014-09-07 04:22:09 +00:00
Simon Howard
5405104814 textgen: Move common code into a common file.
Reduce code duplication by refactoring the textgen and smtextgen
scripts.
2014-09-07 03:56:45 +00:00
Simon Howard
026ce9137f graphics: Fix name for stealth sphere.
The invisibility power-up is named 'Stealth Sphere' in the Freedoom
DEHACKED lump. Change the HELP screen to match this for consistency.
2014-07-27 03:49:03 +00:00
Simon Howard
18be2c988c graphics: Generate the HELP screen programatically.
The original Doom HELP screen showed the default key bindings for the
game's controls. This is not so useful nowadays: at worst it's
outright misleading because the player might not be using the
defaults, but it's also redundant because most modern source ports
allow the key bindings to be changed via the menus, which doubles as a
convenient list of the current key bindings.

Z0k suggested an alternative HELP screen that shows the items and
powerups available in the game. More discussion can be seen in this
thread: http://www.doomworld.com/vb/freedoom/69458-help/
2014-07-27 03:28:14 +00:00
Brett Harrell
c1af20bcb7 Add lower case font characters.
This extends the new font to include lower case as well as upper
case characters. Add a couple of kerning rules for the lower case
characters so that they render nicely, too.
2014-07-12 22:44:33 +00:00
Simon Howard
7f281321c9 graphics: Generate HELP screens programatically.
Decompose the help screen into three parts: the background, the
text and the title. Generate all except the main text programatically:
the background as a color transformed version of the INTERPIC graphic
and the title using the textgen tool.
2014-06-30 00:10:54 +00:00
Simon Howard
c06cb4478c textgen: Add kerning rules for new font.
These rules provide special cases that adjust the spacing between
certain pairs of characters so that they fit together better.
2014-06-29 22:54:02 +00:00
Brett Harrell
1ef30acfaa graphics: Add new Freedoom font.
This replaces the old Freedoom font with a new chunky one named "Denex".
I (fraggle) have split the font out into separate images for use with
the textgen script, but have included the original source .pcx image
here.

Currently the font only includes uppercase characters and does not
include smaller lowercase ones, so I've hacked the textgen script to
convert all strings to uppercase before rendering. There are also no
font kerning rules for the time being.
2014-06-22 23:50:21 +00:00
Simon Howard
35c61c9318 textgen: Adjust M_MULTI graphic height, alignment.
M_MULTI is used in some multiplayer ports (Zandronum, others?) for
the main menu "Multiplayer" option. Make this taller to match the
other main menu graphics and align appropriately in buildcfg.

This conflicts with the height of the graphic as found in other ports
like SMMU/Eternity/PrBoom, but I've checked, and in those ports it's
either unused or short enough that it still works okay.
2014-02-22 03:07:03 +00:00
Simon Howard
57daf24437 graphics: Change WIMINUS graphic to be red.
This was configured to be white, but it just looks weird next to
the red numbers. Change to red for consistency.
2014-02-05 04:07:30 +00:00
Simon Howard
eb7d4fb280 textgen: Reduce height of lowercase graphics.
If a text string contains all lower-case characters, then generate
it at a reduced height. This is necessary for certain graphics, like
the WIF graphic ("FINISHED") on the intermission screen, otherwise
it ends up in the wrong location (#49).

Adjust the offsets for some graphics in the build config to
compensate, and fix up the vertical offsets for WICOLON/WIMINUS while
we're at it.
2014-02-05 03:41:23 +00:00
Simon Howard
f76e05984a Fix git ignores for several generated files. 2014-01-22 05:47:06 +00:00
Mike Swanson
4c4ad3ac37 Fix a botched merge conflict attempt
While harmless, my previous commit resolving a merge accidentally
resulted in Fabian's line being preserved at the end when it shouldn't
have been.
2014-01-20 06:30:26 -08:00
Mike Swanson
29695eb7ca Merge remote-tracking branch 'fabian/clean_pyc'
Conflicts:
	graphics/text/Makefile
2014-01-20 05:38:21 -08:00
Fabian Greffrath
d9c9b315e6 Remove Python byte-code in the clean rule. 2014-01-20 13:06:50 +01:00
Simon Howard
d241e7f326 build: Fix 'make -j' handling.
Some build targets create multiple outputs, which can cause problems
when doing parallel builds. Clean up the build system so that all
subdir invocations come from the top-level Makefile and use $(MAKE).
Also fix the FREEDOOM/FREEDM lumps to really include the version
number by using $(shell ...) syntax.
2014-01-16 06:30:15 +00:00
Simon Howard
bc5ade0f33 textgen: Fix config file path.
My earlier commit added the wrong config file paths for the dehacked
lumps, which broke the build.
2014-01-11 23:22:05 +00:00
Simon Howard
ec9dcdd073 dehacked: Add dehacked file for FreeDM.
FreeDM has different levels and therefore needs a different BEX
patch to the main project. Update the text generator to generate the
level name graphics for FreeDM based on the new BEX file.
2014-01-10 03:23:33 +00:00
Simon Howard
b1589b05d9 graphics: Build level name graphics for FreeDM.
First stab at fixing #11. Generate DMWILV* lumps containing FreeDM
level names, and include these in the IWAD as the CWILV* lumps
as appropriate.
2014-01-08 04:36:35 +00:00
Simon Howard
9e88cc4466 text: Add freedoom.bex as build dependency.
The text must be rebuilt if the contents of the Dehacked file
change, as level names are imported from it.
2013-12-30 22:39:58 +00:00
RjY
301ad35237 graphics/text: set -colorize alpha channel blend percentage to zero
Give a fourth channel blend percentage of zero so that the alpha channel
of the default fill colour (fully opaque black) is ignored. This fixes
the blue menu titles (skill, episode etc.) having black backgrounds.

The use of -colorize here blends 100% of the default fill colour (black)
into one or more channels of a greyscale image. Mixing in 100% black is
equivalent to nullifying the channel by setting it to zero, e.g. red
text is achieved by mixing 100% black into the green and blue channels.

It turns out, when passed more than one value (to affect all channels by
that percentage equally), -colorize looks for _four_ separate channel
values (RGB and alpha). If fewer are given, the missing ones inherit the
blend percentage of the first channel (red).

For red and white there is no effect, as the red channel is left alone.
But blue blends 100% of the red channel (thus, unwittingly, the alpha
channel) of fully opaque black into the image, making it fully opaque...
2013-12-20 16:06:55 +00:00
RjY
2aaad3eea8 Merge branch 'double_impact'
Conflicts:
	graphics/text/config.py
	lumps/fraggle/freedoom.bex
2013-12-18 12:20:45 +00:00
RjY
30464a1204 graphics/text: run ImageMagick only once per generated image
- factor out command line generation: a new function _make_command_line
  returns most of the command line for a transparent image rendering.

- Callers render_transparent_text and render_text append the output
  filename and extra imagemagick options to colour the background as
  needed. This means imagemagick is only called once per generated
  image, which makes the process considerably faster.

- This also works around a bug in the current version of imagemagick in
  Debian sid, which caused single-character graphics (e.g. winum*) to be
  generated with a black background.

DW: http://www.doomworld.com/vb/post/1221810
Acked-by: Simon Howard <fraggle@gmail.com>
Signed-off-by: RjY <rjy@users.sourceforge.net>
2013-12-15 07:30:47 +00:00
Simon Howard
2b49e3eabc textgen: Strip map number from level name graphics.
The level name shown in the automap should be in the form:
"ExMy: Level Name" but for the intermission screen graphics we just
want "Level Name". Strip the leading level name if it is present.
2013-12-14 20:14:20 -05:00
Simon Howard
1891b5e40b textgen: Set level names from DEHACKED lump.
Use the DEHACKED lump as a source of truth for level names, and set
the textgen configuration accordingly. Make the current level names
in the DEHACKED lump upper case so that the current ExMy/MAPxy names
look correct.
2013-12-14 16:34:01 -05:00
RjY
85a2eb44e2 text/dehacked: Double Impact map names, E4 episode title 2013-12-10 15:46:00 +00:00
Simon Howard
f651c980dd graphics: Fix textgen with Python 2.
Previous fix for Python 3 broke the script under Python 2.
2013-12-01 23:23:59 -05:00
Simon Howard
b37baf5abb graphics: Add kerning for text generator.
Adjust character positions so that some pairs of characters can fit
more closely together.
2013-12-01 23:20:15 -05:00
Simon Howard
0948019b1a graphics: Make textgen script work with Python 3.
Also add copyright notices to Python files.
2013-12-01 21:23:11 -05:00
Simon Howard
2a02344977 graphics: Add missing font characters.
Add font characters for '/' and '?', needed by some text strings.
Adjust the vertical height of the ':' character, and remove some
leftover menu graphics that are no longer needed.
2013-12-01 00:07:28 -05:00
Simon Howard
6150b320f3 graphics: Add 'make clean' target for textgen. 2013-11-30 23:07:39 -05:00
Simon Howard
1cb5232846 graphics: Add overrides for source port text lumps.
Some source ports (PrBoom, Eternity Engine, etc.) come with their own
PWAD files that include custom text graphic lumps for extended menus.
Include some overrides in Freedoom for common ones, so that when
playing in these ports the menus have a consistent look and feel.
2013-11-30 22:28:22 -05:00
Simon Howard
9855d868ea graphics: Generate text graphics programatically.
Remove the big text graphic images used for the menus and the
intermission screen. Instead, generate these graphics programatically
from a script. This allows them to be easily changed and extended
as desired.
2013-11-30 20:55:57 -05:00