Commit graph

206 commits

Author SHA1 Message Date
Nick Zatkovich
215b7c644e BUILD: remove the last of the imagemagick stuff
The only remaining thing depending on imagemagick are the dist scripts
2017-07-30 23:26:52 -07:00
Nick Zatkovich
6724ef5aba BUILD: switch to use pillow instead
create_caption still relies on ImageMagick
2017-07-30 18:58:54 -07:00
Nick Zatkovich
d3038fad30 BUILD: remove background color from textgen
remove the background color when generating the text, 
then remove the extraneous deutex arguments
2017-07-30 14:08:17 -07:00
Mike Swanson
9c6c681276 Burn all GIFs: Convert everything to PNGs.
DeuTex 5 now supports these, and we can use real transparency indexes
in the files too, so no more ugly cyan background!
2017-07-18 22:26:52 -07:00
Mike Swanson
63efd56679 create_caption: Clean up copyright text more by removing "Freedoom, " 2017-03-14 17:51:34 -07:00
Mike Swanson
af5d98ec50 graphics: ignore the new t_phase1/t_phase2 files 2017-03-14 16:08:52 -07:00
Mike Swanson
0b3edc9548 Merge branch 'titlepic' of gh:Voros2/freedoom 2017-03-14 16:05:10 -07:00
Mike Swanson
a51b9d3398 Merge branch 'titlepic' of gh:Ferk/freedoom 2017-03-14 15:57:34 -07:00
RjY
3143339a64 parallel_textgen: run textgen in parallel
textgen: instead of running ImageMagick yourself, output a Makefile rule
for each graphic. Dependencies are passed on the command line.

Makefile: Add rule for 'textgen.mk' which is built by running textgen.
graphics.stamp depends on textgen.mk and all the built graphics files.
Then, each built graphic depends on textgen.mk, ensuring it is made
first. textgen.mk itself depends on textgen config, font, and dehacked.
(Makefile itself also depends on textgen.mk implicitly via include)

This duplicates previous behaviour where changing textgen config remakes
all text graphics, but one Make rule for each, allowing parallel make
with -j instead of the script doing one at a time.

The built IWADs are byte-for-byte identical before and after this patch
series is applied (provided VERSION is set to the same thing of course)

One problem is 'make clean' rebuilds textgen.mk because Make thinks the
Makefile needs it, but then immediately deletes it. Not sure how to fix.
Use git clean -fdx instead, or just don't clean twice in succession.

----

