- Changed compilation for g_doom, g_heretic, g_hexen and g_strife folders
so that all files are included by a central one instead of compiling each one separately. This speeds up the compilation process by 25% when doing a complete rebuild in Visual C. - Cleaned up more header dependencies. SVN r1226 (trunk)
This commit is contained in:
parent
b07542ddd6
commit
760f70d3f1
171 changed files with 1667 additions and 250 deletions
|
|
@ -94,12 +94,14 @@ The FON2 header is followed by variable length data:
|
|||
#include "r_draw.h"
|
||||
#include "r_translate.h"
|
||||
#include "colormatcher.h"
|
||||
#include "v_palette.h"
|
||||
|
||||
// MACROS ------------------------------------------------------------------
|
||||
|
||||
#define DEFAULT_LOG_COLOR PalEntry(223,223,223)
|
||||
|
||||
// TYPES -------------------------------------------------------------------
|
||||
void RecordTextureColors (FTexture *pic, BYTE *colorsused);
|
||||
|
||||
// This structure is used by BuildTranslations() to hold color information.
|
||||
struct TranslationParm
|
||||
|
|
@ -116,6 +118,34 @@ struct TranslationMap
|
|||
int Number;
|
||||
};
|
||||
|
||||
class FSingleLumpFont : public FFont
|
||||
{
|
||||
public:
|
||||
FSingleLumpFont (const char *fontname, int lump);
|
||||
|
||||
protected:
|
||||
void CheckFON1Chars (int lump, const BYTE *data, double *luminosity);
|
||||
void BuildTranslations2 ();
|
||||
void FixupPalette (BYTE *identity, double *luminosity, const BYTE *palette,
|
||||
bool rescale, PalEntry *out_palette);
|
||||
void LoadFON1 (int lump, const BYTE *data);
|
||||
void LoadFON2 (int lump, const BYTE *data);
|
||||
void CreateFontFromPic (FTextureID picnum);
|
||||
};
|
||||
|
||||
class FSinglePicFont : public FFont
|
||||
{
|
||||
public:
|
||||
FSinglePicFont(const char *picname);
|
||||
|
||||
// FFont interface
|
||||
FTexture *GetChar (int code, int *const width) const;
|
||||
int GetCharWidth (int code) const;
|
||||
|
||||
protected:
|
||||
FTextureID PicNum;
|
||||
};
|
||||
|
||||
// This is a font character that loads a texture and recolors it.
|
||||
class FFontChar1 : public FTexture
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue