*/
#include "quakedef.h"
+#include "image.h"
cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
buffer[i][3] = 255;
}
}
- return R_LoadTexture(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+ return R_LoadTexture2D(drawtexturepool, "mousepointer", 16, 16, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
}
// must match NUMCROSSHAIRS in r_crosshairs.c
data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7);
}
}
- return R_LoadTexture(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
+ return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
+static rtexture_t *draw_generateditherpattern(void)
+{
+ qbyte data[16];
+ memset(data, 255, sizeof(data));
+ data[0] = data[1] = data[2] = data[12] = data[13] = data[14] = 0;
+ return R_LoadTexture2D(drawtexturepool, "ditherpattern", 2, 2, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
}
/*
cachepichash[hashkey] = pic;
// load the pic from disk
- pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true);
+ pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
{
// compatibility with older versions
- pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, false, true);
+ pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
// failed to find gfx/whatever.tga or similar, try the wad
if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
{
for (i = 0;i < 128 * 128;i++)
if (pix[i] == 0)
pix[i] = 255;
- pic->tex = R_LoadTexture (drawtexturepool, path, 128, 128, pix, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
}
else
- pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
}
}
if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
pic->tex = draw_generatecrosshair(3);
if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
pic->tex = draw_generatecrosshair(4);
+ if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+ pic->tex = draw_generateditherpattern();
if (pic->tex == NULL)
{
Con_Printf ("Draw_CachePic: failed to load %s\n", path);
pic->height = height;
if (pic->tex)
R_FreeTexture(pic->tex);
- pic->tex = R_LoadTexture (drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0);
+ pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels, TEXTYPE_RGBA, alpha ? TEXF_ALPHA : 0, NULL);
return pic;
}
}
int quadelements[768];
+float textverts[128*4*4];
+float texttexcoords[128*4*4];
void R_DrawQueue(void)
{
int pos, num, chartexnum, overbright, texnum, additive, batch;
- float x, y, w, h, s, t, u, v, cr, cg, cb, ca, *av, *at, *ac;
+ float x, y, w, h, s, t, u, v, *av, *at, c[4];
cachepic_t *pic;
drawqueue_t *dq;
char *str, *currentpic;
}
GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight);
GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
- GL_DepthFunc(GL_LEQUAL);
+ qglDepthFunc(GL_LEQUAL);
R_Mesh_Start();
R_Mesh_Matrix(&r_identitymatrix);
- memset(&m, 0, sizeof(m));
chartexnum = R_GetTexture(char_texture);
- m.tex[0] = chartexnum;
+
+ memset(&m, 0, sizeof(m));
+ m.tex[0] = 0;
R_Mesh_TextureState(&m);
currentpic = "";
m.depthdisable = true;
R_Mesh_MainState(&m);
- cr = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
- cg = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
- cb = (float) ((color >> 8) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
- ca = (float) ( color & 0xFF) * (1.0f / 255.0f);
+ c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
+ c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
+ c[2] = (float) ((color >> 8) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
+ c[3] = (float) ( color & 0xFF) * (1.0f / 255.0f);
x = dq->x;
y = dq->y;
w = dq->scalex;
if (strcmp(str, currentpic))
{
currentpic = str;
- pic = Draw_CachePic(str);
- m.tex[0] = R_GetTexture(pic->tex);
+ if (*str)
+ {
+ pic = Draw_CachePic(str);
+ m.tex[0] = R_GetTexture(pic->tex);
+ }
+ else
+ m.tex[0] = 0;
R_Mesh_TextureState(&m);
}
if (*str)
if (h == 0)
h = pic->height;
}
- varray_color[0] = varray_color[4] = varray_color[ 8] = varray_color[12] = cr;
- varray_color[1] = varray_color[5] = varray_color[ 9] = varray_color[13] = cg;
- varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = cb;
- varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = ca;
- varray_texcoord[0][0] = 0;varray_texcoord[0][1] = 0;
- varray_texcoord[0][2] = 1;varray_texcoord[0][3] = 0;
- varray_texcoord[0][4] = 1;varray_texcoord[0][5] = 1;
- varray_texcoord[0][6] = 0;varray_texcoord[0][7] = 1;
+ GL_Color(c[0], c[1], c[2], c[3]);
+ R_Mesh_GetSpace(4);
+ varray_texcoord[0][ 0] = 0;varray_texcoord[0][ 1] = 0;
+ varray_texcoord[0][ 4] = 1;varray_texcoord[0][ 5] = 0;
+ varray_texcoord[0][ 8] = 1;varray_texcoord[0][ 9] = 1;
+ varray_texcoord[0][12] = 0;varray_texcoord[0][13] = 1;
varray_vertex[ 0] = x ;varray_vertex[ 1] = y ;varray_vertex[ 2] = 10;
varray_vertex[ 4] = x+w;varray_vertex[ 5] = y ;varray_vertex[ 6] = 10;
varray_vertex[ 8] = x+w;varray_vertex[ 9] = y+h;varray_vertex[10] = 10;
R_Mesh_TextureState(&m);
}
batchcount = 0;
- ac = varray_color;
- at = varray_texcoord[0];
- av = varray_vertex;
+ at = texttexcoords;
+ av = textverts;
+ GL_Color(c[0], c[1], c[2], c[3]);
while ((num = *str++) && x < vid.conwidth)
{
if (num != ' ')
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] = ac[4] = ac[ 8] = ac[12] = cr;
- ac[1] = ac[5] = ac[ 9] = ac[13] = cg;
- ac[2] = ac[6] = ac[10] = ac[14] = cb;
- ac[3] = ac[7] = ac[11] = ac[15] = ca;
- 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;
+ at[ 0] = s ;at[ 1] = t ;
+ at[ 4] = s+u;at[ 5] = t ;
+ at[ 8] = s+u;at[ 9] = t+v;
+ at[12] = s ;at[13] = t+v;
av[ 0] = x ;av[ 1] = y ;av[ 2] = 10;
av[ 4] = x+w;av[ 5] = y ;av[ 6] = 10;
av[ 8] = x+w;av[ 9] = y+h;av[10] = 10;
av[12] = x ;av[13] = y+h;av[14] = 10;
- ac += 16;
- at += 8;
+ at += 16;
av += 16;
batchcount++;
if (batchcount >= 128)
{
+ R_Mesh_GetSpace(batchcount * 4);
+ memcpy(varray_vertex, textverts, sizeof(float[16]) * batchcount);
+ memcpy(varray_texcoord[0], texttexcoords, sizeof(float[16]) * batchcount);
R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
batchcount = 0;
- ac = varray_color;
- at = varray_texcoord[0];
- av = varray_vertex;
+ at = texttexcoords;
+ av = textverts;
}
}
x += w;
}
if (batchcount > 0)
+ {
+ R_Mesh_GetSpace(batchcount * 4);
+ memcpy(varray_vertex, textverts, sizeof(float[16]) * batchcount);
+ memcpy(varray_texcoord[0], texttexcoords, sizeof(float[16]) * batchcount);
R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+ }
break;
case DRAWQUEUE_MESH:
mesh = (void *)(dq + 1);
m.tex[0] = R_GetTexture(mesh->texture);
R_Mesh_TextureState(&m);
- R_Mesh_ResizeCheck(mesh->numvertices);
+ GL_UseColorArray();
+ R_Mesh_GetSpace(mesh->numvertices);
memcpy(varray_vertex, mesh->vertices, sizeof(float[4]) * mesh->numvertices);
- memcpy(varray_texcoord[0], mesh->texcoords, sizeof(float[2]) * mesh->numvertices);
+ memcpy(varray_texcoord[0], mesh->texcoords, sizeof(float[4]) * mesh->numvertices);
memcpy(varray_color, mesh->colors, sizeof(float[4]) * mesh->numvertices);
R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->indices);
currentpic = "\0";
}
}
- if (!v_hwgamma.integer)
+ if (!vid_usinghwgamma)
{
- // we use one big triangle for all the screen blends
- varray_texcoord[0][0] = 0;varray_texcoord[0][1] = 0;
- varray_texcoord[0][2] = 0;varray_texcoord[0][3] = 0;
- varray_texcoord[0][4] = 0;varray_texcoord[0][5] = 0;
- varray_vertex[0] = -5000;varray_vertex[1] = -5000;varray_vertex[2] = 10;
- varray_vertex[4] = 10000;varray_vertex[1] = -5000;varray_vertex[2] = 10;
- varray_vertex[8] = -5000;varray_vertex[1] = 10000;varray_vertex[2] = 10;
- // alpha is 1 for all these
- varray_color[3] = varray_color[7] = varray_color[11] = 1;
// all the blends ignore depth
+ memset(&m, 0, sizeof(m));
m.depthdisable = true;
- t = v_contrast.value * (float) (1 << v_overbrightbits.integer);
- if (t >= 1.01f)
+ 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;
+ VectorScale(c, (float) (1 << v_overbrightbits.integer), c);
+ if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
{
m.blendfunc1 = GL_DST_COLOR;
m.blendfunc2 = GL_ONE;
R_Mesh_State(&m);
- while (t >= 1.01f)
+ while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
{
- cr = t - 1.0f;
- if (cr > 1.0f)
- cr = 1.0f;
- varray_color[0] = varray_color[4] = varray_color[ 8] = cr;
- varray_color[1] = varray_color[5] = varray_color[ 9] = cr;
- varray_color[2] = varray_color[6] = varray_color[10] = cr;
+ GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
+ R_Mesh_GetSpace(3);
+ varray_texcoord[0][0] = 0;varray_texcoord[0][1] = 0;
+ varray_texcoord[0][4] = 0;varray_texcoord[0][5] = 0;
+ varray_texcoord[0][8] = 0;varray_texcoord[0][9] = 0;
+ varray_vertex[0] = -5000;varray_vertex[1] = -5000;varray_vertex[2] = 10;
+ varray_vertex[4] = 10000;varray_vertex[5] = -5000;varray_vertex[6] = 10;
+ varray_vertex[8] = -5000;varray_vertex[9] = 10000;varray_vertex[10] = 10;
R_Mesh_Draw(3, 1, polygonelements);
- t *= 0.5;
+ VectorScale(c, 0.5, c);
}
}
- else if (t <= 0.99f)
+ if (v_color_enable.integer)
{
- m.blendfunc1 = GL_ZERO;
- m.blendfunc2 = GL_SRC_COLOR;
- R_Mesh_State(&m);
- varray_color[0] = varray_color[4] = varray_color[ 8] = varray_color[12] = t;
- varray_color[1] = varray_color[5] = varray_color[ 9] = varray_color[13] = t;
- varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = t;
- R_Mesh_Draw(3, 1, polygonelements);
+ c[0] = v_color_black_r.value;
+ c[1] = v_color_black_g.value;
+ c[2] = v_color_black_b.value;
}
- if (v_brightness.value >= 0.01f)
+ else
+ c[0] = c[1] = c[2] = v_brightness.value;
+ if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
{
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ONE;
R_Mesh_State(&m);
- varray_color[0] = varray_color[4] = varray_color[ 8] = varray_color[12] = v_brightness.value;
- varray_color[1] = varray_color[5] = varray_color[ 9] = varray_color[13] = v_brightness.value;
- varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = v_brightness.value;
+ GL_Color(c[0], c[1], c[2], 1);
+ R_Mesh_GetSpace(3);
+ varray_texcoord[0][0] = 0;varray_texcoord[0][1] = 0;
+ varray_texcoord[0][4] = 0;varray_texcoord[0][5] = 0;
+ varray_texcoord[0][8] = 0;varray_texcoord[0][9] = 0;
+ varray_vertex[0] = -5000;varray_vertex[1] = -5000;varray_vertex[2] = 10;
+ varray_vertex[4] = 10000;varray_vertex[5] = -5000;varray_vertex[6] = 10;
+ varray_vertex[8] = -5000;varray_vertex[9] = 10000;varray_vertex[10] = 10;
R_Mesh_Draw(3, 1, polygonelements);
}
}
projects / xonotic / darkplaces.git / blobdiff