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)"};
+
+extern cvar_t v_glslgamma;
//=============================================================================
/* Support Routines */
static rtexturepool_t *drawtexturepool;
-static unsigned char concharimage[FONT_FILESIZE] =
+static const unsigned char concharimage[FONT_FILESIZE] =
{
#include "lhfont.h"
};
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, NULL);
+ return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, pixels[0], TEXTYPE_PALETTE, TEXF_FORCENEAREST | TEXF_PRECACHE, palette_bgra_transparent);
}
typedef struct embeddedpic_s
}
embeddedpic_t;
-static embeddedpic_t embeddedpics[] =
+static const embeddedpic_t embeddedpics[] =
{
{
"gfx/prydoncursor001", 16, 16,
{NULL, 0, 0, NULL}
};
-static rtexture_t *draw_generatepic(const char *name)
+static rtexture_t *draw_generatepic(const char *name, qboolean quiet)
{
- embeddedpic_t *p;
+ 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);
return draw_generateconchars();
if (!strcmp(name, "gfx/colorcontrol/ditherpattern"))
return draw_generateditherpattern();
- Con_Printf("Draw_CachePic: failed to load %s\n", name);
+ if (!quiet)
+ Con_Printf("Draw_CachePic: failed to load %s\n", name);
return r_texture_notexture;
}
================
*/
// FIXME: move this to client somehow
-static cachepic_t *Draw_CachePic_Compression (const char *path, qboolean persistent, qboolean allow_compression)
+cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
{
int crc, hashkey;
cachepic_t *pic;
}
flags = TEXF_ALPHA;
- if (persistent)
+ if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
flags |= TEXF_PRECACHE;
- if (strcmp(path, "gfx/colorcontrol/ditherpattern"))
+ if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
flags |= TEXF_CLAMP;
- if(allow_compression && gl_texturecompression_2d.integer)
+ if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
flags |= TEXF_COMPRESS;
// load a high quality image from disk if possible
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);
+
if (lmpsize >= 9)
{
pic->width = lmpdata[0] + lmpdata[1] * 256 + lmpdata[2] * 65536 + lmpdata[3] * 16777216;
}
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
// if it's not found on disk, generate an image
if (pic->tex == NULL)
{
- pic->tex = draw_generatepic(path);
+ pic->tex = draw_generatepic(path, (cachepicflags & CACHEPICFLAG_QUIET) != 0);
pic->width = R_TextureWidth(pic->tex);
pic->height = R_TextureHeight(pic->tex);
}
return pic;
}
-cachepic_t *Draw_CachePic (const char *path, qboolean persistent)
+
+cachepic_t *Draw_CachePic (const char *path)
{
- return Draw_CachePic_Compression(path, persistent, true);
+ return Draw_CachePic_Flags (path, 0);
}
cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels_bgra)
static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
{
int i;
- float maxwidth;
+ float maxwidth, scale;
char widthfile[MAX_QPATH];
char *widthbuf;
fs_offset_t widthbufsize;
if(drawtexturepool == NULL)
return; // before gl_draw_start, so will be loaded later
- fnt->tex = Draw_CachePic_Compression(fnt->texpath, true, false)->tex;
+ fnt->tex = Draw_CachePic_Flags(fnt->texpath, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOCOMPRESSION)->tex;
if(fnt->tex == r_texture_notexture)
{
- fnt->tex = Draw_CachePic_Compression("gfx/conchars", true, false)->tex;
+ fnt->tex = Draw_CachePic_Flags("gfx/conchars", CACHEPICFLAG_NOCOMPRESSION)->tex;
strlcpy(widthfile, "gfx/conchars.width", sizeof(widthfile));
}
else
// unspecified width == 1 (base width)
for(i = 1; i < 256; ++i)
fnt->width_of[i] = 1;
+ scale = 1;
// FIXME load "name.width", if it fails, fill all with 1
if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize)))
if(!COM_ParseToken_Simple(&p, false, false))
return;
- if(!strcmp(com_token, "extraspacing"))
+ switch(*com_token)
{
- if(!COM_ParseToken_Simple(&p, false, false))
- return;
- extraspacing = atof(com_token);
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case '+':
+ case '-':
+ case '.':
+ fnt->width_of[ch++] = atof(com_token) + extraspacing;
+ break;
+ default:
+ if(!strcmp(com_token, "extraspacing"))
+ {
+ if(!COM_ParseToken_Simple(&p, false, false))
+ return;
+ extraspacing = atof(com_token);
+ }
+ else if(!strcmp(com_token, "scale"))
+ {
+ if(!COM_ParseToken_Simple(&p, false, false))
+ return;
+ scale = atof(com_token);
+ }
+ else
+ {
+ Con_Printf("Warning: skipped unknown font property %s\n", com_token);
+ if(!COM_ParseToken_Simple(&p, false, false))
+ return;
+ }
+ break;
}
- else
- fnt->width_of[ch++] = atof(com_token) + extraspacing;
}
Mem_Free(widthbuf);
maxwidth = fnt->width_of[1];
for(i = 2; i < 256; ++i)
maxwidth = max(maxwidth, fnt->width_of[i]);
- fnt->width_of[0] = maxwidth;
+ fnt->maxwidth = maxwidth;
+
+ // fix up maxwidth for overlap
+ fnt->maxwidth *= scale;
+ fnt->scale = scale;
if(fnt == FONT_CONSOLE)
con_linewidth = -1; // rewrap console in next frame
int i, j;
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);
strlcpy(FONT_CENTERPRINT->title, "centerprint", sizeof(FONT_CENTERPRINT->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_FONTS; ++i)
+ 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++);
}
-static void _DrawQ_Setup(void)
+void _DrawQ_Setup(void)
{
if (r_refdef.draw2dstage)
return;
r_refdef.draw2dstage = true;
CHECKGLERROR
- qglViewport(r_view.x, vid.height - (r_view.y + r_view.height), r_view.width, r_view.height);CHECKGLERROR
- GL_ColorMask(r_view.colormask[0], r_view.colormask[1], r_view.colormask[2], 1);
+ 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_AlphaTest(false);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- if (gl_support_fragment_shader)
- {
- qglUseProgramObjectARB(0);CHECKGLERROR
- }
+ R_SetupGenericShader(true);
}
static void _DrawQ_ProcessDrawFlag(int flags)
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_Mesh_VertexPointer(floats, 0, 0);
R_Mesh_ColorPointer(NULL, 0, 0);
R_Mesh_ResetTextureState();
+ R_SetupGenericShader(pic != NULL);
if (pic)
{
if (width == 0)
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;
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[3] = floats[6] = x + width;
floats[7] = floats[10] = y + height;
- R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+ R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
}
void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
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[3] = floats[6] = x + width;
floats[7] = floats[10] = y + height;
- R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+ R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
}
// color tag printing
-static vec4_t string_colors[] =
+static const vec4_t string_colors[] =
{
// Quake3 colors
// LordHavoc: why on earth is cyan before magenta in Quake3?
static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g, float b, float a, qboolean shadow)
{
- float v = r_textbrightness.value;
- Vector4Copy(string_colors[colorindex], color);
- Vector4Set(color, (color[0] * (1-v) + v) * r, (color[1] * (1-v) + v) * g, (color[2] * (1-v) + v) * b, color[3] * a);
+ float C = r_textcontrast.value;
+ float B = r_textbrightness.value;
+ if (colorindex & 0x10000) // that bit means RGB color
+ {
+ color[0] = ((colorindex >> 12) & 0xf) / 15.0;
+ color[1] = ((colorindex >> 8) & 0xf) / 15.0;
+ color[2] = ((colorindex >> 4) & 0xf) / 15.0;
+ color[3] = (colorindex & 0xf) / 15.0;
+ }
+ else
+ Vector4Copy(string_colors[colorindex], color);
+ Vector4Set(color, color[0] * r * C + B, color[1] * g * C + B, color[2] * b * C + B, color[3] * a);
if (shadow)
{
- float shadowalpha = color[0]+color[1]+color[2] * 0.8;
+ float shadowalpha = (color[0]+color[1]+color[2]) * 0.8;
Vector4Set(color, 0, 0, 0, color[3] * bound(0, shadowalpha, 1));
}
}
-static float DrawQ_String_Font_UntilX(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 maxx)
+float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+{
+ int num, colorindex = STRING_COLOR_DEFAULT;
+ size_t i;
+ float x = 0;
+ char ch;
+ int current_alpha, tempcolorindex;
+
+ if (*maxlen < 1)
+ *maxlen = 1<<30;
+
+ if (!outcolor || *outcolor == -1)
+ colorindex = STRING_COLOR_DEFAULT;
+ else
+ colorindex = *outcolor;
+
+ maxwidth /= fnt->scale;
+
+ current_alpha = 0xf;
+
+ for (i = 0;i < *maxlen && text[i];i++)
+ {
+ if (text[i] == ' ')
+ {
+ if(x + fnt->width_of[' '] > maxwidth)
+ break; // oops, can't draw this
+ x += fnt->width_of[' '];
+ continue;
+ }
+ if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
+ {
+ ch = text[++i];
+ if (ch <= '9' && ch >= '0') // ^[0-9] found
+ {
+ colorindex = ch - '0';
+ continue;
+ }
+ else if (ch == STRING_COLOR_RGB_DEFAULT && 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)
+ {
+ 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 | current_alpha;
+ // ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
+ i+=3;
+ continue;
+ }
+ }
+ }
+ }
+ /*else if (ch == 'a' && i + 1 < *maxlen) // ^a found
+ {
+ if (colorindex > 9)
+ {
+ ch = tolower(text[i+1]);
+ if (ch <= '9' && ch >= '0') current_alpha = (ch - '0');
+ else if (ch >= 'a' && ch <= 'f') current_alpha = (ch - 87);
+ else if (ch == '+' && colorindex > 9)
+ {
+ current_alpha = colorindex & 0xf;
+ if (current_alpha < 0xf)
+ current_alpha++;
+ }
+ else if (ch == '-' && colorindex > 9)
+ {
+ current_alpha = colorindex & 0xf;
+ if (current_alpha > 0)
+ current_alpha--;
+ }
+ colorindex = ((colorindex >> 4 ) << 4) + current_alpha;
+ }
+ i++;
+ continue;
+ }*/
+ else if (ch == STRING_COLOR_TAG) // ^^ found, ignore the first ^ and go to print the second
+ i++;
+ i--;
+ }
+ num = (unsigned char) text[i];
+ if(x + fnt->width_of[num] > maxwidth)
+ break; // oops, can't draw this
+ x += fnt->width_of[num];
+ }
+
+ *maxlen = i;
+
+ if (outcolor)
+ *outcolor = colorindex;
+
+ return x * fnt->scale;
+}
+
+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)
{
int num, shadow, colorindex = STRING_COLOR_DEFAULT;
size_t i;
- float x = startx, y, s, t, u, v;
+ 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];
- qboolean checkwidth;
+ int ch;
+ int current_alpha, tempcolorindex;
- if (*maxlen < 1)
- *maxlen = 1<<30;
+ int tw, th;
+ tw = R_TextureWidth(fnt->tex);
+ th = R_TextureHeight(fnt->tex);
- // when basealpha == 0, skip as much as possible (just return width)
- if(basealpha > 0)
- {
- _DrawQ_ProcessDrawFlag(flags);
+ starty -= (fnt->scale - 1) * h * 0.5; // center
+ w *= fnt->scale;
+ h *= fnt->scale;
- 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);
- }
+ if (maxlen < 1)
+ maxlen = 1<<30;
+
+ _DrawQ_ProcessDrawFlag(flags);
+
+ 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);
ac = color4f;
at = texcoord2f;
av = vertex3f;
batchcount = 0;
- checkwidth = (maxx >= startx);
for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
{
colorindex = STRING_COLOR_DEFAULT;
else
colorindex = *outcolor;
- if(basealpha > 0)
- DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
+
+ DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
x = startx;
y = starty;
x += r_textshadow.value;
y += r_textshadow.value;
}
- for (i = 0;i < *maxlen && text[i];i++)
+ current_alpha = 0xf;
+ for (i = 0;i < maxlen && text[i];i++)
{
if (text[i] == ' ')
{
- if(checkwidth)
- if(x + fnt->width_of[' '] * w > maxx)
- break; // oops, can't draw this
x += fnt->width_of[' '] * w;
continue;
}
- if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
+ if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
{
- if (text[i+1] == STRING_COLOR_TAG)
+ ch = text[++i];
+ if (ch <= '9' && ch >= '0') // ^[0-9] found
{
- i++;
- }
- else if (text[i+1] >= '0' && text[i+1] <= '9')
- {
- colorindex = text[i+1] - '0';
+ colorindex = ch - '0';
DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
- i++;
continue;
}
- }
- num = (unsigned char) text[i];
- if(checkwidth)
- if(x + fnt->width_of[num] * w > maxx)
- break; // oops, can't draw this
- if(basealpha > 0)
- {
- // FIXME make these smaller to just include the occupied part of the character for slightly faster rendering
- s = (num & 15)*0.0625f + (0.5f / 256.0f);
- t = (num >> 4)*0.0625f + (0.5f / 256.0f);
- u = 0.0625f - (1.0f / 256.0f);
- v = 0.0625f - (1.0f / 256.0f);
- 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;av[ 4] = y ;av[ 5] = 10;
- av[ 6] = x+w;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)
+ else if (ch == STRING_COLOR_RGB_DEFAULT && i+3 < maxlen ) // ^x found
{
- if (basealpha >= (1.0f / 255.0f))
+ // 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)
{
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
- GL_LockArrays(0, 0);
+ 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 | current_alpha;
+ // ...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);
+ i+=3;
+ continue;
+ }
+ }
}
- batchcount = 0;
- ac = color4f;
- at = texcoord2f;
- av = vertex3f;
}
+ /*else if (ch == 'a' && i+1 < maxlen ) // ^a found
+ {
+ if (colorindex > 9) // colorindex is a RGB color
+ {
+ ch = tolower(text[i+1]);
+ if (ch <= '9' && ch >= '0') current_alpha = (ch - '0');
+ else if (ch >= 'a' && ch <= 'f') current_alpha = (ch - 87);
+ else if (ch == '+' && colorindex > 9)
+ {
+ current_alpha = colorindex & 0xf;
+ if (current_alpha < 0xf)
+ current_alpha++;
+ }
+ else if (ch == '-' && colorindex > 9)
+ {
+ current_alpha = colorindex & 0xf;
+ if (current_alpha > 0)
+ current_alpha--;
+ }
+ colorindex = ((colorindex >> 4 ) << 4) + current_alpha;
+ //Con_Printf("^1colorindex:^7 %x\n", colorindex);
+ DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
+ }
+ i++;
+ continue;
+ }*/
+ else if (ch == STRING_COLOR_TAG)
+ i++;
+ 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)
+ {
+ 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 += fnt->width_of[num] * w;
+ x += thisw * w;
}
- if(checkwidth)
- *maxlen = i;
- checkwidth = 0; // we've done all we had to
}
- if (basealpha > 0)
+ if (batchcount > 0)
{
- if (batchcount > 0)
- {
- GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
- GL_LockArrays(0, 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)
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)
-{
- return DrawQ_String_Font_UntilX(startx, starty, text, &maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, fnt, startx-1);
-}
-
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)
{
return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
}
-float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, float scalex, float scaley, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
{
- return DrawQ_String_Font_UntilX(0, 0, text, maxlen, scalex, scaley, 1, 1, 1, 0, 0, NULL, ignorecolorcodes, fnt, maxWidth);
+ return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
}
-float DrawQ_TextWidth_Font(const char *text, size_t maxlen, float scalex, float scaley, qboolean ignorecolorcodes, const dp_font_t *fnt)
+float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
{
- return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, scalex, scaley, ignorecolorcodes, fnt, -1);
+ return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, 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)
{
int color, numchars = 0;
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)
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, 2, polygonelements, 0, 0);
+ R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
}
void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
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, mesh->num_triangles, mesh->data_element3i, 0, 0);
+ R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, NULL, mesh->data_element3s, 0, 0);
GL_LockArrays(0, 0);
}
{
_DrawQ_ProcessDrawFlag(flags);
+ R_SetupGenericShader(false);
+
CHECKGLERROR
qglLineWidth(width);CHECKGLERROR
void R_DrawGamma(void)
{
float c[4];
- if (!vid_usinghwgamma)
+ if (!vid_usinghwgamma && !(r_glsl.integer && v_glslgamma.integer))
{
// 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);
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, 1, polygonelements, 0, 0);
+ R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
VectorScale(c, 0.5, c);
}
}
{
GL_BlendFunc(GL_ONE, GL_ONE);
GL_Color(c[0], c[1], c[2], 1);
- R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
+ R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
}
}
}
projects / xonotic / darkplaces.git / blobdiff