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, 1 makes them all black)"};
+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;
flags = TEXF_ALPHA;
if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
flags |= TEXF_PRECACHE;
- if (strcmp(path, "gfx/colorcontrol/ditherpattern"))
+ if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
flags |= TEXF_CLAMP;
if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
flags |= TEXF_COMPRESS;
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;
// 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
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);
}
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)
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
else
colorindex = *outcolor;
+ maxwidth /= fnt->scale;
+
for (i = 0;i < *maxlen && text[i];i++)
{
if (text[i] == ' ')
if (outcolor)
*outcolor = colorindex;
- return x;
+ 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 texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
float color4f[QUADELEMENTS_MAXQUADS*4*4];
+ int tw, th;
+ tw = R_TextureWidth(fnt->tex);
+ th = R_TextureHeight(fnt->tex);
+
+ starty -= (fnt->scale - 1) * h * 0.5; // center
+ w *= fnt->scale;
+ h *= fnt->scale;
+
if (maxlen < 1)
maxlen = 1<<30;
}
}
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 / 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);
+ 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];
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[ 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;
if (batchcount >= QUADELEMENTS_MAXQUADS)
{
GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
+ 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 (batchcount > 0)
{
GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
+ R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
GL_LockArrays(0, 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_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
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