Commit graph

149 commits

Author SHA1 Message Date
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
Mike Swanson
c24337a00d Change Freedoom URL to GitHub 2014-01-01 15:01:46 -08: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
Sodaholic
90057df6e2 graphics: STBAR: updated ammo counter labels from Sodaholic
DW: http://www.doomworld.com/vb/post/1061645
Signed-off-by: RjY <rjy@users.sourceforge.net>
2012-03-28 20:37:10 +01:00
Sodaholic
9269afb877 graphics: new skill level strings from Sodaholic
1. Please don't kill me!
2. Will this hurt?
3. Bring on the pain.
4. Extreme-Carnage
5. Insanity!

DW: http://www.doomworld.com/vb/post/979917
    see rationale for change at http://www.doomworld.com/vb/post/964952
Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-06-16 09:49:55 +01:00
RjY
3d56b50b81 Sharewarendectomy
Consensus that the "shareware" target was no longer necessary was
reached long ago[1]. It just needs to actually get done. Thus:

Makefile:
- remove shareware targets

buildcfg.txt, textures/combined.txt:
- remove #ifdef/#ifndef SHAREWARE sections (almost entirely #ifndef)

graphics/help2.gif:
- remove symlink, help2 screen was shareware-only

gitignore:
- remove shareware files no longer built

textures/shareware:
- remove directory

--
[1] http://www.doomworld.com/vb/freedoom/52758-removing-shareware/ .

In particular, Jon wrote:
>The original purpose of the shareware IWAD was to have a smaller set of
>resources to target 100% completion of. That was probably met a long
>time ago.

More recently chungy wrote in <http://www.doomworld.com/vb/post/957707>
>Removing the "demo"/"shareware" version of Freedoom has been discussed
>but it's never been done. Actually it's a bit easier to just leave it
>in than to remove it. (It'd be pretty easy to get rid of it anyway, but
>nothing is really gained from it)

Signed-off-by: RjY <rjy@users.sourceforge.net>
2011-04-10 11:22:48 +01:00
Mike Swanson
ed41c6f7fc doc/graphics: Change to shorter URL.
There's real work to be done, but this URL is shorter!

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-10-06 18:33:57 -07:00
Catoptromancy
d0a832c6a4 graphics: UFD endpics
Added placeholder endpics for E2,E3 and E4. Keeps boom202 from crashing.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-08-05 14:59:11 -07:00
Mike Swanson
1c34d4c32b titlepic: Make the ultimate target have its own title
Right now it's called "Ultimate Freedoom"; a more original name should
be given later down the line.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-06-23 19:59:46 -07:00
Mike Swanson
c76b06544b graphics: Add raw font files back to the tree
These are recovered from an old backup of Freedoom dated 2002-08-5.  I
found a use for them (specifically, PrBoom menu graphics), so here they
are again if anyone else finds them useful :-)

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2009-01-01 18:39:47 -08:00
Mike Swanson
eaa5704d42 Change website URL in documents
Moved from SourceForge; also levels/sargebaldy/hellkeep.txt had some
weird end of lines (various mix of CRLF, LFCR), that's fixed.

Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
2008-12-22 19:52:38 -08:00
Mike Swanson
95ccde2b71 titlepic: version from git describe if available
Use `git describe` to automatically generate the version on titlepic,
use VERSION file if not a git repository (tarball releases).
2008-12-11 15:39:07 -08:00
Simon Howard
c567b1617a Remove joke ralphis help screen; use titlepic for help2. 2007-07-20 04:05:44 +00:00
Jon Dowland
336791bc61 fix broken symlink 2006-09-18 20:58:33 +00:00
Jon Dowland
a58159ebcd symlinks to gif titlepics, not ppm 2006-09-18 20:32:37 +00:00
Jon Dowland
9ae448c99d use a symlink to Saint_of_Killer's titlepic.gif rather than a ppm copy
use gifs instead of ppms, like the rest of the build system (this is a
relic from ppmcaption anyway)
2006-09-18 20:27:10 +00:00
Jon Dowland
93fcef6463 attic unused resources 2006-09-18 09:52:48 +00:00
Jon Dowland
636a345d9a attic unused resources 2006-09-18 09:52:30 +00:00
Jon Dowland
1721a9d764 I think ralphis did this one 2006-09-18 09:34:16 +00:00
Jon Dowland
4f83fb5223 update titlepic with version number 2006-09-02 19:03:44 +00:00
Jon Dowland
d0f013475e enhance clean target 2006-06-13 21:24:45 +00:00
Simon Howard
f927f20421 Rename graphics/scuba -> graphics/scubasteve to be consistent. 2006-06-04 18:38:05 +00:00
Simon Howard
060fc41577 Fix background to be the correct transparency color. 2006-06-04 17:59:53 +00:00
Simon Howard
868ab15f43 Generate different titlepics for freedoom and freedm. 2006-06-04 15:33:28 +00:00
Simon Howard
7309286c10 Font not needed now we are using imagemagick 2006-05-13 15:37:06 +00:00
Simon Howard
f190e03833 Move kinkyfriend hires sprites to attic. 2006-05-13 15:34:29 +00:00
Simon Howard
4b4df16b3b Remove links to unused graphics. 2006-05-13 00:05:33 +00:00
Simon Howard
a5dda7d5f4 Move all the old status bar faces to the attic. 2006-05-12 23:57:44 +00:00
Simon Howard
35224c3312 Oops! 2006-05-11 09:49:02 +00:00
Simon Howard
6ef34d2e30 Use yyyy/mm/dd (big endian) date format. 2006-05-11 09:33:05 +00:00
Simon Howard
0fcb690599 Output to output.ppm, not output.png 2006-05-11 09:26:27 +00:00
Simon Howard
f2499cddcd Use imagemagick instead of ppmcaption. 2006-05-11 09:24:05 +00:00
Simon Howard
11894c4800 Remove autogenerated and old files. 2006-05-09 16:53:08 +00:00
Simon Howard
cb9954488c Use the version of ppcmaption installed on the system. 2006-05-09 16:51:20 +00:00
Simon Howard
ccb2a30045 Remove precompiled program. 2006-05-09 16:50:36 +00:00
Simon Howard
36658bee0e Import other stuff. 2006-05-09 16:20:42 +00:00