#include "ft2.h"
#include "ft2_fontdefs.h"
-dp_font_t dp_fonts[MAX_FONTS] = {{0}};
+dp_fonts_t dp_fonts;
+static mempool_t *fonts_mempool = NULL;
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)"};
double random;
rtexture_t *tex;
- data = LoadTGA_BGRA (concharimage, FONT_FILESIZE);
+ data = LoadTGA_BGRA (concharimage, FONT_FILESIZE, NULL);
// Gold numbers
for (i = 0;i < 8192;i++)
{
Image_WriteTGABGRA ("gfx/generated_conchars.tga", 256, 256, data);
#endif
- tex = R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, data, TEXTYPE_BGRA, TEXF_ALPHA, NULL);
+ tex = R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, data, TEXTYPE_BGRA, TEXF_ALPHA, -1, NULL);
Mem_Free(data);
return tex;
}
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, palette_bgra_transparent);
+ return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST, -1, palette_bgra_transparent);
}
typedef struct embeddedpic_s
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, palette_bgra_embeddedpic);
+ 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"))
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)
+ texflags |= TEXF_COMPRESS;
// 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))
- return pic;
+ if(!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
+ {
+ if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+ {
+ if(pic->tex)
+ pic->autoload = false; // persist it
+ else
+ goto reload; // load it below, and then persist
+ }
+ return pic;
+ }
if (numcachepics == MAX_CACHED_PICS)
{
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
return pic;
}
- pic->texflags = TEXF_ALPHA;
- if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
- pic->texflags |= TEXF_CLAMP;
- if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
- pic->texflags |= TEXF_COMPRESS;
-
+ pic->hasalpha = true; // assume alpha unless we know it has none
+ 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);
+ 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);
+ 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, NULL);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags & (pic->hasalpha ? ~0 : ~TEXF_ALPHA), -1, NULL);
}
else
{
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, palette_bgra_transparent);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
}
Mem_Free(lmpdata);
}
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, palette_bgra_font);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, lmpdata, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_font);
}
else
{
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, palette_bgra_transparent);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, pic->width, pic->height, lmpdata + 8, TEXTYPE_PALETTE, pic->texflags, -1, palette_bgra_transparent);
}
}
cachepic_t *Draw_CachePic (const char *path)
{
- return Draw_CachePic_Flags (path, 0);
+ return Draw_CachePic_Flags (path, 0); // default to persistent!
}
int draw_frame = 1;
{
if (pic->autoload && !pic->tex)
{
- pic->tex = loadtextureimage(drawtexturepool, pic->name, false, pic->texflags, true, r_texture_convertsRGB_2d.integer);
+ 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);
+ 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);
}
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) | TEXF_ALLOWUPDATES, NULL);
+ pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, (alpha ? TEXF_ALPHA : 0), -1, NULL);
return pic;
}
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(qboolean 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 loaded
+ // 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.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
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))
case '-':
case '.':
fnt->width_of[ch] = atof(com_token) + extraspacing;
- if (fnt->ft2)
- {
- for (i = 0; i < MAX_FONT_SIZES; ++i)
- {
- //Font_MapForIndex(fnt->ft2, i)->width_of[ch] = snap_to_pixel_x(fnt->width_of[ch] * fnt->req_sizes[i], 0.4);
- ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i);
- if (!map)
- break;
- map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
- }
- }
ch++;
break;
default:
{
if(!COM_ParseToken_Simple(&p, false, false))
return;
- scale = atof(com_token);
+ fnt->settings.scale = atof(com_token);
}
else
{
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, qboolean 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)
{
dp_font_t *f;
- int i;
+ int i, sizes;
const char *filelist, *c, *cm;
- float sz;
+ float sz, scale, voffset;
char mainfont[MAX_QPATH];
if(Cmd_Argc() < 2)
{
Con_Printf("Available font commands:\n");
- for(i = 0; i < MAX_FONTS; ++i)
- Con_Printf(" loadfont %s gfx/tgafile[...] [sizes...]\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"
"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(1), true);
if(f == NULL)
{
Con_Printf("font function not found\n");
for(i = 1; i < MAX_FONT_SIZES; ++i)
f->req_sizes[i] = -1;
- if(Cmd_Argc() >= 3)
+ scale = 1;
+ voffset = 0;
+ if(Cmd_Argc() >= 4)
{
- for(i = 0; i < Cmd_Argc()-3; ++i)
+ for(sizes = 0, i = 3; i < Cmd_Argc(); ++i)
{
- sz = atof(Cmd_Argv(i+3));
+ // special switches
+ if (!strcmp(Cmd_Argv(i), "scale"))
+ {
+ i++;
+ if (i < Cmd_Argc())
+ scale = atof(Cmd_Argv(i));
+ continue;
+ }
+ if (!strcmp(Cmd_Argv(i), "voffset"))
+ {
+ i++;
+ if (i < Cmd_Argc())
+ voffset = atof(Cmd_Argv(i));
+ continue;
+ }
+
+ if (sizes == -1)
+ continue; // no slot for other sizes
+
+ // parse one of sizes
+ sz = atof(Cmd_Argv(i));
if (sz > 0.001f && sz < 1000.0f) // do not use crap sizes
- f->req_sizes[i] = sz;
+ {
+ // 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("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);
+ LoadFont(true, mainfont, f, scale, voffset);
}
/*
font_start();
- for(i = 0; i < MAX_FONTS; ++i)
- LoadFont(false, va("gfx/font_%s", dp_fonts[i].title), &dp_fonts[i]);
+ // 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);
// draw the loading screen so people have something to see in the newly opened window
SCR_UpdateLoadingScreen(true);
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_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);
+ // 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++);
+
+ 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, NULL, NULL);
}
-void _DrawQ_Setup(void)
+static void _DrawQ_Setup(void)
{
r_viewport_t viewport;
- if (r_refdef.draw2dstage)
+ if (r_refdef.draw2dstage == 1)
return;
- r_refdef.draw2dstage = true;
+ 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);
- qglDepthFunc(GL_LEQUAL);CHECKGLERROR
- qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR
- GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
+ GL_DepthFunc(GL_LEQUAL);
+ GL_PolygonOffset(0,0);
+ GL_CullFace(GL_NONE);
R_EntityMatrix(&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);
}
-static void _DrawQ_ProcessDrawFlag(int flags)
+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_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+ {
+ 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_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+ {
+ GL_DepthMask(false);
+ GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+ }
else if(flags == DRAWFLAG_SCREEN)
- GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- else
+ {
+ 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[20];
+ float floats[36];
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
+ _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
+// 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)
if (height == 0)
height = pic->height;
R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
- 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
+
+#if 0
// AK07: lets be texel correct on the corners
{
float horz_offset = 0.5f / pic->width;
floats[3] = floats[6] = x + width;
floats[7] = floats[10] = y + height;
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0);
+ 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_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 floats[36];
float af = DEG2RAD(-angle); // forward
float ar = DEG2RAD(-angle + 90); // right
float sinaf = sin(af);
float sinar = sin(ar);
float cosar = cos(ar);
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
+ _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
+// R_Mesh_ResetTextureState();
if (pic)
{
if (width == 0)
if (height == 0)
height = pic->height;
R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
- 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;
}
else
R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
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, polygonelement3i, polygonelement3s, 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[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);
}
void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
{
- float floats[12];
+ float floats[36];
- _DrawQ_ProcessDrawFlag(flags);
- GL_Color(red, green, blue, alpha);
+ _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
+// R_Mesh_ResetTextureState();
R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
floats[2] = floats[5] = floats[8] = floats[11] = 0;
floats[1] = floats[4] = y;
floats[3] = floats[6] = x + width;
floats[7] = floats[10] = y + height;
-
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 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[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);
}
/// color tag printing
snap = false;
}
// do this in the end
- w *= fnt->scale;
- h *= fnt->scale;
+ w *= fnt->settings.scale;
+ h *= fnt->settings.scale;
// find the most fitting size:
if (ft2 != NULL)
return x;
}
+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, qboolean ignorecolorcodes, const dp_font_t *fnt)
{
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;
static float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
static float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
snap = false;
}
- starty -= (fnt->scale - 1) * h * 0.5; // center
- w *= fnt->scale;
- h *= fnt->scale;
+ 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 (maxlen < 1)
maxlen = 1<<30;
- _DrawQ_ProcessDrawFlag(flags);
+ _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_ColorPointer(color4f, 0, 0);
- R_Mesh_ResetTextureState();
+// R_Mesh_ResetTextureState();
if (!fontmap)
R_Mesh_TexBind(0, fnt->tex);
- R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0);
- R_Mesh_VertexPointer(vertex3f, 0, 0);
R_SetupShader_Generic(fnt->tex, NULL, GL_MODULATE, 1);
ac = color4f;
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 (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;
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);
+ DrawQ_GetTextColor(DrawQ_Color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
i+=4;
text+=4;
continue;
}
if (!fontmap || (ch <= 0xFF && fontmap->glyphs[ch].image) || (ch >= 0xE000 && ch <= 0xE0FF))
{
- if (ch > 0xE000)
+ if (ch >= 0xE000)
ch -= 0xE000;
if (ch > 0xFF)
- continue;
+ goto out;
if (fontmap)
{
if (map != ft2_oldstyle_map)
if (batchcount)
{
// switching from freetype to non-freetype rendering
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 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);
batchcount = 0;
ac = color4f;
at = texcoord2f;
t = (ch >> 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];
+ 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 ;
batchcount++;
if (batchcount >= QUADELEMENTS_MAXQUADS)
{
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 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);
batchcount = 0;
ac = color4f;
at = texcoord2f;
if (batchcount)
{
// we need a different character map, render what we currently have:
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 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);
batchcount = 0;
ac = color4f;
at = texcoord2f;
}
else
kx = ky = 0;
- 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];
+ 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;
batchcount++;
if (batchcount >= QUADELEMENTS_MAXQUADS)
{
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 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);
batchcount = 0;
ac = color4f;
at = texcoord2f;
//prevmap = map;
prevch = ch;
}
+out:
if (shadow)
{
x -= 1.0/pix_x * r_textshadow.value;
}
}
if (batchcount > 0)
- R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 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;
-
+
// note: this relies on the proper text (not shadow) being drawn last
return x;
}
{
float floats[36];
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
- R_Mesh_VertexPointer(floats, 0, 0);
- R_Mesh_ColorPointer(floats + 20, 0, 0);
- R_Mesh_ResetTextureState();
+// R_Mesh_ResetTextureState();
if (pic)
{
if (width == 0)
if (height == 0)
height = pic->height;
R_SetupShader_Generic(Draw_GetPicTexture(pic), NULL, GL_MODULATE, 1);
- 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;
}
else
R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
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_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0);
+ 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)
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags, qboolean hasalpha)
{
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_Setup();
+ CHECKGLERROR
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
+ DrawQ_ProcessDrawFlag(flags, hasalpha);
- R_Mesh_VertexPointer(mesh->data_vertex3f, 0, 0);
- R_Mesh_ColorPointer(mesh->data_color4f, 0, 0);
- R_Mesh_ResetTextureState();
- R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
+// R_Mesh_ResetTextureState();
R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);
- R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, mesh->data_element3i, mesh->data_element3s, 0, 0);
+ 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);
}
void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
{
int num;
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
GL_Color(1,1,1,1);
- CHECKGLERROR
- qglBegin(GL_LINE_LOOP);
- for (num = 0;num < mesh->num_vertices;num++)
+ switch(vid.renderpath)
{
- 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]);
+ case RENDERPATH_GL11:
+ case RENDERPATH_GL13:
+ case RENDERPATH_GL20:
+ case RENDERPATH_CGGL:
+ 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;
}
- 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);
+ _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
+ if(!r_draw2d.integer && !r_draw2d_force)
+ return;
R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
- CHECKGLERROR
- //qglLineWidth(width);CHECKGLERROR
+ switch(vid.renderpath)
+ {
+ case RENDERPATH_GL11:
+ case RENDERPATH_GL13:
+ case RENDERPATH_GL20:
+ case RENDERPATH_CGGL:
+ CHECKGLERROR
- GL_Color(r,g,b,alpha);
- CHECKGLERROR
- qglBegin(GL_LINES);
- qglVertex2f(x1, y1);
- qglVertex2f(x2, y2);
- qglEnd();
- 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;
+ }
+}
+
+void DrawQ_Lines (float width, int numlines, const float *vertex3f, const float *color4f, int flags)
+{
+ 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;
+
+ switch(vid.renderpath)
+ {
+ case RENDERPATH_GL11:
+ case RENDERPATH_GL13:
+ case RENDERPATH_GL20:
+ case RENDERPATH_CGGL:
+ 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
+ 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;
+ }
}
void DrawQ_SetClipArea(float x, float y, float width, float height)
// 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)(width * ((float)vid.width / vid_conwidth.integer));
- ih = (int)(height * ((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_Finish(void)
{
- r_refdef.draw2dstage = false;
+ r_refdef.draw2dstage = 0;
+}
+
+void DrawQ_RecalcView(void)
+{
+ 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};
{
case RENDERPATH_GL20:
case RENDERPATH_CGGL:
+ case RENDERPATH_D3D9:
+ case RENDERPATH_D3D10:
+ case RENDERPATH_D3D11:
+ case RENDERPATH_GLES2:
if (vid_usinghwgamma || v_glslgamma.integer)
return;
break;
if (vid_usinghwgamma)
return;
break;
+ case RENDERPATH_SOFT:
+ return;
}
// all the blends ignore depth
- R_Mesh_VertexPointer(blendvertex3f, 0, 0);
- R_Mesh_ColorPointer(NULL, 0, 0);
- R_Mesh_ResetTextureState();
+// R_Mesh_ResetTextureState();
R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
GL_DepthMask(true);
GL_DepthRange(0, 1);
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, polygonelement3i, polygonelement3s, 0, 0);
+ 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 (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, polygonelement3i, polygonelement3s, 0, 0);
+ 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);
}
}
projects / xonotic / darkplaces.git / blobdiff