This gives the following improvement in build time (-j1 as control,
built on 4 cores and a large tmpfs so disk speed isn't a factor)

(master)

    make -j1  4.83s user 6.77s system 93% cpu 12.444 total
    make -j1  4.74s user 6.72s system 93% cpu 12.267 total
    make -j1  4.72s user 6.68s system 92% cpu 12.292 total

    make -j4  5.72s user 6.77s system 109% cpu 11.414 total
    make -j4  5.39s user 6.85s system 107% cpu 11.419 total
    make -j4  5.66s user 6.79s system 109% cpu 11.383 total

parallel_textgen

    make -j1  4.57s user 6.66s system 92% cpu 12.185 total
    make -j1  4.73s user 6.57s system 93% cpu 12.152 total
    make -j1  4.60s user 6.72s system 93% cpu 12.152 total

    make -j4  5.62s user 7.72s system 262% cpu 5.084 total
    make -j4  5.82s user 7.76s system 262% cpu 5.165 total
    make -j4  5.79s user 7.73s system 261% cpu 5.161 total
2017-03-14 17:46:40 +00:00
RjY
946db56ccd parallel_textgen: separate font_render and invoke_command
Replace font_render with get_command which returns the command line
instead of executing it. Move invoke_command to font_render callers.
2017-03-14 13:14:16 +00:00
RjY
e94bcdd9ea graphics/titlepic: remove author subdirectory
- move captainw/* into titlepic (rename fdmtitle to freedm_titlepic)
- fix file paths in dist/Makefile, graphics/titlepic/Makefile
2017-03-14 11:43:33 +00:00
Ayub Ahmed
b1a9fe95e5 titlepic/Makefile: clean only generated t_phase...
images within the directory.
2017-03-13 06:03:13 +06:00
Fernando Carmona Varo
4f5bb82e61 Titlepic: use more discrete breathing orifices 2017-03-11 16:37:19 +01:00
Ayub Ahmed
758c53fb54 text/config.py: make t_phase images white 2017-03-11 21:05:25 +06:00
Ayub Ahmed
209f14f071 create_caption: increase height, remove -style 2017-03-11 19:15:00 +06:00
Ayub Ahmed
943ccbb126 create_caption: make y offset positive 2017-03-11 18:55:21 +06:00
Ayub Ahmed
4a39a7730e create_caption: align line 37 properly 2017-03-11 18:42:08 +06:00
Ayub Ahmed
2326d4a741 create_caption: change color to orange
For better visibility.
2017-03-11 18:37:43 +06:00
Ayub Ahmed
5efe26a29b titlepic/Makefile: fix typo 2017-03-11 11:02:21 +06:00
Ayub Ahmed
4f3acc1325 text/Makefile: select t_phase images for copying 2017-03-11 11:00:55 +06:00
Ayub Ahmed
7c00def304 config.py: add t_phase images to generate 2017-03-11 10:57:50 +06:00
Ayub Ahmed
0cdc7c2330 Makefile: generate t_phase images for titlepic 2017-03-11 10:51:50 +06:00
Ayub Ahmed
9261d53eb8 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
2017-03-11 10:44:04 +06:00
Mike Swanson
55943ca46f Make sure titlepic logo and menu logo are in the same location.
This gives a nice effect of blending the title in with the menu.
We actually used to do this, but it broke with a title screen update.
Thanks @JNechaevsky for the suggestion.

Closes #388
2017-02-23 08:13:54 -08:00
Mike Swanson
c6235d6ffc Makefile: Make sure all built files are removed in make clean. 2017-02-19 12:22:57 -08:00
Mike Swanson
1adfc2d576 RIP widescreen status bar support.
Causes conflicts with ZDoom mods that try to define their own HUDs,
at least three on IRC were reported as being basically totally broken
with Freedoom 0.11.  While it was a good attempt at adding an
enhancement to Freedoom under ZDoom, we cannot afford to break mod
compatibility.
2017-02-17 14:54:19 -08:00
Mike Swanson
5da8e2183e graphics/starms: Try to hide shadow behind the numbers.
Just darkening the fields.  As described in issue #356, vanilla-like
engines produce an odd graphical artifact behind the status bar
numbers.  Even Doom shows small glitchiness masked by the texture.

Should be less obstrusive now.
2017-02-15 17:09:46 -08:00
Blastfrog
985090b8ee graphics: update status bar for widescreen
Closes #371
2017-02-15 16:51:43 -08:00
Mike Swanson
8835afef5f Copyright date bump and apply SPDX tags.
The tags are shorthand for the license of each file and avoid
copying the full license text into each one (and avoids having
to manually update the dates in each one...).
2017-02-15 16:41:53 -08:00
Ayub Ahmed
347e2d408f Widescreen statusbar (#341)
This adds an SBARINFO lump which is recognized by ZDoom and
other compatible ports to show a larger widescreen status bar
on modern monitors.
2016-12-12 17:17:10 -08:00
Ayub Ahmed
3c44dad596 New cursor for FreeDM (#325)
This changes the FreeDM menu cursor to a rocket.
2016-10-20 11:50:14 -04:00
Blastfrog
37287b645f graphics: new interpic
Closes #316
2016-10-16 00:10:23 -07:00
Ayub Ahmed
1379e8cff6 logo fix 2016-09-26 01:04:36 -07:00
Ayub Ahmed
cb103aefce New logo (#269)
Jewellds' new Freedoom title logo. Replaces m_doom.gif
2016-08-29 10:06:37 -04:00
Simon Howard
8dbde24b19 textgen: Add DMWILV* graphics to Makefile.
These images contain the names of the FreeDM intermission screen
level names and need to be copied to the parent directory along
with the CWILV* and WILV* graphics. This fixes a bug introduced
by the earlier desymlinkification of the textgen graphics.
2015-12-24 18:36:36 +01:00
Simon Howard
05bdf65ee2 Add README files for most directories.
Let's make the project easier to explore and understand.
2015-12-24 18:19:25 +01:00
Simon Howard
a8fe8e19e3 graphics: Eliminate symlinks for titlepic images.
Copy these into the parent directory to avoid the need for symlinks.
More progress towards #202.
2015-12-24 11:51:02 +01:00
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
Simon Howard
52ce431dc0 graphics: de-symlinkify empty graphic links.
These symlinks are used to indicate to use an alternate file for certain
graphics. But we can achieve the same by specifying the file in the
deutex config file with the = syntax.
2015-12-23 23:24:43 +01:00
Mike Swanson
482bcac309 de-symlinkify: sodaholic 2015-12-17 01:22:28 -08:00
Mike Swanson
de124e2bb8 de-symlinkify: scubasteve 2015-12-17 01:22:26 -08:00
Mike Swanson
7d0a833a4e de-symlinkify: mewse 2015-12-17 01:22:19 -08:00
Mike Swanson
f6e8744fc1 de-symlinkify: mechadon 2015-12-17 01:22:18 -08:00
Mike Swanson
372b95fcc2 de-symlinkify: kracov 2015-12-17 01:22:15 -08:00
Mike Swanson
6a4a72cd30 de-symlinkify: isle 2015-12-17 01:22:10 -08:00
Mike Swanson
e17a34d9ea de-symlinkify: fraggle 2015-12-17 01:22:01 -08:00
Mike Swanson
9a479cae22 de-symlinkify: espi 2015-12-17 00:25:05 -08:00
Mike Swanson
3467efdf06 de-symlinkify: captainw 2015-12-17 00:24:56 -08:00
Mike Swanson
461be9b6ee de-symlinkify: axdoomer 2015-12-17 00:24:55 -08:00
Mike Swanson
e8dd705b21 de-symlinkify: ajapted 2015-12-17 00:24:26 -08:00