#include "wad.h"
#include "cl_video.h"
-#include "cl_dyntexture.h"
-dp_font_t dp_fonts[MAX_FONTS] = {{0}};
+#include "ft2.h"
+#include "ft2_fontdefs.h"
-cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
-cvar_t r_textbrightness = {CVAR_SAVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
-cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 0 makes them all black)"};
+struct cachepic_s
+{
+ // size of pic
+ int width, height;
+ // this flag indicates that it should be loaded and unloaded on demand
+ int autoload;
+ // texture flags to upload with
+ int texflags;
+ // texture may be freed after a while
+ int lastusedframe;
+ // renderable texture
+ skinframe_t *skinframe;
+ // used for hash lookups
+ struct cachepic_s *chain;
+ // flags - CACHEPICFLAG_NEWPIC for example
+ unsigned int flags;
+ // name of pic
+ char name[MAX_QPATH];
+};
+
+dp_fonts_t dp_fonts;
+static mempool_t *fonts_mempool = NULL;
-extern cvar_t v_glslgamma;
+cvar_t r_textshadow = {CF_CLIENT | CF_ARCHIVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
+cvar_t r_textbrightness = {CF_CLIENT | CF_ARCHIVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
+cvar_t r_textcontrast = {CF_CLIENT | CF_ARCHIVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 0 makes them all black)"};
+
+cvar_t r_font_postprocess_blur = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_blur", "0", "font blur amount"};
+cvar_t r_font_postprocess_outline = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_outline", "0", "font outline amount"};
+cvar_t r_font_postprocess_shadow_x = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_shadow_x", "0", "font shadow X shift amount, applied during outlining"};
+cvar_t r_font_postprocess_shadow_y = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_shadow_y", "0", "font shadow Y shift amount, applied during outlining"};
+cvar_t r_font_postprocess_shadow_z = {CF_CLIENT | CF_ARCHIVE, "r_font_postprocess_shadow_z", "0", "font shadow Z shift amount, applied during blurring"};
+cvar_t r_font_hinting = {CF_CLIENT | CF_ARCHIVE, "r_font_hinting", "3", "0 = no hinting, 1 = light autohinting, 2 = full autohinting, 3 = full hinting"};
+cvar_t r_font_antialias = {CF_CLIENT | CF_ARCHIVE, "r_font_antialias", "1", "0 = monochrome, 1 = grey" /* , 2 = rgb, 3 = bgr" */};
+cvar_t r_nearest_2d = {CF_CLIENT | CF_ARCHIVE, "r_nearest_2d", "0", "use nearest filtering on all 2d textures (including conchars)"};
+cvar_t r_nearest_conchars = {CF_CLIENT | CF_ARCHIVE, "r_nearest_conchars", "0", "use nearest filtering on conchars texture"};
//=============================================================================
/* Support Routines */
-#define FONT_FILESIZE 13468
-#define MAX_CACHED_PICS 1024
-#define CACHEPICHASHSIZE 256
static cachepic_t *cachepichash[CACHEPICHASHSIZE];
static cachepic_t cachepics[MAX_CACHED_PICS];
static int numcachepics;
-static rtexturepool_t *drawtexturepool;
-
-static const unsigned char concharimage[FONT_FILESIZE] =
-{
-#include "lhfont.h"
-};
-
-static rtexture_t *draw_generateconchars(void)
-{
- int i;
- unsigned char buffer[65536][4], *data = NULL;
- double random;
-
- data = LoadTGA_BGRA (concharimage, FONT_FILESIZE);
-// Gold numbers
- for (i = 0;i < 8192;i++)
- {
- random = lhrandom (0.0,1.0);
- buffer[i][2] = 83 + (unsigned char)(random * 64);
- buffer[i][1] = 71 + (unsigned char)(random * 32);
- buffer[i][0] = 23 + (unsigned char)(random * 16);
- buffer[i][3] = data[i*4+0];
- }
-// White chars
- for (i = 8192;i < 32768;i++)
- {
- random = lhrandom (0.0,1.0);
- buffer[i][2] = 95 + (unsigned char)(random * 64);
- buffer[i][1] = 95 + (unsigned char)(random * 64);
- buffer[i][0] = 95 + (unsigned char)(random * 64);
- buffer[i][3] = data[i*4+0];
- }
-// Gold numbers
- for (i = 32768;i < 40960;i++)
- {
- random = lhrandom (0.0,1.0);
- buffer[i][2] = 83 + (unsigned char)(random * 64);
- buffer[i][1] = 71 + (unsigned char)(random * 32);
- buffer[i][0] = 23 + (unsigned char)(random * 16);
- buffer[i][3] = data[i*4+0];
- }
-// Red chars
- for (i = 40960;i < 65536;i++)
- {
- random = lhrandom (0.0,1.0);
- buffer[i][2] = 96 + (unsigned char)(random * 64);
- buffer[i][1] = 43 + (unsigned char)(random * 32);
- buffer[i][0] = 27 + (unsigned char)(random * 32);
- buffer[i][3] = data[i*4+0];
- }
-
-#if 0
- Image_WriteTGABGRA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
-#endif
-
- Mem_Free(data);
- return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
-}
-
-static rtexture_t *draw_generateditherpattern(void)
-{
- int x, y;
- unsigned char pixels[8][8];
- for (y = 0;y < 8;y++)
- for (x = 0;x < 8;x++)
- pixels[y][x] = ((x^y) & 4) ? 254 : 0;
- return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST | TEXF_PRECACHE, palette_bgra_transparent);
-}
-
-typedef struct embeddedpic_s
-{
- const char *name;
- int width;
- int height;
- const char *pixels;
-}
-embeddedpic_t;
-
-static const embeddedpic_t embeddedpics[] =
-{
- {
- "gfx/prydoncursor001", 16, 16,
- "477777774......."
- "77.....6........"
- "7.....6........."
- "7....6.........."
- "7.....6........."
- "7..6...6........"
- "7.6.6...6......."
- "76...6...6......"
- "4.....6.6......."
- ".......6........"
- "................"
- "................"
- "................"
- "................"
- "................"
- "................"
- },
- {
- "ui/mousepointer", 16, 16,
- "477777774......."
- "77.....6........"
- "7.....6........."
- "7....6.........."
- "7.....6........."
- "7..6...6........"
- "7.6.6...6......."
- "76...6...6......"
- "4.....6.6......."
- ".......6........"
- "................"
- "................"
- "................"
- "................"
- "................"
- "................"
- },
- {
- "gfx/crosshair1", 16, 16,
- "................"
- "................"
- "................"
- "...33......33..."
- "...355....553..."
- "....577..775...."
- ".....77..77....."
- "................"
- "................"
- ".....77..77....."
- "....577..775...."
- "...355....553..."
- "...33......33..."
- "................"
- "................"
- "................"
- },
- {
- "gfx/crosshair2", 16, 16,
- "................"
- "................"
- "................"
- "...3........3..."
- "....5......5...."
- ".....7....7....."
- "......7..7......"
- "................"
- "................"
- "......7..7......"
- ".....7....7....."
- "....5......5...."
- "...3........3..."
- "................"
- "................"
- "................"
- },
- {
- "gfx/crosshair3", 16, 16,
- "................"
- ".......77......."
- ".......77......."
- "................"
- "................"
- ".......44......."
- ".......44......."
- ".77..44..44..77."
- ".77..44..44..77."
- ".......44......."
- ".......44......."
- "................"
- "................"
- ".......77......."
- ".......77......."
- "................"
- },
- {
- "gfx/crosshair4", 16, 16,
- "................"
- "................"
- "................"
- "................"
- "................"
- "................"
- "................"
- "................"
- "........7777777."
- "........752....."
- "........72......"
- "........7......."
- "........7......."
- "........7......."
- "........7......."
- "................"
- },
- {
- "gfx/crosshair5", 8, 8,
- "........"
- "........"
- "....7..."
- "........"
- "..7.7.7."
- "........"
- "....7..."
- "........"
- },
- {
- "gfx/crosshair6", 2, 2,
- "77"
- "77"
- },
- {
- "gfx/crosshair7", 16, 16,
- "................"
- ".3............3."
- "..5...2332...5.."
- "...7.3....3.7..."
- "....7......7...."
- "...3.7....7.3..."
- "..2...7..7...2.."
- "..3..........3.."
- "..3..........3.."
- "..2...7..7...2.."
- "...3.7....7.3..."
- "....7......7...."
- "...7.3....3.7..."
- "..5...2332...5.."
- ".3............3."
- "................"
- },
- {
- "gfx/editlights/cursor", 16, 16,
- "................"
- ".3............3."
- "..5...2332...5.."
- "...7.3....3.7..."
- "....7......7...."
- "...3.7....7.3..."
- "..2...7..7...2.."
- "..3..........3.."
- "..3..........3.."
- "..2...7..7...2.."
- "...3.7....7.3..."
- "....7......7...."
- "...7.3....3.7..."
- "..5...2332...5.."
- ".3............3."
- "................"
- },
- {
- "gfx/editlights/light", 16, 16,
- "................"
- "................"
- "......1111......"
- "....11233211...."
- "...1234554321..."
- "...1356776531..."
- "..124677776421.."
- "..135777777531.."
- "..135777777531.."
- "..124677776421.."
- "...1356776531..."
- "...1234554321..."
- "....11233211...."
- "......1111......"
- "................"
- "................"
- },
- {
- "gfx/editlights/noshadow", 16, 16,
- "................"
- "................"
- "......1111......"
- "....11233211...."
- "...1234554321..."
- "...1356226531..."
- "..12462..26421.."
- "..1352....2531.."
- "..1352....2531.."
- "..12462..26421.."
- "...1356226531..."
- "...1234554321..."
- "....11233211...."
- "......1111......"
- "................"
- "................"
- },
- {
- "gfx/editlights/selection", 16, 16,
- "................"
- ".777752..257777."
- ".742........247."
- ".72..........27."
- ".7............7."
- ".5............5."
- ".2............2."
- "................"
- "................"
- ".2............2."
- ".5............5."
- ".7............7."
- ".72..........27."
- ".742........247."
- ".777752..257777."
- "................"
- },
- {
- "gfx/editlights/cubemaplight", 16, 16,
- "................"
- "................"
- "......2772......"
- "....27755772...."
- "..277533335772.."
- "..753333333357.."
- "..777533335777.."
- "..735775577537.."
- "..733357753337.."
- "..733337733337.."
- "..753337733357.."
- "..277537735772.."
- "....27777772...."
- "......2772......"
- "................"
- "................"
- },
- {
- "gfx/editlights/cubemapnoshadowlight", 16, 16,
- "................"
- "................"
- "......2772......"
- "....27722772...."
- "..2772....2772.."
- "..72........27.."
- "..7772....2777.."
- "..7.27722772.7.."
- "..7...2772...7.."
- "..7....77....7.."
- "..72...77...27.."
- "..2772.77.2772.."
- "....27777772...."
- "......2772......"
- "................"
- "................"
- },
- {NULL, 0, 0, NULL}
-};
-
-static rtexture_t *draw_generatepic(const char *name, qboolean quiet)
-{
- const embeddedpic_t *p;
- for (p = embeddedpics;p->name;p++)
- if (!strcmp(name, p->name))
- return R_LoadTexture2D(drawtexturepool, p->name, p->width, p->height, (const unsigned char *)p->pixels, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_bgra_embeddedpic);
- if (!strcmp(name, "gfx/conchars"))
- return draw_generateconchars();
- if (!strcmp(name, "gfx/colorcontrol/ditherpattern"))
- return draw_generateditherpattern();
- if (!quiet)
- Con_Printf("Draw_CachePic: failed to load %s\n", name);
- return r_texture_notexture;
-}
+rtexturepool_t *drawtexturepool;
+int draw_frame = 1;
/*
================
{
int crc, hashkey;
cachepic_t *pic;
- int flags;
- fs_offset_t lmpsize;
- unsigned char *lmpdata;
- char lmpname[MAX_QPATH];
+ int texflags;
+
+ texflags = TEXF_ALPHA;
+ if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
+ texflags |= TEXF_CLAMP;
+ if (cachepicflags & CACHEPICFLAG_MIPMAP)
+ texflags |= TEXF_MIPMAP;
+ if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer && gl_texturecompression.integer)
+ texflags |= TEXF_COMPRESS;
+ if (cachepicflags & CACHEPICFLAG_LINEAR)
+ texflags |= TEXF_FORCELINEAR;
+ else if ((cachepicflags & CACHEPICFLAG_NEAREST) || r_nearest_2d.integer)
+ texflags |= TEXF_FORCENEAREST;
// check whether the picture has already been cached
crc = CRC_Block((unsigned char *)path, strlen(path));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
- if (!strcmp (path, pic->name))
+ {
+ if (!strcmp(path, pic->name))
+ {
+ // if it was created (or replaced) by Draw_NewPic, just return it
+ if (!(pic->flags & CACHEPICFLAG_NEWPIC))
+ {
+ // reload the pic if texflags changed in important ways
+ // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag, and ignore TEXF_MIPMAP because QC specifies that
+ if ((pic->texflags ^ texflags) & ~(TEXF_COMPRESS | TEXF_MIPMAP))
+ {
+ Con_DPrintf("Draw_CachePic(\"%s\"): frame %i: reloading pic due to mismatch on flags\n", path, draw_frame);
+ goto reload;
+ }
+ if (!pic->skinframe || !pic->skinframe->base)
+ {
+ if (pic->flags & CACHEPICFLAG_FAILONMISSING)
+ return NULL;
+ Con_DPrintf("Draw_CachePic(\"%s\"): frame %i: reloading pic\n", path, draw_frame);
+ goto reload;
+ }
+ if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+ pic->autoload = false; // caller is making this pic persistent
+ }
+ if (pic->skinframe)
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ pic->lastusedframe = draw_frame;
return pic;
+ }
+ }
if (numcachepics == MAX_CACHED_PICS)
{
- Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n");
+ Con_DPrintf ("Draw_CachePic(\"%s\"): frame %i: numcachepics == MAX_CACHED_PICS\n", path, draw_frame);
// FIXME: support NULL in callers?
return cachepics; // return the first one
}
+ Con_DPrintf("Draw_CachePic(\"%s\"): frame %i: loading pic%s\n", path, draw_frame, (cachepicflags & CACHEPICFLAG_NOTPERSISTENT) ? " notpersist" : "");
pic = cachepics + (numcachepics++);
+ memset(pic, 0, sizeof(*pic));
strlcpy (pic->name, path, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
- // check whether it is an dynamic texture (if so, we can directly use its texture handler)
- pic->tex = CL_GetDynTexture( path );
- // if so, set the width/height, too
- if( pic->tex ) {
- pic->width = R_TextureWidth(pic->tex);
- pic->height = R_TextureHeight(pic->tex);
- // we're done now (early-out)
- return pic;
- }
+reload:
+ if (pic->skinframe)
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
- flags = TEXF_ALPHA;
- if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
- flags |= TEXF_PRECACHE;
- if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
- flags |= TEXF_CLAMP;
- if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
- flags |= TEXF_COMPRESS;
+ pic->flags = cachepicflags;
+ pic->texflags = texflags;
+ pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT) != 0;
+ pic->lastusedframe = draw_frame;
- // load a high quality image from disk if possible
- pic->tex = loadtextureimage(drawtexturepool, path, false, flags, true);
- if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
+ if (pic->skinframe)
{
- // compatibility with older versions which did not require gfx/ prefix
- pic->tex = loadtextureimage(drawtexturepool, path + 4, false, flags, true);
+ // reload image after it was unloaded or texflags changed significantly
+ R_SkinFrame_LoadExternal_SkinFrame(pic->skinframe, pic->name, texflags | TEXF_FORCE_RELOAD, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
}
- // if a high quality image was loaded, set the pic's size to match it, just
- // in case there's no low quality version to get the size from
- if (pic->tex)
+ else
{
- pic->width = R_TextureWidth(pic->tex);
- pic->height = R_TextureHeight(pic->tex);
+ // load high quality image (this falls back to low quality too)
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, texflags | TEXF_FORCE_RELOAD, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
}
- // now read the low quality version (wad or lmp file), and take the pic
- // size from that even if we don't upload the texture, this way the pics
- // show up the right size in the menu even if they were replaced with
- // higher or lower resolution versions
- dpsnprintf(lmpname, sizeof(lmpname), "%s.lmp", path);
- if (!strncmp(path, "gfx/", 4) && (lmpdata = FS_LoadFile(lmpname, tempmempool, false, &lmpsize)))
+ // get the dimensions of the image we loaded (if it was successful)
+ if (pic->skinframe && pic->skinframe->base)
{
- if (developer_loading.integer)
- Con_Printf("loading lump \"%s\"\n", path);
-
- if (lmpsize >= 9)
- {
- pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
- pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
- // if no high quality replacement image was found, upload the original low quality texture
- if (!pic->tex)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_transparent);
- }
- Mem_Free(lmpdata);
+ pic->width = R_TextureWidth(pic->skinframe->base);
+ pic->height = R_TextureHeight(pic->skinframe->base);
}
- else if ((lmpdata = W_GetLumpName (path + 4)))
- {
- if (developer_loading.integer)
- Con_Printf("loading gfx.wad lump \"%s\"\n", path + 4);
- if (!strcmp(path, "gfx/conchars"))
- {
- // conchars is a raw image and with color 0 as transparent instead of 255
- pic->width = 128;
- pic->height = 128;
- // if no high quality replacement image was found, upload the original low quality texture
- if (!pic->tex)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_font);
- }
- else
- {
- pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
- pic->height = lmpdata[4] + lmpdata[5] * 256 + lmpdata[6] * 65536 + lmpdata[7] * 16777216;
- // if no high quality replacement image was found, upload the original low quality texture
- if (!pic->tex)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, flags & ~TEXF_COMPRESS, palette_bgra_transparent);
- }
- }
+ // check for a low quality version of the pic and use its size if possible, to match the stock hud
+ Image_GetStockPicSize(pic->name, &pic->width, &pic->height);
+
+ return pic;
+}
+
+cachepic_t *Draw_CachePic (const char *path)
+{
+ return Draw_CachePic_Flags (path, 0); // default to persistent!
+}
+
+const char *Draw_GetPicName(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return "";
+ return pic->name;
+}
+
+int Draw_GetPicWidth(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return 0;
+ return pic->width;
+}
+
+int Draw_GetPicHeight(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return 0;
+ return pic->height;
+}
- // if it's not found on disk, generate an image
- if (pic->tex == NULL)
+qbool Draw_IsPicLoaded(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return false;
+ if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
{
- pic->tex = draw_generatepic(path, (cachepicflags & CACHEPICFLAG_QUIET) != 0);
- pic->width = R_TextureWidth(pic->tex);
- pic->height = R_TextureHeight(pic->tex);
+ Con_DPrintf("Draw_IsPicLoaded(\"%s\"): Loading external skin\n", pic->name);
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
}
+ // skinframe will only be NULL if the pic was created with CACHEPICFLAG_FAILONMISSING and not found
+ return pic->skinframe != NULL && pic->skinframe->base != NULL;
+}
- return pic;
+rtexture_t *Draw_GetPicTexture(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return NULL;
+ if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
+ {
+ Con_DPrintf("Draw_GetPicTexture(\"%s\"): Loading external skin\n", pic->name);
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags | TEXF_FORCE_RELOAD, false, true);
+ }
+ pic->lastusedframe = draw_frame;
+ return pic->skinframe ? pic->skinframe->base : NULL;
}
-cachepic_t *Draw_CachePic (const char *path)
+void Draw_Frame(void)
{
- return Draw_CachePic_Flags (path, 0);
+ int i;
+ cachepic_t *pic;
+ static double nextpurgetime;
+ if (nextpurgetime > host.realtime)
+ return;
+ nextpurgetime = host.realtime + 0.05;
+ for (i = 0, pic = cachepics;i < numcachepics;i++, pic++)
+ {
+ if (pic->autoload && pic->skinframe && pic->skinframe->base && pic->lastusedframe < draw_frame - 3)
+ {
+ Con_DPrintf("Draw_Frame(%i): Unloading \"%s\"\n", draw_frame, pic->name);
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
+ }
+ }
+ draw_frame++;
}
-cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels_bgra)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, unsigned char *pixels_bgra, textype_t textype, int texflags)
{
int crc, hashkey;
cachepic_t *pic;
if (pic)
{
- if (pic->tex && pic->width == width && pic->height == height)
+ if (pic->flags & CACHEPICFLAG_NEWPIC && pic->skinframe && pic->skinframe->base && pic->width == width && pic->height == height)
{
- R_UpdateTexture(pic->tex, pixels_bgra, 0, 0, width, height);
+ Con_DPrintf("Draw_NewPic(\"%s\"): frame %i: updating texture\n", picname, draw_frame);
+ R_UpdateTexture(pic->skinframe->base, pixels_bgra, 0, 0, 0, width, height, 1, 0);
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ pic->lastusedframe = draw_frame;
return pic;
}
+ Con_DPrintf("Draw_NewPic(\"%s\"): frame %i: reloading pic because flags/size changed\n", picname, draw_frame);
}
else
{
- if (pic == NULL)
+ if (numcachepics == MAX_CACHED_PICS)
{
- if (numcachepics == MAX_CACHED_PICS)
- {
- Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
- // FIXME: support NULL in callers?
- return cachepics; // return the first one
- }
- pic = cachepics + (numcachepics++);
- strlcpy (pic->name, picname, sizeof(pic->name));
- // link into list
- pic->chain = cachepichash[hashkey];
- cachepichash[hashkey] = pic;
+ Con_DPrintf ("Draw_NewPic(\"%s\"): frame %i: numcachepics == MAX_CACHED_PICS\n", picname, draw_frame);
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
}
+ Con_DPrintf("Draw_NewPic(\"%s\"): frame %i: creating new cachepic\n", picname, draw_frame);
+ pic = cachepics + (numcachepics++);
+ memset(pic, 0, sizeof(*pic));
+ strlcpy (pic->name, picname, sizeof(pic->name));
+ // link into list
+ pic->chain = cachepichash[hashkey];
+ cachepichash[hashkey] = pic;
}
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
+
+ pic->autoload = false;
+ pic->flags = CACHEPICFLAG_NEWPIC; // disable texflags checks in Draw_CachePic
+ pic->flags |= (texflags & TEXF_CLAMP) ? 0 : CACHEPICFLAG_NOCLAMP;
+ pic->flags |= (texflags & TEXF_FORCENEAREST) ? CACHEPICFLAG_NEAREST : 0;
pic->width = width;
pic->height = height;
- if (pic->tex)
- R_FreeTexture(pic->tex);
- pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, alpha ? TEXF_ALPHA : 0, NULL);
+ pic->skinframe = R_SkinFrame_LoadInternalBGRA(picname, texflags | TEXF_FORCE_RELOAD, pixels_bgra, width, height, 0, 0, 0, vid.sRGB2D);
+ pic->lastusedframe = draw_frame;
return pic;
}
int crc;
int hashkey;
cachepic_t *pic;
- // this doesn't really free the pic, but does free it's texture
+ // this doesn't really free the pic, but does free its texture
crc = CRC_Block((unsigned char *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
{
- if (!strcmp (picname, pic->name) && pic->tex)
+ if (!strcmp (picname, pic->name) && pic->skinframe)
{
- R_FreeTexture(pic->tex);
- pic->width = 0;
- pic->height = 0;
+ Con_DPrintf("Draw_FreePic(\"%s\"): frame %i: freeing pic\n", picname, draw_frame);
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
return;
}
}
}
+static float snap_to_pixel_x(float x, float roundUpAt);
extern int con_linewidth; // to force rewrapping
-static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
+void LoadFont(qbool override, const char *name, dp_font_t *fnt, float scale, float voffset)
{
- int i;
- float maxwidth, scale;
+ int i, ch;
+ float maxwidth;
char widthfile[MAX_QPATH];
char *widthbuf;
fs_offset_t widthbufsize;
if(override || !fnt->texpath[0])
+ {
strlcpy(fnt->texpath, name, sizeof(fnt->texpath));
+ // load the cvars when the font is FIRST loader
+ fnt->settings.scale = scale;
+ fnt->settings.voffset = voffset;
+ fnt->settings.antialias = r_font_antialias.integer;
+ fnt->settings.hinting = r_font_hinting.integer;
+ fnt->settings.outline = r_font_postprocess_outline.value;
+ fnt->settings.blur = r_font_postprocess_blur.value;
+ fnt->settings.shadowx = r_font_postprocess_shadow_x.value;
+ fnt->settings.shadowy = r_font_postprocess_shadow_y.value;
+ fnt->settings.shadowz = r_font_postprocess_shadow_z.value;
+ }
+ // fix bad scale
+ if (fnt->settings.scale <= 0)
+ fnt->settings.scale = 1;
if(drawtexturepool == NULL)
return; // before gl_draw_start, so will be loaded later
- fnt->tex = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
- if(fnt->tex == r_texture_notexture)
+ if(fnt->ft2)
{
- fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
- strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+ // clear freetype font
+ Font_UnloadFont(fnt->ft2);
+ Mem_Free(fnt->ft2);
+ fnt->ft2 = NULL;
+ }
+
+ if(fnt->req_face != -1)
+ {
+ if(!Font_LoadFont(fnt->texpath, fnt))
+ Con_DPrintf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
+ }
+
+ fnt->pic = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0) | CACHEPICFLAG_FAILONMISSING);
+ if(!Draw_IsPicLoaded(fnt->pic))
+ {
+ for (i = 0; i < MAX_FONT_FALLBACKS; ++i)
+ {
+ if (!fnt->fallbacks[i][0])
+ break;
+ fnt->pic = Draw_CachePic_Flags(fnt->fallbacks[i], CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0) | CACHEPICFLAG_FAILONMISSING);
+ if(Draw_IsPicLoaded(fnt->pic))
+ break;
+ }
+ if(!Draw_IsPicLoaded(fnt->pic))
+ {
+ fnt->pic = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0));
+ strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
+ }
+ else
+ dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->fallbacks[i]);
}
else
dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->texpath);
// unspecified width == 1 (base width)
- for(i = 1; i < 256; ++i)
- fnt->width_of[i] = 1;
- scale = 1;
+ for(ch = 0; ch < 256; ++ch)
+ fnt->width_of[ch] = 1;
// FIXME load "name.width", if it fails, fill all with 1
if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize)))
{
float extraspacing = 0;
const char *p = widthbuf;
- int ch = 0;
+ ch = 0;
while(ch < 256)
{
- if(!COM_ParseToken_Simple(&p, false, false))
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
switch(*com_token)
case '+':
case '-':
case '.':
- fnt->width_of[ch++] = atof(com_token) + extraspacing;
+ fnt->width_of[ch] = atof(com_token) + extraspacing;
+ ch++;
break;
default:
if(!strcmp(com_token, "extraspacing"))
{
- if(!COM_ParseToken_Simple(&p, false, false))
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
extraspacing = atof(com_token);
}
else if(!strcmp(com_token, "scale"))
{
- if(!COM_ParseToken_Simple(&p, false, false))
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
- scale = atof(com_token);
+ fnt->settings.scale = atof(com_token);
}
else
{
- Con_Printf("Warning: skipped unknown font property %s\n", com_token);
- if(!COM_ParseToken_Simple(&p, false, false))
+ Con_DPrintf("Warning: skipped unknown font property %s\n", com_token);
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
}
break;
Mem_Free(widthbuf);
}
- maxwidth = fnt->width_of[1];
- for(i = 2; i < 256; ++i)
+ if(fnt->ft2)
+ {
+ for (i = 0; i < MAX_FONT_SIZES; ++i)
+ {
+ ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i);
+ if (!map)
+ break;
+ for(ch = 0; ch < 256; ++ch)
+ map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
+ }
+ }
+
+ maxwidth = fnt->width_of[0];
+ for(i = 1; i < 256; ++i)
maxwidth = max(maxwidth, fnt->width_of[i]);
fnt->maxwidth = maxwidth;
// fix up maxwidth for overlap
- fnt->maxwidth *= scale;
- fnt->scale = scale;
+ fnt->maxwidth *= fnt->settings.scale;
if(fnt == FONT_CONSOLE)
con_linewidth = -1; // rewrap console in next frame
}
-static dp_font_t *FindFont(const char *title)
+extern cvar_t developer_font;
+dp_font_t *FindFont(const char *title, qbool allocate_new)
{
- int i;
- for(i = 0; i < MAX_FONTS; ++i)
- if(!strcmp(dp_fonts[i].title, title))
- return &dp_fonts[i];
+ int i, oldsize;
+
+ // find font
+ for(i = 0; i < dp_fonts.maxsize; ++i)
+ if(!strcmp(dp_fonts.f[i].title, title))
+ return &dp_fonts.f[i];
+ // if not found - try allocate
+ if (allocate_new)
+ {
+ // find any font with empty title
+ for(i = 0; i < dp_fonts.maxsize; ++i)
+ {
+ if(!strcmp(dp_fonts.f[i].title, ""))
+ {
+ strlcpy(dp_fonts.f[i].title, title, sizeof(dp_fonts.f[i].title));
+ return &dp_fonts.f[i];
+ }
+ }
+ // if no any 'free' fonts - expand buffer
+ oldsize = dp_fonts.maxsize;
+ dp_fonts.maxsize = dp_fonts.maxsize + FONTS_EXPAND;
+ if (developer_font.integer)
+ Con_Printf("FindFont: enlarging fonts buffer (%i -> %i)\n", oldsize, dp_fonts.maxsize);
+ dp_fonts.f = (dp_font_t *)Mem_Realloc(fonts_mempool, dp_fonts.f, sizeof(dp_font_t) * dp_fonts.maxsize);
+ // relink ft2 structures
+ for(i = 0; i < oldsize; ++i)
+ if (dp_fonts.f[i].ft2)
+ dp_fonts.f[i].ft2->settings = &dp_fonts.f[i].settings;
+ // register a font in first expanded slot
+ strlcpy(dp_fonts.f[oldsize].title, title, sizeof(dp_fonts.f[oldsize].title));
+ return &dp_fonts.f[oldsize];
+ }
return NULL;
}
-static void LoadFont_f(void)
+static float snap_to_pixel_x(float x, float roundUpAt)
+{
+ float pixelpos = x * vid.width / vid_conwidth.value;
+ int snap = (int) pixelpos;
+ if (pixelpos - snap >= roundUpAt) ++snap;
+ return ((float)snap * vid_conwidth.value / vid.width);
+ /*
+ x = (int)(x * vid.width / vid_conwidth.value);
+ x = (x * vid_conwidth.value / vid.width);
+ return x;
+ */
+}
+
+static float snap_to_pixel_y(float y, float roundUpAt)
+{
+ float pixelpos = y * vid.height / vid_conheight.value;
+ int snap = (int) pixelpos;
+ if (pixelpos - snap > roundUpAt) ++snap;
+ return ((float)snap * vid_conheight.value / vid.height);
+ /*
+ y = (int)(y * vid.height / vid_conheight.value);
+ y = (y * vid_conheight.value / vid.height);
+ return y;
+ */
+}
+
+static void LoadFont_f(cmd_state_t *cmd)
{
dp_font_t *f;
- int i;
- if(Cmd_Argc() < 2)
+ int i, sizes;
+ const char *filelist, *c, *cm;
+ float sz, scale, voffset;
+ char mainfont[MAX_QPATH];
+
+ if(Cmd_Argc(cmd) < 2)
{
Con_Printf("Available font commands:\n");
- for(i = 0; i < MAX_FONTS; ++i)
- Con_Printf(" loadfont %s gfx/tgafile\n", dp_fonts[i].title);
+ for(i = 0; i < dp_fonts.maxsize; ++i)
+ if (dp_fonts.f[i].title[0])
+ Con_Printf(" loadfont %s gfx/tgafile[...] [custom switches] [sizes...]\n", dp_fonts.f[i].title);
+ Con_Printf("A font can simply be gfx/tgafile, or alternatively you\n"
+ "can specify multiple fonts and faces\n"
+ "Like this: gfx/vera-sans:2,gfx/fallback:1\n"
+ "to load face 2 of the font gfx/vera-sans and use face 1\n"
+ "of gfx/fallback as fallback font.\n"
+ "You can also specify a list of font sizes to load, like this:\n"
+ "loadfont console gfx/conchars,gfx/fallback 8 12 16 24 32\n"
+ "In many cases, 8 12 16 24 32 should be a good choice.\n"
+ "custom switches:\n"
+ " scale x : scale all characters by this amount when rendering (doesnt change line height)\n"
+ " voffset x : offset all chars vertical when rendering, this is multiplied to character height\n"
+ );
return;
}
- f = FindFont(Cmd_Argv(1));
+ f = FindFont(Cmd_Argv(cmd, 1), true);
if(f == NULL)
{
Con_Printf("font function not found\n");
return;
}
- LoadFont(true, (Cmd_Argc() < 3) ? "gfx/conchars" : Cmd_Argv(2), f);
+
+ if(Cmd_Argc(cmd) < 3)
+ filelist = "gfx/conchars";
+ else
+ filelist = Cmd_Argv(cmd, 2);
+
+ memset(f->fallbacks, 0, sizeof(f->fallbacks));
+ memset(f->fallback_faces, 0, sizeof(f->fallback_faces));
+
+ // first font is handled "normally"
+ c = strchr(filelist, ':');
+ cm = strchr(filelist, ',');
+ if(c && (!cm || c < cm))
+ f->req_face = atoi(c+1);
+ else
+ {
+ f->req_face = 0;
+ c = cm;
+ }
+
+ if(!c || (c - filelist) > MAX_QPATH)
+ strlcpy(mainfont, filelist, sizeof(mainfont));
+ else
+ {
+ memcpy(mainfont, filelist, c - filelist);
+ mainfont[c - filelist] = 0;
+ }
+
+ for(i = 0; i < MAX_FONT_FALLBACKS; ++i)
+ {
+ c = strchr(filelist, ',');
+ if(!c)
+ break;
+ filelist = c + 1;
+ if(!*filelist)
+ break;
+ c = strchr(filelist, ':');
+ cm = strchr(filelist, ',');
+ if(c && (!cm || c < cm))
+ f->fallback_faces[i] = atoi(c+1);
+ else
+ {
+ f->fallback_faces[i] = 0; // f->req_face; could make it stick to the default-font's face index
+ c = cm;
+ }
+ if(!c || (c-filelist) > MAX_QPATH)
+ {
+ strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
+ }
+ else
+ {
+ memcpy(f->fallbacks[i], filelist, c - filelist);
+ f->fallbacks[i][c - filelist] = 0;
+ }
+ }
+
+ // for now: by default load only one size: the default size
+ f->req_sizes[0] = 0;
+ for(i = 1; i < MAX_FONT_SIZES; ++i)
+ f->req_sizes[i] = -1;
+
+ scale = 1;
+ voffset = 0;
+ if(Cmd_Argc(cmd) >= 4)
+ {
+ for(sizes = 0, i = 3; i < Cmd_Argc(cmd); ++i)
+ {
+ // special switches
+ if (!strcmp(Cmd_Argv(cmd, i), "scale"))
+ {
+ i++;
+ if (i < Cmd_Argc(cmd))
+ scale = atof(Cmd_Argv(cmd, i));
+ continue;
+ }
+ if (!strcmp(Cmd_Argv(cmd, i), "voffset"))
+ {
+ i++;
+ if (i < Cmd_Argc(cmd))
+ voffset = atof(Cmd_Argv(cmd, i));
+ continue;
+ }
+
+ if (sizes == -1)
+ continue; // no slot for other sizes
+
+ // parse one of sizes
+ sz = atof(Cmd_Argv(cmd, i));
+ if (sz > 0.001f && sz < 1000.0f) // do not use crap sizes
+ {
+ // search for duplicated sizes
+ int j;
+ for (j=0; j<sizes; j++)
+ if (f->req_sizes[j] == sz)
+ break;
+ if (j != sizes)
+ continue; // sz already in req_sizes, don't add it again
+
+ if (sizes == MAX_FONT_SIZES)
+ {
+ Con_Printf(CON_WARN "Warning: specified more than %i different font sizes, exceding ones are ignored\n", MAX_FONT_SIZES);
+ sizes = -1;
+ continue;
+ }
+ f->req_sizes[sizes] = sz;
+ sizes++;
+ }
+ }
+ }
+
+ LoadFont(true, mainfont, f, scale, voffset);
}
/*
static void gl_draw_start(void)
{
int i;
+ char vabuf[1024];
drawtexturepool = R_AllocTexturePool();
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
- for(i = 0; i < MAX_FONTS; ++i)
- LoadFont(false, va("gfx/font_%s", dp_fonts[i].title), &dp_fonts[i]);
+ font_start();
- // draw the loading screen so people have something to see in the newly opened window
- SCR_UpdateLoadingScreen(true);
+ // load default font textures
+ for(i = 0; i < dp_fonts.maxsize; ++i)
+ if (dp_fonts.f[i].title[0])
+ LoadFont(false, va(vabuf, sizeof(vabuf), "gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0);
}
static void gl_draw_shutdown(void)
{
+ font_shutdown();
+
R_FreeTexturePool(&drawtexturepool);
numcachepics = 0;
static void gl_draw_newmap(void)
{
+ int i;
+ font_newmap();
+
+ // mark all of the persistent pics so they are not purged...
+ for (i = 0; i < numcachepics; i++)
+ {
+ cachepic_t *pic = cachepics + i;
+ if (!pic->autoload && pic->skinframe)
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ }
}
void GL_Draw_Init (void)
{
int i, j;
+
+ Cvar_RegisterVariable(&r_font_postprocess_blur);
+ Cvar_RegisterVariable(&r_font_postprocess_outline);
+ Cvar_RegisterVariable(&r_font_postprocess_shadow_x);
+ Cvar_RegisterVariable(&r_font_postprocess_shadow_y);
+ Cvar_RegisterVariable(&r_font_postprocess_shadow_z);
+ Cvar_RegisterVariable(&r_font_hinting);
+ Cvar_RegisterVariable(&r_font_antialias);
Cvar_RegisterVariable(&r_textshadow);
Cvar_RegisterVariable(&r_textbrightness);
Cvar_RegisterVariable(&r_textcontrast);
- Cmd_AddCommand ("loadfont",LoadFont_f, "loadfont function tganame loads a font; example: loadfont console gfx/veramono; loadfont without arguments lists the available functions");
- R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
+ Cvar_RegisterVariable(&r_nearest_2d);
+ Cvar_RegisterVariable(&r_nearest_conchars);
+
+ // allocate fonts storage
+ fonts_mempool = Mem_AllocPool("FONTS", 0, NULL);
+ dp_fonts.maxsize = MAX_FONTS;
+ dp_fonts.f = (dp_font_t *)Mem_Alloc(fonts_mempool, sizeof(dp_font_t) * dp_fonts.maxsize);
+ memset(dp_fonts.f, 0, sizeof(dp_font_t) * dp_fonts.maxsize);
+ // assign starting font names
strlcpy(FONT_DEFAULT->title, "default", sizeof(FONT_DEFAULT->title));
- strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
+ strlcpy(FONT_DEFAULT->texpath, "gfx/conchars", sizeof(FONT_DEFAULT->texpath));
strlcpy(FONT_CONSOLE->title, "console", sizeof(FONT_CONSOLE->title));
strlcpy(FONT_SBAR->title, "sbar", sizeof(FONT_SBAR->title));
strlcpy(FONT_NOTIFY->title, "notify", sizeof(FONT_NOTIFY->title));
strlcpy(FONT_INFOBAR->title, "infobar", sizeof(FONT_INFOBAR->title));
strlcpy(FONT_MENU->title, "menu", sizeof(FONT_MENU->title));
for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
- if(!FONT_USER[i].title[0])
- dpsnprintf(FONT_USER[i].title, sizeof(FONT_USER[i].title), "user%d", j++);
-}
+ if(!FONT_USER(i)->title[0])
+ dpsnprintf(FONT_USER(i)->title, sizeof(FONT_USER(i)->title), "user%d", j++);
-void _DrawQ_Setup(void)
-{
- if (r_refdef.draw2dstage)
- return;
- r_refdef.draw2dstage = true;
- CHECKGLERROR
- qglViewport(r_refdef.view.x, vid.height - (r_refdef.view.y + r_refdef.view.height), r_refdef.view.width, r_refdef.view.height);CHECKGLERROR
- GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
- GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
- qglDepthFunc(GL_LEQUAL);CHECKGLERROR
- qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR
- GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
- R_Mesh_Matrix(&identitymatrix);
-
- GL_DepthMask(true);
- GL_DepthRange(0, 1);
- GL_PolygonOffset(0, 0);
- GL_DepthTest(false);
- GL_Color(1,1,1,1);
- GL_AlphaTest(false);
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
- R_SetupGenericShader(true);
+ Cmd_AddCommand(CF_CLIENT, "loadfont", LoadFont_f, "loadfont function tganame loads a font; example: loadfont console gfx/veramono; loadfont without arguments lists the available functions");
+ R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL);
}
-static void _DrawQ_ProcessDrawFlag(int flags)
+void DrawQ_Start(void)
{
- _DrawQ_Setup();
- CHECKGLERROR
- if(flags == DRAWFLAG_ADDITIVE)
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
- else if(flags == DRAWFLAG_MODULATE)
- GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
- else if(flags == DRAWFLAG_2XMODULATE)
- GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
- else if(flags == DRAWFLAG_SCREEN)
- GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- else
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ r_refdef.draw2dstage = 1;
+ R_ResetViewRendering2D_Common(0, NULL, NULL, 0, 0, vid.width, vid.height, vid_conwidth.integer, vid_conheight.integer);
}
+qbool r_draw2d_force = false;
+
void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
{
- float floats[20];
-
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
-
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
- R_SetupGenericShader(pic != NULL);
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_Mesh_TexBind(0, R_GetTexture(pic->tex));
- R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
-
-#if 1
- floats[12] = 0.0f;floats[13] = 0.0f;
- floats[14] = 1.0f;floats[15] = 0.0f;
- floats[16] = 1.0f;floats[17] = 1.0f;
- floats[18] = 0.0f;floats[19] = 1.0f;
-#else
- // AK07: lets be texel correct on the corners
- {
- float horz_offset = 0.5f / pic->width;
- float vert_offset = 0.5f / pic->height;
-
- floats[12] = 0.0f + horz_offset;floats[13] = 0.0f + vert_offset;
- floats[14] = 1.0f - horz_offset;floats[15] = 0.0f + vert_offset;
- floats[16] = 1.0f - horz_offset;floats[17] = 1.0f - vert_offset;
- floats[18] = 0.0f + horz_offset;floats[19] = 1.0f - vert_offset;
- }
-#endif
- }
-
- floats[2] = floats[5] = floats[8] = floats[11] = 0;
- floats[0] = floats[9] = x;
- floats[1] = floats[4] = y;
- floats[3] = floats[6] = x + width;
- floats[7] = floats[10] = y + height;
-
- R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
+ model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ if (!pic)
+ pic = Draw_CachePic("white");
+ // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+ Draw_GetPicTexture(pic);
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x , y , 0, 0, 0, -1, 0, 0, 0, 0, red, green, blue, alpha);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y , 0, 0, 0, -1, 1, 0, 0, 0, red, green, blue, alpha);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y + height, 0, 0, 0, -1, 1, 1, 0, 0, red, green, blue, alpha);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x , y + height, 0, 0, 0, -1, 0, 1, 0, 0, red, green, blue, alpha);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
}
void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height, float org_x, float org_y, float angle, float red, float green, float blue, float alpha, int flags)
{
- float floats[20];
float af = DEG2RAD(-angle); // forward
float ar = DEG2RAD(-angle + 90); // right
float sinaf = sin(af);
float cosaf = cos(af);
float sinar = sin(ar);
float cosar = cos(ar);
-
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
-
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
- R_SetupGenericShader(pic != NULL);
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_Mesh_TexBind(0, R_GetTexture(pic->tex));
- R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
-
- floats[12] = 0.0f;floats[13] = 0.0f;
- floats[14] = 1.0f;floats[15] = 0.0f;
- floats[16] = 1.0f;floats[17] = 1.0f;
- floats[18] = 0.0f;floats[19] = 1.0f;
- }
-
- floats[2] = floats[5] = floats[8] = floats[11] = 0;
-
-// top left
- floats[0] = x - cosaf*org_x - cosar*org_y;
- floats[1] = y - sinaf*org_x - sinar*org_y;
-
-// top right
- floats[3] = x + cosaf*(width-org_x) - cosar*org_y;
- floats[4] = y + sinaf*(width-org_x) - sinar*org_y;
-
-// bottom right
- floats[6] = x + cosaf*(width-org_x) + cosar*(height-org_y);
- floats[7] = y + sinaf*(width-org_x) + sinar*(height-org_y);
-
-// bottom left
- floats[9] = x - cosaf*org_x + cosar*(height-org_y);
- floats[10] = y - sinaf*org_x + sinar*(height-org_y);
-
- R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
+ model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ if (!pic)
+ pic = Draw_CachePic("white");
+ // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+ Draw_GetPicTexture(pic);
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x - cosaf * org_x - cosar * org_y , y - sinaf * org_x - sinar * org_y , 0, 0, 0, -1, 0, 0, 0, 0, red, green, blue, alpha);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x + cosaf * (width - org_x) - cosar * org_y , y + sinaf * (width - org_x) - sinar * org_y , 0, 0, 0, -1, 1, 0, 0, 0, red, green, blue, alpha);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x + cosaf * (width - org_x) + cosar * (height - org_y), y + sinaf * (width - org_x) + sinar * (height - org_y), 0, 0, 0, -1, 1, 1, 0, 0, red, green, blue, alpha);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x - cosaf * org_x + cosar * (height - org_y), y - sinaf * org_x + sinar * (height - org_y), 0, 0, 0, -1, 0, 1, 0, 0, red, green, blue, alpha);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
}
void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
{
- float floats[12];
-
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
-
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
- R_SetupGenericShader(false);
-
- floats[2] = floats[5] = floats[8] = floats[11] = 0;
- floats[0] = floats[9] = x;
- floats[1] = floats[4] = y;
- floats[3] = floats[6] = x + width;
- floats[7] = floats[10] = y + height;
-
- R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
+ DrawQ_Pic(x, y, Draw_CachePic("white"), width, height, red, green, blue, alpha, flags);
}
/// color tag printing
static const vec4_t string_colors[] =
{
// Quake3 colors
- // LordHavoc: why on earth is cyan before magenta in Quake3?
- // LordHavoc: note: Doom3 uses white for [0] and [7]
+ // LadyHavoc: why on earth is cyan before magenta in Quake3?
+ // LadyHavoc: note: Doom3 uses white for [0] and [7]
{0.0, 0.0, 0.0, 1.0}, // black
{1.0, 0.0, 0.0, 1.0}, // red
{0.0, 1.0, 0.0, 1.0}, // green
#define STRING_COLORS_COUNT (sizeof(string_colors) / sizeof(vec4_t))
-static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qboolean shadow)
+static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qbool shadow)
{
float C = r_textcontrast.value;
float B = r_textbrightness.value;
}
}
-float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+// returns a colorindex (format 0x1RGBA) if str is a valid RGB string
+// returns 0 otherwise
+static int RGBstring_to_colorindex(const char *str)
+{
+ Uchar ch;
+ int ind = 0x0001 << 4;
+ do {
+ if (*str <= '9' && *str >= '0')
+ ind |= (*str - '0');
+ else
+ {
+ ch = tolower(*str);
+ if (ch >= 'a' && ch <= 'f')
+ ind |= (ch - 87);
+ else
+ return 0;
+ }
+ ++str;
+ ind <<= 4;
+ } while(!(ind & 0x10000));
+ return ind | 0xf; // add costant alpha value
+}
+
+// NOTE: this function always draws exactly one character if maxwidth <= 0
+float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *maxlen, float w, float h, float sw, float sh, int *outcolor, qbool ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
{
- int num, colorindex = STRING_COLOR_DEFAULT;
+ const char *text_start = text;
+ int colorindex;
size_t i;
float x = 0;
- char ch;
- int tempcolorindex;
+ Uchar ch, mapch, nextch;
+ Uchar prevch = 0; // used for kerning
+ float kx;
+ int map_index = 0;
+ size_t bytes_left;
+ ft2_font_map_t *fontmap = NULL;
+ ft2_font_map_t *map = NULL;
+ //ft2_font_map_t *prevmap = NULL;
+ ft2_font_t *ft2 = fnt->ft2;
+ // float ftbase_x;
+ qbool snap = true;
+ qbool least_one = false;
+ float dw; // display w
+ //float dh; // display h
+ const float *width_of;
+
+ if (!h) h = w;
+ if (!h) {
+ w = h = 1;
+ snap = false;
+ }
+ // do this in the end
+ w *= fnt->settings.scale;
+ h *= fnt->settings.scale;
+
+ // find the most fitting size:
+ if (ft2 != NULL)
+ {
+ if (snap)
+ map_index = Font_IndexForSize(ft2, h, &w, &h);
+ else
+ map_index = Font_IndexForSize(ft2, h, NULL, NULL);
+ fontmap = Font_MapForIndex(ft2, map_index);
+ }
+
+ dw = w * sw;
+ //dh = h * sh;
if (*maxlen < 1)
*maxlen = 1<<30;
else
colorindex = *outcolor;
- maxwidth /= fnt->scale;
+ // maxwidth /= fnt->scale; // w and h are multiplied by it already
+ // ftbase_x = snap_to_pixel_x(0);
- for (i = 0;i < *maxlen && text[i];i++)
+ if(maxwidth <= 0)
{
- if (text[i] == ' ')
+ least_one = true;
+ maxwidth = -maxwidth;
+ }
+
+ //if (snap)
+ // x = snap_to_pixel_x(x, 0.4); // haha, it's 0 anyway
+
+ if (fontmap)
+ width_of = fontmap->width_of;
+ else
+ width_of = fnt->width_of;
+
+ i = 0;
+ while (((bytes_left = *maxlen - (text - text_start)) > 0) && *text)
+ {
+ size_t i0 = i;
+ nextch = ch = u8_getnchar(text, &text, bytes_left);
+ i = text - text_start;
+ if (!ch)
+ break;
+ if (ch == ' ' && !fontmap)
{
- if(x + fnt->width_of[(int) ' '] > maxwidth)
+ if(!least_one || i0) // never skip the first character
+ if(x + width_of[(int) ' '] * dw > maxwidth)
+ {
+ i = i0;
break; // oops, can't draw this
- x += fnt->width_of[(int) ' '];
+ }
+ x += width_of[(int) ' '] * dw;
continue;
}
- if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
+ if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < *maxlen)
{
- ch = text[++i];
- if (ch <= '9' && ch >= '0') // ^[0-9] found
+ ch = *text; // colors are ascii, so no u8_ needed
+ if (ch <= '9' && ch >= '0') // ^[0-9] found
{
colorindex = ch - '0';
- continue;
+ ++text;
+ ++i;
+ continue;
}
else if (ch == STRING_COLOR_RGB_TAG_CHAR && i + 3 < *maxlen ) // ^x found
{
- // building colorindex...
- ch = tolower(text[i+1]);
- tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
- else tempcolorindex = 0;
+ const char *text_p = &text[1];
+ int tempcolorindex = RGBstring_to_colorindex(text_p);
if (tempcolorindex)
{
- ch = tolower(text[i+2]);
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
- else tempcolorindex = 0;
- if (tempcolorindex)
- {
- ch = tolower(text[i+3]);
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
- else tempcolorindex = 0;
- if (tempcolorindex)
- {
- colorindex = tempcolorindex | 0xf;
- // ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
- i+=3;
- continue;
- }
- }
+ colorindex = tempcolorindex;
+ i+=4;
+ text += 4;
+ continue;
}
}
- else if (ch == STRING_COLOR_TAG) // ^^ found, ignore the first ^ and go to print the second
+ else if (ch == STRING_COLOR_TAG) // ^^ found
+ {
i++;
+ text++;
+ }
i--;
}
- num = (unsigned char) text[i];
- if(x + fnt->width_of[num] > maxwidth)
- break; // oops, can't draw this
- x += fnt->width_of[num];
+ ch = nextch;
+
+ if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
+ {
+ if (ch > 0xE000)
+ ch -= 0xE000;
+ if (ch > 0xFF)
+ continue;
+ if (fontmap)
+ map = ft2_oldstyle_map;
+ prevch = 0;
+ if(!least_one || i0) // never skip the first character
+ if(x + width_of[ch] * dw > maxwidth)
+ {
+ i = i0;
+ break; // oops, can't draw this
+ }
+ x += width_of[ch] * dw;
+ } else {
+ if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+ {
+ map = FontMap_FindForChar(fontmap, ch);
+ if (!map)
+ {
+ if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
+ break;
+ if (!map)
+ break;
+ }
+ }
+ mapch = ch - map->start;
+ if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, NULL))
+ x += kx * dw;
+ x += map->glyphs[mapch].advance_x * dw;
+ //prevmap = map;
+ prevch = ch;
+ }
}
*maxlen = i;
if (outcolor)
*outcolor = colorindex;
- return x * fnt->scale;
+ return x;
}
-float DrawQ_String_Font(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
+float DrawQ_Color[4];
+float DrawQ_String_Scale(float startx, float starty, const char *text, size_t maxlen, float w, float h, float sw, float sh, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qbool ignorecolorcodes, const dp_font_t *fnt)
{
- int num, shadow, colorindex = STRING_COLOR_DEFAULT;
+ int shadow, colorindex = STRING_COLOR_DEFAULT;
size_t i;
float x = startx, y, s, t, u, v, thisw;
- float *av, *at, *ac;
- float color[4];
- int batchcount;
- float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
- float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
- float color4f[QUADELEMENTS_MAXQUADS*4*4];
- int ch;
- int tempcolorindex;
-
+ Uchar ch, mapch, nextch;
+ Uchar prevch = 0; // used for kerning
+ int map_index = 0;
+ //ft2_font_map_t *prevmap = NULL; // the previous map
+ ft2_font_map_t *map = NULL; // the currently used map
+ ft2_font_map_t *fontmap = NULL; // the font map for the size
+ float ftbase_y;
+ const char *text_start = text;
+ float kx, ky;
+ ft2_font_t *ft2 = fnt->ft2;
+ qbool snap = true;
+ float pix_x, pix_y;
+ size_t bytes_left;
+ float dw, dh;
+ const float *width_of;
+ model_t *mod = CL_Mesh_UI();
+ msurface_t *surf = NULL;
+ int e0, e1, e2, e3;
int tw, th;
- tw = R_TextureWidth(fnt->tex);
- th = R_TextureHeight(fnt->tex);
+ tw = Draw_GetPicWidth(fnt->pic);
+ th = Draw_GetPicHeight(fnt->pic);
+
+ if (!h) h = w;
+ if (!h) {
+ h = w = 1;
+ snap = false;
+ }
+
+ starty -= (fnt->settings.scale - 1) * h * 0.5 - fnt->settings.voffset*h; // center & offset
+ w *= fnt->settings.scale;
+ h *= fnt->settings.scale;
+
+ if (ft2 != NULL)
+ {
+ if (snap)
+ map_index = Font_IndexForSize(ft2, h, &w, &h);
+ else
+ map_index = Font_IndexForSize(ft2, h, NULL, NULL);
+ fontmap = Font_MapForIndex(ft2, map_index);
+ }
- starty -= (fnt->scale - 1) * h * 0.5; // center
- w *= fnt->scale;
- h *= fnt->scale;
+ dw = w * sw;
+ dh = h * sh;
+
+ // draw the font at its baseline when using freetype
+ //ftbase_x = 0;
+ ftbase_y = dh * (4.5/6.0);
if (maxlen < 1)
maxlen = 1<<30;
- _DrawQ_ProcessDrawFlag(flags);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000);
- R_Mesh_ColorPointer(color4f, 0, 0);
- R_Mesh_ResetTextureState();
- R_Mesh_TexBind(0, R_GetTexture(fnt->tex));
- R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
- R_Mesh_VertexPointer(vertex3f, 0, 0);
- R_SetupGenericShader(true);
+ //ftbase_x = snap_to_pixel_x(ftbase_x);
+ if(snap)
+ {
+ startx = snap_to_pixel_x(startx, 0.4);
+ starty = snap_to_pixel_y(starty, 0.4);
+ ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
+ }
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
- batchcount = 0;
+ pix_x = vid.width / vid_conwidth.value;
+ pix_y = vid.height / vid_conheight.value;
+
+ if (fontmap)
+ width_of = fontmap->width_of;
+ else
+ width_of = fnt->width_of;
for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
{
+ prevch = 0;
+ text = text_start;
+
if (!outcolor || *outcolor == -1)
colorindex = STRING_COLOR_DEFAULT;
else
colorindex = *outcolor;
- DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+ DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
x = startx;
y = starty;
+ /*
if (shadow)
{
- x += r_textshadow.value;
- y += r_textshadow.value;
+ x += r_textshadow.value * vid.width / vid_conwidth.value;
+ y += r_textshadow.value * vid.height / vid_conheight.value;
}
- for (i = 0;i < maxlen && text[i];i++)
+ */
+ while (((bytes_left = maxlen - (text - text_start)) > 0) && *text)
{
- if (text[i] == ' ')
+ nextch = ch = u8_getnchar(text, &text, bytes_left);
+ i = text - text_start;
+ if (!ch)
+ break;
+ if (ch == ' ' && !fontmap)
{
- x += fnt->width_of[(int) ' '] * w;
+ x += width_of[(int) ' '] * dw;
continue;
}
- if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
+ if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < maxlen)
{
- ch = text[++i];
+ ch = *text; // colors are ascii, so no u8_ needed
if (ch <= '9' && ch >= '0') // ^[0-9] found
{
colorindex = ch - '0';
- DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+ DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+ ++text;
+ ++i;
continue;
}
else if (ch == STRING_COLOR_RGB_TAG_CHAR && i+3 < maxlen ) // ^x found
{
- // building colorindex...
- ch = tolower(text[i+1]);
- tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
- else tempcolorindex = 0;
- if (tempcolorindex)
+ const char *text_p = &text[1];
+ int tempcolorindex = RGBstring_to_colorindex(text_p);
+ if(tempcolorindex)
{
- ch = tolower(text[i+2]);
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
- else tempcolorindex = 0;
- if (tempcolorindex)
- {
- ch = tolower(text[i+3]);
- if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
- else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
- else tempcolorindex = 0;
- if (tempcolorindex)
- {
- colorindex = tempcolorindex | 0xf;
- // ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
- //Con_Printf("^1colorindex:^7 %x\n", colorindex);
- DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
- i+=3;
- continue;
- }
- }
+ colorindex = tempcolorindex;
+ DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+ i+=4;
+ text+=4;
+ continue;
}
}
else if (ch == STRING_COLOR_TAG)
+ {
i++;
+ text++;
+ }
i--;
}
- num = (unsigned char) text[i];
- thisw = fnt->width_of[num];
- // FIXME make these smaller to just include the occupied part of the character for slightly faster rendering
- s = (num & 15)*0.0625f + (0.5f / tw);
- t = (num >> 4)*0.0625f + (0.5f / th);
- u = 0.0625f * thisw - (1.0f / tw);
- v = 0.0625f - (1.0f / th);
- ac[ 0] = color[0];ac[ 1] = color[1];ac[ 2] = color[2];ac[ 3] = color[3];
- ac[ 4] = color[0];ac[ 5] = color[1];ac[ 6] = color[2];ac[ 7] = color[3];
- ac[ 8] = color[0];ac[ 9] = color[1];ac[10] = color[2];ac[11] = color[3];
- ac[12] = color[0];ac[13] = color[1];ac[14] = color[2];ac[15] = color[3];
- at[ 0] = s ; at[ 1] = t ;
- at[ 2] = s+u ; at[ 3] = t ;
- at[ 4] = s+u ; at[ 5] = t+v ;
- at[ 6] = s ; at[ 7] = t+v ;
- av[ 0] = x ; av[ 1] = y ; av[ 2] = 10;
- av[ 3] = x+w*thisw ; av[ 4] = y ; av[ 5] = 10;
- av[ 6] = x+w*thisw ; av[ 7] = y+h ; av[ 8] = 10;
- av[ 9] = x ; av[10] = y+h ; av[11] = 10;
- ac += 16;
- at += 8;
- av += 12;
- batchcount++;
- if (batchcount >= QUADELEMENTS_MAXQUADS)
+ // get the backup
+ ch = nextch;
+ // using a value of -1 for the oldstyle map because NULL means uninitialized...
+ // this way we don't need to rebind fnt->tex for every old-style character
+ // E000..E0FF: emulate old-font characters (to still have smileys and such available)
+ if (shadow)
{
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
- GL_LockArrays(0, 0);
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
+ x += 1.0/pix_x * r_textshadow.value;
+ y += 1.0/pix_y * r_textshadow.value;
+ }
+ if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
+ {
+ if (ch >= 0xE000)
+ ch -= 0xE000;
+ if (ch > 0xFF)
+ goto out;
+ if (fontmap)
+ map = ft2_oldstyle_map;
+ prevch = 0;
+ //num = (unsigned char) text[i];
+ //thisw = fnt->width_of[num];
+ thisw = fnt->width_of[ch];
+ // FIXME make these smaller to just include the occupied part of the character for slightly faster rendering
+ if (r_nearest_conchars.integer)
+ {
+ s = (ch & 15)*0.0625f;
+ t = (ch >> 4)*0.0625f;
+ u = 0.0625f * thisw;
+ v = 0.0625f;
+ }
+ else
+ {
+ s = (ch & 15)*0.0625f + (0.5f / tw);
+ t = (ch >> 4)*0.0625f + (0.5f / th);
+ u = 0.0625f * thisw - (1.0f / tw);
+ v = 0.0625f - (1.0f / th);
+ }
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, fnt->pic->name, flags, TEXF_ALPHA | TEXF_CLAMP, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x , y , 10, 0, 0, -1, s , t , 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x+dw*thisw, y , 10, 0, 0, -1, s+u, t , 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x+dw*thisw, y+dh, 10, 0, 0, -1, s+u, t+v, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x , y+dh, 10, 0, 0, -1, s , t+v, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
+ x += width_of[ch] * dw;
+ } else {
+ if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
+ {
+ // find the new map
+ map = FontMap_FindForChar(fontmap, ch);
+ if (!map)
+ {
+ if (!Font_LoadMapForIndex(ft2, map_index, ch, &map))
+ {
+ shadow = -1;
+ break;
+ }
+ if (!map)
+ {
+ // this shouldn't happen
+ shadow = -1;
+ break;
+ }
+ }
+ }
+
+ mapch = ch - map->start;
+ thisw = map->glyphs[mapch].advance_x;
+
+ //x += ftbase_x;
+ y += ftbase_y;
+ if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, &ky))
+ {
+ x += kx * dw;
+ y += ky * dh;
+ }
+ else
+ kx = ky = 0;
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, map->pic->name, flags, TEXF_ALPHA | TEXF_CLAMP, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmin, y + dh * map->glyphs[mapch].vymin, 10, 0, 0, -1, map->glyphs[mapch].txmin, map->glyphs[mapch].tymin, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmax, y + dh * map->glyphs[mapch].vymin, 10, 0, 0, -1, map->glyphs[mapch].txmax, map->glyphs[mapch].tymin, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmax, y + dh * map->glyphs[mapch].vymax, 10, 0, 0, -1, map->glyphs[mapch].txmax, map->glyphs[mapch].tymax, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x + dw * map->glyphs[mapch].vxmin, y + dh * map->glyphs[mapch].vymax, 10, 0, 0, -1, map->glyphs[mapch].txmin, map->glyphs[mapch].tymax, 0, 0, DrawQ_Color[0], DrawQ_Color[1], DrawQ_Color[2], DrawQ_Color[3]);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
+ //x -= ftbase_x;
+ y -= ftbase_y;
+
+ x += thisw * dw;
+
+ //prevmap = map;
+ prevch = ch;
+ }
+out:
+ if (shadow)
+ {
+ x -= 1.0/pix_x * r_textshadow.value;
+ y -= 1.0/pix_y * r_textshadow.value;
}
- x += thisw * w;
}
}
- if (batchcount > 0)
- {
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
- GL_LockArrays(0, 0);
- }
if (outcolor)
*outcolor = colorindex;
return x;
}
-float DrawQ_String(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
+float DrawQ_String(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qbool ignorecolorcodes, const dp_font_t *fnt)
{
- return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
+ return DrawQ_String_Scale(startx, starty, text, maxlen, w, h, 1, 1, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, fnt);
}
-float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
+float DrawQ_TextWidth_UntilWidth_TrackColors(const char *text, size_t *maxlen, float w, float h, int *outcolor, qbool ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
{
- return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
+ return DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, maxlen, w, h, 1, 1, outcolor, ignorecolorcodes, fnt, maxwidth);
}
-float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+float DrawQ_TextWidth(const char *text, size_t maxlen, float w, float h, qbool ignorecolorcodes, const dp_font_t *fnt)
{
- return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
+ return DrawQ_TextWidth_UntilWidth(text, &maxlen, w, h, ignorecolorcodes, fnt, 1000000000);
+}
+
+float DrawQ_TextWidth_UntilWidth(const char *text, size_t *maxlen, float w, float h, qbool ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+{
+ return DrawQ_TextWidth_UntilWidth_TrackColors(text, maxlen, w, h, NULL, ignorecolorcodes, fnt, maxWidth);
}
#if 0
// not used
// no ^xrgb management
-static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qboolean ignorecolorcodes, int *outcolor)
+static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qbool ignorecolorcodes, int *outcolor)
{
int color, numchars = 0;
char *outputend2c = output2c + maxoutchars - 2;
void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags)
{
- float floats[36];
-
- _DrawQ_ProcessDrawFlag(flags);
-
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(floats + 20, 0, 0);
- R_Mesh_ResetTextureState();
- R_SetupGenericShader(pic != NULL);
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_Mesh_TexBind(0, R_GetTexture(pic->tex));
- R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
- floats[12] = s1;floats[13] = t1;
- floats[14] = s2;floats[15] = t2;
- floats[16] = s4;floats[17] = t4;
- floats[18] = s3;floats[19] = t3;
- }
-
- floats[2] = floats[5] = floats[8] = floats[11] = 0;
- floats[0] = floats[9] = x;
- floats[1] = floats[4] = y;
- floats[3] = floats[6] = x + width;
- floats[7] = floats[10] = y + height;
- floats[20] = r1;floats[21] = g1;floats[22] = b1;floats[23] = a1;
- floats[24] = r2;floats[25] = g2;floats[26] = b2;floats[27] = a2;
- floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
- floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
-
- R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
-}
-
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
-{
- _DrawQ_ProcessDrawFlag(flags);
-
- R_Mesh_VertexPointer(mesh->data_vertex3f, 0, 0);
- R_Mesh_ColorPointer(mesh->data_color4f, 0, 0);
- R_Mesh_ResetTextureState();
- R_Mesh_TexBind(0, R_GetTexture(mesh->texture));
- R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
- R_SetupGenericShader(mesh->texture != NULL);
-
- GL_LockArrays(0, mesh->num_vertices);
- R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, NULL, mesh->data_element3s, 0, 0);
- GL_LockArrays(0, 0);
+ model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ if (!pic)
+ pic = Draw_CachePic("white");
+ // make sure pic is loaded - we don't use the texture here, Mod_Mesh_GetTexture looks up the skinframe by name
+ Draw_GetPicTexture(pic);
+ if (width == 0)
+ width = pic->width;
+ if (height == 0)
+ height = pic->height;
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, pic->name, flags, pic->texflags, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x , y , 0, 0, 0, -1, s1, t1, 0, 0, r1, g1, b1, a1);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y , 0, 0, 0, -1, s2, t2, 0, 0, r2, g2, b2, a2);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x + width, y + height, 0, 0, 0, -1, s4, t4, 0, 0, r4, g4, b4, a4);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x , y + height, 0, 0, 0, -1, s3, t3, 0, 0, r3, g3, b3, a3);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
}
-void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
+void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
{
- int num;
-
- _DrawQ_ProcessDrawFlag(flags);
-
- GL_Color(1,1,1,1);
- CHECKGLERROR
- qglBegin(GL_LINE_LOOP);
- for (num = 0;num < mesh->num_vertices;num++)
+ model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ float offsetx, offsety;
+ // width is measured in real pixels
+ if (fabs(x2 - x1) > fabs(y2 - y1))
{
- if (mesh->data_color4f)
- GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]);
- qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+ offsetx = 0;
+ offsety = 0.5f * width * vid_conheight.value / vid.height;
}
- qglEnd();
- CHECKGLERROR
-}
-
-//[515]: this is old, delete
-void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
-{
- _DrawQ_ProcessDrawFlag(flags);
-
- R_SetupGenericShader(false);
-
- CHECKGLERROR
- qglLineWidth(width);CHECKGLERROR
-
- GL_Color(r,g,b,alpha);
- CHECKGLERROR
- qglBegin(GL_LINES);
- qglVertex2f(x1, y1);
- qglVertex2f(x2, y2);
- qglEnd();
- CHECKGLERROR
+ else
+ {
+ offsetx = 0.5f * width * vid_conwidth.value / vid.width;
+ offsety = 0;
+ }
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, "white", 0, 0, MATERIALFLAG_WALL | MATERIALFLAG_VERTEXCOLOR | MATERIALFLAG_ALPHAGEN_VERTEX | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW), true);
+ e0 = Mod_Mesh_IndexForVertex(mod, surf, x1 - offsetx, y1 - offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+ e1 = Mod_Mesh_IndexForVertex(mod, surf, x2 - offsetx, y2 - offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+ e2 = Mod_Mesh_IndexForVertex(mod, surf, x2 + offsetx, y2 + offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+ e3 = Mod_Mesh_IndexForVertex(mod, surf, x1 + offsetx, y1 + offsety, 10, 0, 0, -1, 0, 0, 0, 0, r, g, b, alpha);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e1, e2);
+ Mod_Mesh_AddTriangle(mod, surf, e0, e2, e3);
}
void DrawQ_SetClipArea(float x, float y, float width, float height)
{
- _DrawQ_Setup();
+ int ix, iy, iw, ih;
+ DrawQ_FlushUI();
// We have to convert the con coords into real coords
- // OGL uses top to bottom
- GL_Scissor((int)(0.5 + x * ((float)vid.width / vid_conwidth.integer)), (int)(0.5 + y * ((float) vid.height / vid_conheight.integer)), (int)(width * ((float)vid.width / vid_conwidth.integer)), (int)(height * ((float)vid.height / vid_conheight.integer)));
+ // OGL uses bottom to top (origin is in bottom left)
+ ix = (int)(0.5 + x * ((float)r_refdef.view.width / vid_conwidth.integer)) + r_refdef.view.x;
+ iy = (int)(0.5 + y * ((float)r_refdef.view.height / vid_conheight.integer)) + r_refdef.view.y;
+ iw = (int)(0.5 + width * ((float)r_refdef.view.width / vid_conwidth.integer));
+ ih = (int)(0.5 + height * ((float)r_refdef.view.height / vid_conheight.integer));
+ switch(vid.renderpath)
+ {
+ case RENDERPATH_GL32:
+ case RENDERPATH_GLES2:
+ GL_Scissor(ix, vid.height - iy - ih, iw, ih);
+ break;
+ }
GL_ScissorTest(true);
}
void DrawQ_ResetClipArea(void)
{
- _DrawQ_Setup();
+ DrawQ_FlushUI();
GL_ScissorTest(false);
}
void DrawQ_Finish(void)
{
- r_refdef.draw2dstage = false;
+ DrawQ_FlushUI();
+ r_refdef.draw2dstage = 0;
}
-static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
-void R_DrawGamma(void)
+void DrawQ_RecalcView(void)
{
- float c[4];
- if (!vid_usinghwgamma && !(r_glsl.integer && v_glslgamma.integer))
+ DrawQ_FlushUI();
+ if(r_refdef.draw2dstage)
+ r_refdef.draw2dstage = -1; // next draw call will set viewport etc. again
+}
+
+void DrawQ_FlushUI(void)
+{
+ model_t *mod = CL_Mesh_UI();
+ if (mod->num_surfaces == 0)
+ return;
+
+ if (!r_draw2d.integer && !r_draw2d_force)
{
- // all the blends ignore depth
- R_Mesh_VertexPointer(blendvertex3f, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
- R_SetupGenericShader(false);
- GL_DepthMask(true);
- GL_DepthRange(0, 1);
- GL_PolygonOffset(0, 0);
- GL_DepthTest(false);
- if (v_color_enable.integer)
- {
- c[0] = v_color_white_r.value;
- c[1] = v_color_white_g.value;
- c[2] = v_color_white_b.value;
- }
- else
- c[0] = c[1] = c[2] = v_contrast.value;
- if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
- {
- GL_BlendFunc(GL_DST_COLOR, GL_ONE);
- while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
- {
- GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
- R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
- VectorScale(c, 0.5, c);
- }
- }
- if (v_color_enable.integer)
- {
- c[0] = v_color_black_r.value;
- c[1] = v_color_black_g.value;
- c[2] = v_color_black_b.value;
- }
- else
- c[0] = c[1] = c[2] = v_brightness.value;
- if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
- {
- GL_BlendFunc(GL_ONE, GL_ONE);
- GL_Color(c[0], c[1], c[2], 1);
- R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
- }
+ Mod_Mesh_Reset(mod);
+ return;
}
-}
+ // this is roughly equivalent to R_Mod_Draw, so the UI can use full material feature set
+ r_refdef.view.colorscale = 1;
+ r_textureframe++; // used only by R_GetCurrentTexture
+ GL_DepthMask(false);
+
+ Mod_Mesh_Finalize(mod);
+ R_DrawModelSurfaces(&cl_meshentities[MESH_UI].render, false, false, false, false, false, true);
+
+ Mod_Mesh_Reset(mod);
+}
projects / xonotic / darkplaces.git / blobdiff