#include "wad.h"
#include "cl_video.h"
-#include "cl_dyntexture.h"
#include "ft2.h"
#include "ft2_fontdefs.h"
+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;
cvar_t r_font_postprocess_shadow_z = {CVAR_SAVE, "r_font_postprocess_shadow_z", "0", "font shadow Z shift amount, applied during blurring"};
cvar_t r_font_hinting = {CVAR_SAVE, "r_font_hinting", "3", "0 = no hinting, 1 = light autohinting, 2 = full autohinting, 3 = full hinting"};
cvar_t r_font_antialias = {CVAR_SAVE, "r_font_antialias", "1", "0 = monochrome, 1 = grey" /* , 2 = rgb, 3 = bgr" */};
-
-extern cvar_t v_glslgamma;
+cvar_t r_nearest_2d = {CVAR_SAVE, "r_nearest_2d", "0", "use nearest filtering on all 2d textures (including conchars)"};
+cvar_t r_nearest_conchars = {CVAR_SAVE, "r_nearest_conchars", "0", "use nearest filtering on conchars texture"};
//=============================================================================
/* Support Routines */
-#define FONT_FILESIZE 13468
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 *data;
- double random;
- rtexture_t *tex;
-
- data = LoadTGA_BGRA (concharimage, FONT_FILESIZE, NULL);
-// Gold numbers
- for (i = 0;i < 8192;i++)
- {
- random = lhrandom (0.0,1.0);
- data[i*4+3] = data[i*4+0];
- data[i*4+2] = 83 + (unsigned char)(random * 64);
- data[i*4+1] = 71 + (unsigned char)(random * 32);
- data[i*4+0] = 23 + (unsigned char)(random * 16);
- }
-// White chars
- for (i = 8192;i < 32768;i++)
- {
- random = lhrandom (0.0,1.0);
- data[i*4+3] = data[i*4+0];
- data[i*4+2] = 95 + (unsigned char)(random * 64);
- data[i*4+1] = 95 + (unsigned char)(random * 64);
- data[i*4+0] = 95 + (unsigned char)(random * 64);
- }
-// Gold numbers
- for (i = 32768;i < 40960;i++)
- {
- random = lhrandom (0.0,1.0);
- data[i*4+3] = data[i*4+0];
- data[i*4+2] = 83 + (unsigned char)(random * 64);
- data[i*4+1] = 71 + (unsigned char)(random * 32);
- data[i*4+0] = 23 + (unsigned char)(random * 16);
- }
-// Red chars
- for (i = 40960;i < 65536;i++)
- {
- random = lhrandom (0.0,1.0);
- data[i*4+3] = data[i*4+0];
- data[i*4+2] = 96 + (unsigned char)(random * 64);
- data[i*4+1] = 43 + (unsigned char)(random * 32);
- data[i*4+0] = 27 + (unsigned char)(random * 32);
- }
-
-#if 0
- Image_WriteTGABGRA ("gfx/generated_conchars.tga", 256, 256, data);
-#endif
-
- tex = R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, data, TEXTYPE_BGRA, TEXF_ALPHA, -1, NULL);
- Mem_Free(data);
- return tex;
-}
-
-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, -1, 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."
- "................"
- },
- {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, -1, palette_bgra_embeddedpic);
- if (!strcmp(name, "gfx/conchars"))
- return draw_generateconchars();
- if (!strcmp(name, "gfx/colorcontrol/ditherpattern"))
- return draw_generateditherpattern();
- if (!quiet)
- Con_DPrintf("Draw_CachePic: failed to load %s\n", name);
- return r_texture_notexture;
-}
+rtexturepool_t *drawtexturepool;
+int draw_frame = 1;
/*
================
cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
{
int crc, hashkey;
- unsigned char *pixels;
cachepic_t *pic;
- fs_offset_t lmpsize;
- unsigned char *lmpdata;
- char lmpname[MAX_QPATH];
int texflags;
- int j;
texflags = TEXF_ALPHA;
if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
texflags |= TEXF_CLAMP;
- if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
+ if (cachepicflags & CACHEPICFLAG_MIPMAP)
+ texflags |= TEXF_MIPMAP;
+ if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer && gl_texturecompression.integer)
texflags |= TEXF_COMPRESS;
+ 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(!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
+ {
+ if (!strcmp(path, pic->name))
+ {
+ // if it was created (or replaced) by Draw_NewPic, just return it
+ if (pic->flags & CACHEPICFLAG_NEWPIC)
{
- if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
- {
- if(pic->tex)
- pic->autoload = false; // persist it
- else
- goto reload; // load it below, and then persist
- }
+ if (pic->skinframe)
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ pic->lastusedframe = draw_frame;
+ return pic;
+ }
+ if (!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS | TEXF_MIPMAP))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag, and ignore TEXF_MIPMAP because QC specifies that
+ {
+ if (!pic->skinframe || !pic->skinframe->base)
+ goto reload;
+ if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+ pic->autoload = false; // caller is making this pic persistent
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ pic->lastusedframe = draw_frame;
return pic;
}
+ }
+ }
if (numcachepics == MAX_CACHED_PICS)
{
return cachepics; // return the first one
}
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;
reload:
- // 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;
- }
+ if (pic->skinframe)
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
- pic->hasalpha = true; // assume alpha unless we know it has none
+ pic->flags = cachepicflags;
pic->texflags = texflags;
- pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT);
-
- // load a high quality image from disk if possible
- pixels = loadimagepixelsbgra(path, false, true, r_texture_convertsRGB_2d.integer != 0, NULL);
- if (pixels == NULL && !strncmp(path, "gfx/", 4))
- pixels = loadimagepixelsbgra(path+4, false, true, r_texture_convertsRGB_2d.integer != 0, NULL);
- if (pixels)
- {
- pic->hasalpha = false;
- if (pic->texflags & TEXF_ALPHA)
- {
- for (j = 3;j < image_width * image_height * 4;j += 4)
- {
- if (pixels[j] < 255)
- {
- pic->hasalpha = true;
- break;
- }
- }
- }
-
- pic->width = image_width;
- pic->height = image_height;
- if (!pic->autoload)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags & (pic->hasalpha ? ~0 : ~TEXF_ALPHA), -1, NULL);
- }
- else
- {
- pic->autoload = false;
- // never compress the fallback images
- pic->texflags &= ~TEXF_COMPRESS;
- }
+ pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT) != 0;
+ pic->lastusedframe = draw_frame;
- // 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)))
- {
- if (developer_loading.integer)
- Con_Printf("loading lump \"%s\"\n", path);
+ // load high quality image (this falls back to low quality too)
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, texflags, (cachepicflags & CACHEPICFLAG_QUIET) == 0, (cachepicflags & CACHEPICFLAG_FAILONMISSING) == 0);
- 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 (!pixels)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
- }
- Mem_Free(lmpdata);
- }
- else if ((lmpdata = W_GetLumpName (path + 4)))
+ // 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 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 (!pixels)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, pic->texflags, -1, 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 (!pixels)
- pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
- }
+ pic->width = R_TextureWidth(pic->skinframe->base);
+ pic->height = R_TextureHeight(pic->skinframe->base);
}
- if (pixels)
- {
- Mem_Free(pixels);
- pixels = NULL;
- }
- else if (pic->tex == NULL)
- {
- // if it's not found on disk, generate an image
- pic->tex = draw_generatepic(path, (cachepicflags & CACHEPICFLAG_QUIET) != 0);
- pic->width = R_TextureWidth(pic->tex);
- pic->height = R_TextureHeight(pic->tex);
- }
+ // 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;
}
return Draw_CachePic_Flags (path, 0); // default to persistent!
}
-int draw_frame = 1;
+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;
+}
+
+qboolean Draw_IsPicLoaded(cachepic_t *pic)
+{
+ if (pic == NULL)
+ return false;
+ if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags, 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;
+}
rtexture_t *Draw_GetPicTexture(cachepic_t *pic)
{
- if (pic->autoload && !pic->tex)
- {
- pic->tex = loadtextureimage(drawtexturepool, pic->name, false, pic->texflags, true, r_texture_convertsRGB_2d.integer != 0);
- if (pic->tex == NULL && !strncmp(pic->name, "gfx/", 4))
- pic->tex = loadtextureimage(drawtexturepool, pic->name+4, false, pic->texflags, true, r_texture_convertsRGB_2d.integer != 0);
- if (pic->tex == NULL)
- pic->tex = draw_generatepic(pic->name, true);
- }
+ if (pic == NULL)
+ return NULL;
+ if (pic->autoload && (!pic->skinframe || !pic->skinframe->base))
+ pic->skinframe = R_SkinFrame_LoadExternal(pic->name, pic->texflags, false, true);
pic->lastusedframe = draw_frame;
- return pic->tex;
+ return pic->skinframe ? pic->skinframe->base : NULL;
}
void Draw_Frame(void)
return;
nextpurgetime = realtime + 0.05;
for (i = 0, pic = cachepics;i < numcachepics;i++, pic++)
- {
- if (pic->autoload && pic->tex && pic->lastusedframe < draw_frame)
- {
- R_FreeTexture(pic->tex);
- pic->tex = NULL;
- }
- }
+ if (pic->autoload && pic->skinframe && pic->skinframe->base && pic->lastusedframe < draw_frame)
+ 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, 0, width, height, 1);
+ R_UpdateTexture(pic->skinframe->base, pixels_bgra, 0, 0, 0, width, height, 1);
+ R_SkinFrame_MarkUsed(pic->skinframe);
+ pic->lastusedframe = draw_frame;
return pic;
}
}
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_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
}
+ 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->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), -1, NULL);
+ pic->skinframe = R_SkinFrame_LoadInternalBGRA(picname, texflags, pixels_bgra, width, height, 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->tex = NULL;
+ R_SkinFrame_PurgeSkinFrame(pic->skinframe);
pic->width = 0;
pic->height = 0;
return;
Con_DPrintf("Failed to load font-file for '%s', it will not support as many characters.\n", fnt->texpath);
}
- fnt->tex = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
- if(fnt->tex == r_texture_notexture)
+ 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->tex = Draw_CachePic_Flags(fnt->fallbacks[i], CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
- if(fnt->tex != r_texture_notexture)
+ 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(fnt->tex == r_texture_notexture)
+ if(!Draw_IsPicLoaded(fnt->pic))
{
- fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
+ fnt->pic = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION | (r_nearest_conchars.integer ? CACHEPICFLAG_NEAREST : 0));
strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
}
else
ch = 0;
while(ch < 256)
{
- if(!COM_ParseToken_Simple(&p, false, false))
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
switch(*com_token)
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;
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))
+ if(!COM_ParseToken_Simple(&p, false, false, true))
return;
}
break;
static void gl_draw_start(void)
{
int i;
+ char vabuf[1024];
drawtexturepool = R_AllocTexturePool();
numcachepics = 0;
// load default font textures
for(i = 0; i < dp_fonts.maxsize; ++i)
if (dp_fonts.f[i].title[0])
- LoadFont(false, va("gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0);
+ LoadFont(false, va(vabuf, sizeof(vabuf), "gfx/font_%s", dp_fonts.f[i].title), &dp_fonts.f[i], 1, 0);
// draw the loading screen so people have something to see in the newly opened window
- SCR_UpdateLoadingScreen(true);
+ SCR_UpdateLoadingScreen(true, true);
}
static void gl_draw_shutdown(void)
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)
Cvar_RegisterVariable(&r_textshadow);
Cvar_RegisterVariable(&r_textbrightness);
Cvar_RegisterVariable(&r_textcontrast);
+ Cvar_RegisterVariable(&r_nearest_2d);
+ Cvar_RegisterVariable(&r_nearest_conchars);
// allocate fonts storage
fonts_mempool = Mem_AllocPool("FONTS", 0, NULL);
R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL);
}
-static void _DrawQ_Setup(void)
+static void _DrawQ_Setup(void) // see R_ResetViewRendering2D
{
- r_viewport_t viewport;
if (r_refdef.draw2dstage == 1)
return;
+ DrawQ_FlushUI();
r_refdef.draw2dstage = 1;
- CHECKGLERROR
- R_Viewport_InitOrtho(&viewport, &identitymatrix, r_refdef.view.x, vid.height - r_refdef.view.y - r_refdef.view.height, r_refdef.view.width, r_refdef.view.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
- R_SetViewport(&viewport);
- GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
- GL_DepthFunc(GL_LEQUAL);
- GL_PolygonOffset(0,0);
- GL_CullFace(GL_NONE);
- R_EntityMatrix(&identitymatrix);
-
- GL_DepthRange(0, 1);
- GL_PolygonOffset(0, 0);
- GL_DepthTest(false);
- GL_Color(1,1,1,1);
+ R_ResetViewRendering2D_Common(0, NULL, NULL, vid_conwidth.integer, vid_conheight.integer);
}
qboolean r_draw2d_force = false;
-void _DrawQ_SetupAndProcessDrawFlag(int flags, cachepic_t *pic, float alpha)
-{
- _DrawQ_Setup();
- CHECKGLERROR
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
- DrawQ_ProcessDrawFlag(flags, (alpha < 1) || (pic && pic->hasalpha));
-}
-void DrawQ_ProcessDrawFlag(int flags, qboolean alpha)
-{
- if(flags == DRAWFLAG_ADDITIVE)
- {
- GL_DepthMask(false);
- GL_BlendFunc(alpha ? GL_SRC_ALPHA : GL_ONE, GL_ONE);
- }
- else if(flags == DRAWFLAG_MODULATE)
- {
- GL_DepthMask(false);
- GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
- }
- else if(flags == DRAWFLAG_2XMODULATE)
- {
- GL_DepthMask(false);
- GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
- }
- else if(flags == DRAWFLAG_SCREEN)
- {
- GL_DepthMask(false);
- GL_BlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE);
- }
- else if(alpha)
- {
- GL_DepthMask(false);
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- }
- else
- {
- GL_DepthMask(true);
- GL_BlendFunc(GL_ONE, GL_ZERO);
- }
-}
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[36];
-
- _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
-// R_Mesh_ResetTextureState();
- 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[20] = floats[24] = floats[28] = floats[32] = red;
- floats[21] = floats[25] = floats[29] = floats[33] = green;
- floats[22] = floats[26] = floats[30] = floats[34] = blue;
- floats[23] = floats[27] = floats[31] = floats[35] = alpha;
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
-
-#if 0
- // 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
- }
- else
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- 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_PrepareVertices_Generic_Arrays(4, floats, floats + 20, floats + 12);
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
+ dp_model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ _DrawQ_Setup();
+ if (!pic)
+ pic = Draw_CachePic("white");
+ 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_VERTEXCOLOR), 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[36];
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_SetupAndProcessDrawFlag(flags, pic, alpha);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
-// R_Mesh_ResetTextureState();
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
- }
- else
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- 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);
-
- 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[20] = floats[24] = floats[28] = floats[32] = red;
- floats[21] = floats[25] = floats[29] = floats[33] = green;
- floats[22] = floats[26] = floats[30] = floats[34] = blue;
- floats[23] = floats[27] = floats[31] = floats[35] = alpha;
-
- R_Mesh_PrepareVertices_Generic_Arrays(4, floats, floats + 20, floats + 12);
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
+ dp_model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ _DrawQ_Setup();
+ if (!pic)
+ pic = Draw_CachePic("white");
+ 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_VERTEXCOLOR), 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), 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[36];
-
- _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
-// R_Mesh_ResetTextureState();
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- 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[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[20] = floats[24] = floats[28] = floats[32] = red;
- floats[21] = floats[25] = floats[29] = floats[33] = green;
- floats[22] = floats[26] = floats[30] = floats[34] = blue;
- floats[23] = floats[27] = floats[31] = floats[35] = alpha;
-
- R_Mesh_PrepareVertices_Generic_Arrays(4, floats, floats + 20, floats + 12);
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
+ DrawQ_Pic(x, y, Draw_CachePic("white"), width, height, red, green, blue, alpha, flags);
}
/// color tag printing
else
width_of = fnt->width_of;
- for (i = 0;((bytes_left = *maxlen - (text - text_start)) > 0) && *text;)
+ i = 0;
+ while (((bytes_left = *maxlen - (text - text_start)) > 0) && *text)
{
size_t i0 = i;
nextch = ch = u8_getnchar(text, &text, bytes_left);
int shadow, colorindex = STRING_COLOR_DEFAULT;
size_t i;
float x = startx, y, s, t, u, v, thisw;
- float *av, *at, *ac;
- int batchcount;
- static float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
- static float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
- static float color4f[QUADELEMENTS_MAXQUADS*4*4];
Uchar ch, mapch, nextch;
Uchar prevch = 0; // used for kerning
int tempcolorindex;
size_t bytes_left;
float dw, dh;
const float *width_of;
-
+ dp_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);
+
+ _DrawQ_Setup();
if (!h) h = w;
if (!h) {
if (maxlen < 1)
maxlen = 1<<30;
- _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 0);
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_ResetTextureState();
- if (!fontmap)
- R_Mesh_TexBind(0, fnt->tex);
- R_SetupShader_Generic(fnt->tex, NULL, GL_MODULATE, 1);
-
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
- batchcount = 0;
-
//ftbase_x = snap_to_pixel_x(ftbase_x);
if(snap)
{
y += r_textshadow.value * vid.height / vid_conheight.value;
}
*/
- for (i = 0;((bytes_left = maxlen - (text - text_start)) > 0) && *text;)
+ while (((bytes_left = maxlen - (text - text_start)) > 0) && *text)
{
nextch = ch = u8_getnchar(text, &text, bytes_left);
i = text - text_start;
if (ch > 0xFF)
goto out;
if (fontmap)
- {
- if (map != ft2_oldstyle_map)
- {
- if (batchcount)
- {
- // switching from freetype to non-freetype rendering
- R_Mesh_PrepareVertices_Generic_Arrays(batchcount * 4, vertex3f, color4f, texcoord2f);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, NULL, 0, quadelement3s, NULL, 0);
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
- }
- R_SetupShader_Generic(fnt->tex, NULL, GL_MODULATE, 1);
- map = ft2_oldstyle_map;
- }
- }
+ 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
- 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);
- ac[ 0] = DrawQ_Color[0];ac[ 1] = DrawQ_Color[1];ac[ 2] = DrawQ_Color[2];ac[ 3] = DrawQ_Color[3];
- ac[ 4] = DrawQ_Color[0];ac[ 5] = DrawQ_Color[1];ac[ 6] = DrawQ_Color[2];ac[ 7] = DrawQ_Color[3];
- ac[ 8] = DrawQ_Color[0];ac[ 9] = DrawQ_Color[1];ac[10] = DrawQ_Color[2];ac[11] = DrawQ_Color[3];
- ac[12] = DrawQ_Color[0];ac[13] = DrawQ_Color[1];ac[14] = DrawQ_Color[2];ac[15] = DrawQ_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+dw*thisw ; av[ 4] = y ; av[ 5] = 10;
- av[ 6] = x+dw*thisw ; av[ 7] = y+dh ; av[ 8] = 10;
- av[ 9] = x ; av[10] = y+dh ; av[11] = 10;
- ac += 16;
- at += 8;
- av += 12;
- batchcount++;
- if (batchcount >= QUADELEMENTS_MAXQUADS)
+ if (r_nearest_conchars.integer)
+ {
+ s = (ch & 15)*0.0625f;
+ t = (ch >> 4)*0.0625f;
+ u = 0.0625f * thisw;
+ v = 0.0625f;
+ }
+ else
{
- R_Mesh_PrepareVertices_Generic_Arrays(batchcount * 4, vertex3f, color4f, texcoord2f);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, NULL, 0, quadelement3s, NULL, 0);
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
+ 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_VERTEXCOLOR), 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)
{
- // new charmap - need to render
- if (batchcount)
- {
- // we need a different character map, render what we currently have:
- R_Mesh_PrepareVertices_Generic_Arrays(batchcount * 4, vertex3f, color4f, texcoord2f);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, NULL, 0, quadelement3s, NULL, 0);
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
- }
// find the new map
map = FontMap_FindForChar(fontmap, ch);
if (!map)
break;
}
}
- R_SetupShader_Generic(map->texture, NULL, GL_MODULATE, 1);
}
mapch = ch - map->start;
}
else
kx = ky = 0;
- ac[ 0] = DrawQ_Color[0]; ac[ 1] = DrawQ_Color[1]; ac[ 2] = DrawQ_Color[2]; ac[ 3] = DrawQ_Color[3];
- ac[ 4] = DrawQ_Color[0]; ac[ 5] = DrawQ_Color[1]; ac[ 6] = DrawQ_Color[2]; ac[ 7] = DrawQ_Color[3];
- ac[ 8] = DrawQ_Color[0]; ac[ 9] = DrawQ_Color[1]; ac[10] = DrawQ_Color[2]; ac[11] = DrawQ_Color[3];
- ac[12] = DrawQ_Color[0]; ac[13] = DrawQ_Color[1]; ac[14] = DrawQ_Color[2]; ac[15] = DrawQ_Color[3];
- at[0] = map->glyphs[mapch].txmin; at[1] = map->glyphs[mapch].tymin;
- at[2] = map->glyphs[mapch].txmax; at[3] = map->glyphs[mapch].tymin;
- at[4] = map->glyphs[mapch].txmax; at[5] = map->glyphs[mapch].tymax;
- at[6] = map->glyphs[mapch].txmin; at[7] = map->glyphs[mapch].tymax;
- av[ 0] = x + dw * map->glyphs[mapch].vxmin; av[ 1] = y + dh * map->glyphs[mapch].vymin; av[ 2] = 10;
- av[ 3] = x + dw * map->glyphs[mapch].vxmax; av[ 4] = y + dh * map->glyphs[mapch].vymin; av[ 5] = 10;
- av[ 6] = x + dw * map->glyphs[mapch].vxmax; av[ 7] = y + dh * map->glyphs[mapch].vymax; av[ 8] = 10;
- av[ 9] = x + dw * map->glyphs[mapch].vxmin; av[10] = y + dh * map->glyphs[mapch].vymax; av[11] = 10;
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, map->pic->name, flags, TEXF_ALPHA | TEXF_CLAMP, MATERIALFLAG_VERTEXCOLOR), 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;
- ac += 16;
- at += 8;
- av += 12;
- batchcount++;
- if (batchcount >= QUADELEMENTS_MAXQUADS)
- {
- R_Mesh_PrepareVertices_Generic_Arrays(batchcount * 4, vertex3f, color4f, texcoord2f);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, NULL, 0, quadelement3s, NULL, 0);
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
- }
//prevmap = map;
prevch = ch;
}
}
}
- if (batchcount > 0)
- {
- R_Mesh_PrepareVertices_Generic_Arrays(batchcount * 4, vertex3f, color4f, texcoord2f);
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, NULL, 0, quadelement3s, NULL, 0);
- }
if (outcolor)
*outcolor = colorindex;
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_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
-// R_Mesh_ResetTextureState();
- if (pic)
- {
- if (width == 0)
- width = pic->width;
- if (height == 0)
- height = pic->height;
- R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
- }
- else
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- 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[12] = s1;floats[13] = t1;
- floats[14] = s2;floats[15] = t2;
- floats[16] = s4;floats[17] = t4;
- floats[18] = s3;floats[19] = t3;
- 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_PrepareVertices_Generic_Arrays(4, floats, floats + 20, floats + 12);
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
-}
-
-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags, qboolean hasalpha)
-{
+ dp_model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
_DrawQ_Setup();
- CHECKGLERROR
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
- DrawQ_ProcessDrawFlag(flags, hasalpha);
-
-// R_Mesh_ResetTextureState();
- R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);
-
- R_Mesh_PrepareVertices_Generic_Arrays(mesh->num_vertices, mesh->data_vertex3f, mesh->data_color4f, mesh->data_texcoord2f);
- R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, mesh->data_element3i, NULL, 0, mesh->data_element3s, NULL, 0);
+ if (!pic)
+ pic = Draw_CachePic("white");
+ 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_VERTEXCOLOR), 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_SetupAndProcessDrawFlag(flags, NULL, 1);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
- GL_Color(1,1,1,1);
- switch(vid.renderpath)
+ dp_model_t *mod = CL_Mesh_UI();
+ msurface_t *surf;
+ int e0, e1, e2, e3;
+ float offsetx, offsety;
+ _DrawQ_Setup();
+ // width is measured in real pixels
+ if (fabs(x2 - x1) > fabs(y2 - y1))
{
- case RENDERPATH_GL11:
- case RENDERPATH_GL13:
- case RENDERPATH_GL20:
- CHECKGLERROR
- qglBegin(GL_LINE_LOOP);
- for (num = 0;num < mesh->num_vertices;num++)
- {
- 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]);
- }
- qglEnd();
- CHECKGLERROR
- break;
- case RENDERPATH_D3D9:
- //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D10:
- Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D11:
- Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_SOFT:
- //Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_GLES2:
- //Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- return;
+ offsetx = 0;
+ offsety = width * vid_conheight.value / vid.height;
}
-}
-
-//[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_SetupAndProcessDrawFlag(flags, NULL, alpha);
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
-
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- switch(vid.renderpath)
+ else
{
- case RENDERPATH_GL11:
- case RENDERPATH_GL13:
- case RENDERPATH_GL20:
- CHECKGLERROR
-
- //qglLineWidth(width);CHECKGLERROR
-
- GL_Color(r,g,b,alpha);
- CHECKGLERROR
- qglBegin(GL_LINES);
- qglVertex2f(x1, y1);
- qglVertex2f(x2, y2);
- qglEnd();
- CHECKGLERROR
- break;
- case RENDERPATH_D3D9:
- //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D10:
- Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D11:
- Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_SOFT:
- //Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_GLES2:
- //Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- return;
+ offsetx = width * vid_conwidth.value / vid.width;
+ offsety = 0;
}
+ surf = Mod_Mesh_AddSurface(mod, Mod_Mesh_GetTexture(mod, "white", 0, 0, MATERIALFLAG_VERTEXCOLOR), 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_Lines (float width, int numlines, const float *vertex3f, const float *color4f, int flags)
+void DrawQ_SetClipArea(float x, float y, float width, float height)
{
- int i;
- qboolean hasalpha = false;
- for (i = 0;i < numlines*2;i++)
- if (color4f[i*4+3] < 1.0f)
- hasalpha = true;
-
- _DrawQ_SetupAndProcessDrawFlag(flags, NULL, hasalpha ? 0.5f : 1.0f);
-
- if(!r_draw2d.integer && !r_draw2d_force)
- return;
+ int ix, iy, iw, ih;
+ _DrawQ_Setup();
+ DrawQ_FlushUI();
+ // We have to convert the con coords into real coords
+ // 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_GL11:
case RENDERPATH_GL13:
case RENDERPATH_GL20:
- CHECKGLERROR
-
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
-
- //qglLineWidth(width);CHECKGLERROR
-
- CHECKGLERROR
- R_Mesh_PrepareVertices_Generic_Arrays(numlines*2, vertex3f, color4f, NULL);
- qglDrawArrays(GL_LINES, 0, numlines*2);
- CHECKGLERROR
+ case RENDERPATH_GLES1:
+ case RENDERPATH_GLES2:
+ case RENDERPATH_SOFT:
+ GL_Scissor(ix, vid.height - iy - ih, iw, ih);
break;
case RENDERPATH_D3D9:
- //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
+ GL_Scissor(ix, iy, iw, ih);
break;
case RENDERPATH_D3D10:
Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
case RENDERPATH_D3D11:
Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
break;
- case RENDERPATH_SOFT:
- //Con_DPrintf("FIXME SOFT %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_GLES2:
- //Con_DPrintf("FIXME GLES2 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- return;
}
-}
-
-void DrawQ_SetClipArea(float x, float y, float width, float height)
-{
- int ix, iy, iw, ih;
- _DrawQ_Setup();
-
- // We have to convert the con coords into real coords
- // OGL uses top to bottom
- ix = (int)(0.5 + x * ((float)vid.width / vid_conwidth.integer));
- iy = (int)(0.5 + y * ((float) vid.height / vid_conheight.integer));
- iw = (int)(0.5 + (x+width) * ((float)vid.width / vid_conwidth.integer)) - ix;
- ih = (int)(0.5 + (y+height) * ((float) vid.height / vid_conheight.integer)) - iy;
- GL_Scissor(ix, vid.height - iy - ih, iw, ih);
GL_ScissorTest(true);
}
void DrawQ_ResetClipArea(void)
{
+ DrawQ_FlushUI();
_DrawQ_Setup();
GL_ScissorTest(false);
}
void DrawQ_Finish(void)
{
+ DrawQ_FlushUI();
r_refdef.draw2dstage = 0;
}
void DrawQ_RecalcView(void)
{
+ DrawQ_FlushUI();
if(r_refdef.draw2dstage)
r_refdef.draw2dstage = -1; // next draw call will set viewport etc. again
}
-static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
-void R_DrawGamma(void)
+void DrawQ_FlushUI(void)
{
- float c[4];
- switch(vid.renderpath)
- {
- case RENDERPATH_GL20:
- case RENDERPATH_D3D9:
- case RENDERPATH_D3D10:
- case RENDERPATH_D3D11:
- case RENDERPATH_GLES2:
- if (vid_usinghwgamma || v_glslgamma.integer)
- return;
- break;
- case RENDERPATH_GL13:
- case RENDERPATH_GL11:
- if (vid_usinghwgamma)
- return;
- break;
- case RENDERPATH_SOFT:
+ int i;
+ dp_model_t *mod = CL_Mesh_UI();
+ if (mod->num_surfaces == 0)
return;
- }
- // all the blends ignore depth
-// R_Mesh_ResetTextureState();
- R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
- 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(c[0] - 1, c[1] - 1, c[2] - 1, 1);
- R_Mesh_PrepareVertices_Generic_Arrays(3, blendvertex3f, NULL, NULL);
- R_Mesh_Draw(0, 3, 0, 1, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
- VectorScale(c, 0.5, c);
- }
- }
- if (v_color_enable.integer)
+
+ if (!r_draw2d.integer && !r_draw2d_force)
{
- c[0] = v_color_black_r.value;
- c[1] = v_color_black_g.value;
- c[2] = v_color_black_b.value;
+ Mod_Mesh_Reset(mod);
+ return;
}
- 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] - 1, c[1] - 1, c[2] - 1, 1);
- R_Mesh_PrepareVertices_Generic_Arrays(3, blendvertex3f, NULL, NULL);
- R_Mesh_Draw(0, 3, 0, 1, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
+
+ // TODO: render the mesh using R_Q1BSP_Draw or similar, for full material support.
+ GL_DepthMask(false);
+ R_Mesh_PrepareVertices_Generic_Arrays(mod->surfmesh.num_vertices, mod->surfmesh.data_vertex3f, mod->surfmesh.data_lightmapcolor4f, mod->surfmesh.data_texcoordtexture2f);
+ for (i = 0; i < mod->num_surfaces; i++)
+ {
+ msurface_t *surf = mod->data_surfaces + i;
+ texture_t *tex = surf->texture;
+ if (tex->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND)
+ GL_BlendFunc(tex->customblendfunc[0], tex->customblendfunc[1]);
+ else if (tex->currentmaterialflags & MATERIALFLAG_ADD)
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+ else if (tex->currentmaterialflags & MATERIALFLAG_ALPHA)
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ else
+ GL_BlendFunc(GL_ONE, GL_ZERO);
+ R_SetupShader_Generic(tex->currentskinframe->base, NULL, GL_MODULATE, 1, (tex->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND) ? false : true, true, false);
+ R_Mesh_Draw(surf->num_firstvertex, surf->num_vertices, surf->num_firsttriangle, surf->num_triangles, mod->surfmesh.data_element3i, NULL, 0, mod->surfmesh.data_element3s, NULL, 0);
}
-}
+ Mod_Mesh_Reset(mod);
+}
projects / xonotic / darkplaces.git / blobdiff