archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-03 01:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUILD: remove background color from textgen

Browse source 
remove the background color when generating the text, 
then remove the extraneous deutex arguments
This commit is contained in:
Nick Zatkovich 2017-07-30 14:08:17 -07:00
parent 617a15354f
commit d3038fad30
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -4,7 +4,7 @@ VERSION=$(shell git describe --dirty 2>/dev/null || cat VERSION)
WADS=wads WADS=wads
CPP=scripts/simplecpp CPP=scripts/simplecpp
DEUTEX=deutex DEUTEX=deutex
DEUTEX_BASIC_ARGS=-v0 -rate accept -rgb 0 255 255 DEUTEX_BASIC_ARGS=-v0 -rate accept
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/ DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
FREEDOOM1=$(WADS)/freedoom1.wad FREEDOOM1=$(WADS)/freedoom1.wad
@ -62,7 +62,7 @@ $(FREEDM): wadinfo_freedm.txt subdirs
$(FREEDOOM1): wadinfo_phase1.txt subdirs $(FREEDOOM1): wadinfo_phase1.txt subdirs
@mkdir -p $(WADS) @mkdir -p $(WADS)
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_phase1.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_phase1.txt $@
#--------------------------------------------------------- #---------------------------------------------------------
# phase 2 (doom2) iwad # phase 2 (doom2) iwad
@ -70,7 +70,7 @@ $(FREEDOOM1): wadinfo_phase1.txt subdirs
$(FREEDOOM2): wadinfo_phase2.txt subdirs $(FREEDOOM2): wadinfo_phase2.txt subdirs
@mkdir -p $(WADS) @mkdir -p $(WADS)
rm -f $@ rm -f $@
$(DEUTEX) $(DEUTEX_ARGS) -iwad -lumps -patch -flats -sounds -musics -graphics -sprites -levels -build wadinfo_phase2.txt $@ $(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_phase2.txt $@
%.html: %.adoc %.html: %.adoc
TZ=UTC asciidoc $< TZ=UTC asciidoc $<

12
graphics/text/smtextgen
View file

@ -11,7 +11,7 @@ import re
from common import * from common import *
# Background color for output files. # Background color for output files.
BACKGROUND_COLOR = '#00ffff' BACKGROUND_COLOR = None
# Width of a space character in pixels. # Width of a space character in pixels.
SPACE_WIDTH = 4 SPACE_WIDTH = 4
@ -142,10 +142,12 @@ for xy, string in args['strings']:
command_line.extend(smallfont.draw_commands_for_text( command_line.extend(smallfont.draw_commands_for_text(
string, xy[0], xy[1])) string, xy[0], xy[1]))
command_line.extend(( if BACKGROUND_COLOR is not None:
'-background', BACKGROUND_COLOR, command_line.extend((
'-flatten', args['filename'], '-background', BACKGROUND_COLOR,
)) '-flatten'
))
command_line.extend((args['filename'],))
invoke_command(command_line) invoke_command(command_line)

2
graphics/text/textgen
View file

@ -18,7 +18,7 @@ COLOR_RED = (0, 100, 100)
COLOR_WHITE = (0, 0, 0) COLOR_WHITE = (0, 0, 0)
# Background color for output files. # Background color for output files.
BACKGROUND_COLOR = '#00ffff' BACKGROUND_COLOR = None
# Height of font in pixels. # Height of font in pixels.
FONT_HEIGHT = 15 FONT_HEIGHT = 15