// load the pic from disk
pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true);
- if (pic->tex == NULL && (p = W_GetLumpName (path)))
+ if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
{
- if (!strcmp(path, "conchars"))
+ // compatibility with older versions
+ pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, false, true);
+ // failed to find gfx/whatever.tga or similar, try the wad
+ if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
{
- qbyte *pix;
- // conchars is a raw image and with the wrong transparent color
- pix = (qbyte *)p;
- 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);
+ if (!strcmp(path, "gfx/conchars"))
+ {
+ qbyte *pix;
+ // conchars is a raw image and with the wrong transparent color
+ pix = (qbyte *)p;
+ 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);
+ }
+ else
+ pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
}
- else
- pic->tex = R_LoadTexture (drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_QPALETTE, TEXF_ALPHA | TEXF_PRECACHE);
}
if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
pic->tex = draw_generatemousepointer();
if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
pic->tex = draw_generatecrosshair(4);
if (pic->tex == NULL)
- Sys_Error ("Draw_CachePic: failed to load %s", path);
+ {
+ Con_Printf ("Draw_CachePic: failed to load %s\n", path);
+ pic->tex = r_notexture;
+ }
pic->width = R_TextureWidth(pic->tex);
pic->height = R_TextureHeight(pic->tex);
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
- char_texture = Draw_CachePic("conchars")->tex;
+ char_texture = Draw_CachePic("gfx/conchars")->tex;
}
static void gl_draw_shutdown(void)
R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
}
-extern cvar_t gl_mesh_drawrangeelements;
-extern int gl_maxdrawrangeelementsvertices;
-extern int gl_maxdrawrangeelementsindices;
-
+int quadelements[768];
void R_DrawQueue(void)
{
- int pos, num, chartexnum, overbright;
- float x, y, w, h, s, t, u, v;
+ int pos, num, chartexnum, overbright, texnum, additive, batch;
+ float x, y, w, h, s, t, u, v, cr, cg, cb, ca, *av, *at, *ac;
cachepic_t *pic;
drawqueue_t *dq;
char *str, *currentpic;
- int batch, batchcount, additive;
+ int batchcount;
unsigned int color;
drawqueuemesh_t *mesh;
- int arraylocked = false;
+ rmeshstate_t m;
if (!r_render.integer)
return;
- qglViewport(vid.realx, vid.realy, vid.realwidth, vid.realheight);
-
- qglMatrixMode(GL_PROJECTION);
- qglLoadIdentity();
- qglOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999);
-
- qglMatrixMode(GL_MODELVIEW);
- qglLoadIdentity();
-
- qglDisable(GL_DEPTH_TEST);
- qglDisable(GL_CULL_FACE);
- qglEnable(GL_BLEND);
- qglEnable(GL_TEXTURE_2D);
- qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ if (!quadelements[1])
+ {
+ // elements for rendering a series of quads as triangles
+ for (batch = 0, pos = 0, num = 0;batch < 128;batch++, num += 4)
+ {
+ quadelements[pos++] = num;
+ quadelements[pos++] = num + 1;
+ quadelements[pos++] = num + 2;
+ quadelements[pos++] = num;
+ quadelements[pos++] = num + 2;
+ quadelements[pos++] = num + 3;
+ }
+ }
+ GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight);
+ GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
+ 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;
+ R_Mesh_TextureState(&m);
- additive = false;
- qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
currentpic = "";
pic = NULL;
- qglBindTexture(GL_TEXTURE_2D, 0);
+ texnum = 0;
color = 0;
- qglColor4ub(0,0,0,0);
overbright = v_overbrightbits.integer;
batch = false;
for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
{
dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
- if (dq->flags & DRAWFLAG_ADDITIVE)
- {
- if (!additive)
- {
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- additive = true;
- qglBlendFunc(GL_SRC_ALPHA, GL_ONE);
- }
- }
+ additive = (dq->flags & DRAWFLAG_ADDITIVE) != 0;
+ color = dq->color;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ if (additive)
+ m.blendfunc2 = GL_ONE;
else
- {
- if (additive)
- {
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- additive = false;
- qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- }
- }
- if (color != dq->color)
- {
- color = dq->color;
- qglColor4ub((qbyte)(((color >> 24) & 0xFF) >> overbright), (qbyte)(((color >> 16) & 0xFF) >> overbright), (qbyte)(((color >> 8) & 0xFF) >> overbright), (qbyte)(color & 0xFF));
- }
- if (batch && batchcount > 128)
- {
- batch = false;
- qglEnd();
- }
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ 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);
x = dq->x;
y = dq->y;
w = dq->scalex;
h = dq->scaley;
+
switch(dq->command)
{
case DRAWQUEUE_PIC:
str = (char *)(dq + 1);
- if (*str)
+ if (strcmp(str, currentpic))
{
- if (strcmp(str, currentpic))
+ currentpic = str;
+ if (*str)
{
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- currentpic = str;
pic = Draw_CachePic(str);
- qglBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
+ m.tex[0] = R_GetTexture(pic->tex);
}
+ else
+ m.tex[0] = 0;
+ R_Mesh_TextureState(&m);
+ }
+ if (*str)
+ {
if (w == 0)
w = pic->width;
if (h == 0)
h = pic->height;
- if (!batch)
- {
- batch = true;
- qglBegin(GL_TRIANGLES);
- batchcount = 0;
- }
- qglTexCoord2f (0, 0);qglVertex2f (x , y );
- qglTexCoord2f (1, 0);qglVertex2f (x+w, y );
- qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
- qglTexCoord2f (0, 0);qglVertex2f (x , y );
- qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
- qglTexCoord2f (0, 1);qglVertex2f (x , y+h);
- batchcount++;
- }
- else
- {
- if (currentpic[0])
- {
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- currentpic = "";
- qglBindTexture(GL_TEXTURE_2D, 0);
- }
- if (!batch)
- {
- batch = true;
- qglBegin(GL_TRIANGLES);
- batchcount = 0;
- }
- qglTexCoord2f (0, 0);qglVertex2f (x , y );
- qglTexCoord2f (1, 0);qglVertex2f (x+w, y );
- qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
- qglTexCoord2f (0, 0);qglVertex2f (x , y );
- qglTexCoord2f (1, 1);qglVertex2f (x+w, y+h);
- qglTexCoord2f (0, 1);qglVertex2f (x , y+h);
- batchcount++;
}
+ 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;
+ 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;
+ varray_vertex[12] = x ;varray_vertex[13] = y+h;varray_vertex[14] = 10;
+ GL_Color(cr, cg, cb, ca);
+ R_Mesh_Draw(4, 2, quadelements);
break;
case DRAWQUEUE_STRING:
str = (char *)(dq + 1);
- if (strcmp("conchars", currentpic))
- {
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- currentpic = "conchars";
- qglBindTexture(GL_TEXTURE_2D, chartexnum);
- }
- if (!batch)
+ if (strcmp("gfx/conchars", currentpic))
{
- batch = true;
- qglBegin(GL_TRIANGLES);
- batchcount = 0;
+ currentpic = "gfx/conchars";
+ m.tex[0] = chartexnum;
+ R_Mesh_TextureState(&m);
}
+ batchcount = 0;
+ at = varray_texcoord[0];
+ av = varray_vertex;
+ GL_Color(cr, cg, cb, ca);
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);
- qglTexCoord2f (s , t );qglVertex2f (x , y );
- qglTexCoord2f (s+u, t );qglVertex2f (x+w, y );
- qglTexCoord2f (s+u, t+v);qglVertex2f (x+w, y+h);
- qglTexCoord2f (s , t );qglVertex2f (x , y );
- qglTexCoord2f (s+u, t+v);qglVertex2f (x+w, y+h);
- qglTexCoord2f (s , t+v);qglVertex2f (x , y+h);
+ 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[ 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;
+ av += 16;
batchcount++;
+ if (batchcount >= 128)
+ {
+ R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+ batchcount = 0;
+ at = varray_texcoord[0];
+ av = varray_vertex;
+ }
}
x += w;
}
+ if (batchcount > 0)
+ R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
break;
case DRAWQUEUE_MESH:
- if (batch)
- {
- batch = false;
- qglEnd();
- }
-
mesh = (void *)(dq + 1);
- qglBindTexture(GL_TEXTURE_2D, R_GetTexture(mesh->texture));
- qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), mesh->vertices);CHECKGLERROR
- qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), mesh->texcoords);CHECKGLERROR
- qglColorPointer(4, GL_UNSIGNED_BYTE, sizeof(qbyte[4]), mesh->colors);CHECKGLERROR
- qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
- qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
- qglEnableClientState(GL_COLOR_ARRAY);CHECKGLERROR
- GL_DrawRangeElements(0, mesh->numvertices, mesh->numindices, mesh->indices);
- qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
- qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
- qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
-
- // restore color, since it got trashed by using color array
- qglColor4ub((qbyte)(((color >> 24) & 0xFF) >> overbright), (qbyte)(((color >> 16) & 0xFF) >> overbright), (qbyte)(((color >> 8) & 0xFF) >> overbright), (qbyte)(color & 0xFF));
- CHECKGLERROR
+ m.tex[0] = R_GetTexture(mesh->texture);
+ R_Mesh_TextureState(&m);
+ R_Mesh_ResizeCheck(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_color, mesh->colors, sizeof(float[4]) * mesh->numvertices);
+ GL_UseColorArray();
+ R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->indices);
currentpic = "\0";
break;
}
}
- if (batch)
- qglEnd();
- CHECKGLERROR
if (!v_hwgamma.integer)
{
- qglDisable(GL_TEXTURE_2D);
- CHECKGLERROR
+ // 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[5] = -5000;varray_vertex[6] = 10;
+ varray_vertex[8] = -5000;varray_vertex[9] = 10000;varray_vertex[10] = 10;
+ // 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)
{
- qglBlendFunc (GL_DST_COLOR, GL_ONE);
- CHECKGLERROR
- qglBegin (GL_TRIANGLES);
+ m.blendfunc1 = GL_DST_COLOR;
+ m.blendfunc2 = GL_ONE;
+ R_Mesh_State(&m);
while (t >= 1.01f)
{
- num = (int) ((t - 1.0f) * 255.0f);
- if (num > 255)
- num = 255;
- qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
- qglVertex2f (-5000, -5000);
- qglVertex2f (10000, -5000);
- qglVertex2f (-5000, 10000);
+ cr = t - 1.0f;
+ if (cr > 1.0f)
+ cr = 1.0f;
+ GL_Color(cr, cr, cr, 1);
+ R_Mesh_Draw(3, 1, polygonelements);
t *= 0.5;
}
- qglEnd ();
- CHECKGLERROR
}
else if (t <= 0.99f)
{
- qglBlendFunc(GL_ZERO, GL_SRC_COLOR);
- CHECKGLERROR
- qglBegin(GL_TRIANGLES);
- num = (int) (t * 255.0f);
- qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
- qglVertex2f (-5000, -5000);
- qglVertex2f (10000, -5000);
- qglVertex2f (-5000, 10000);
- qglEnd();
- CHECKGLERROR
+ m.blendfunc1 = GL_ZERO;
+ m.blendfunc2 = GL_SRC_COLOR;
+ R_Mesh_State(&m);
+ GL_Color(t, t, t, 1);
+ R_Mesh_Draw(3, 1, polygonelements);
}
if (v_brightness.value >= 0.01f)
{
- qglBlendFunc (GL_ONE, GL_ONE);
- CHECKGLERROR
- num = (int) (v_brightness.value * 255.0f);
- qglColor4ub ((qbyte) num, (qbyte) num, (qbyte) num, 255);
- CHECKGLERROR
- qglBegin (GL_TRIANGLES);
- qglVertex2f (-5000, -5000);
- qglVertex2f (10000, -5000);
- qglVertex2f (-5000, 10000);
- qglEnd ();
- CHECKGLERROR
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ONE;
+ R_Mesh_State(&m);
+ GL_Color(v_brightness.value, v_brightness.value, v_brightness.value, 1);
+ R_Mesh_Draw(3, 1, polygonelements);
}
- qglEnable(GL_TEXTURE_2D);
- CHECKGLERROR
}
-
- qglBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- CHECKGLERROR
- qglEnable (GL_CULL_FACE);
- CHECKGLERROR
- qglEnable (GL_DEPTH_TEST);
- CHECKGLERROR
- qglDisable (GL_BLEND);
- CHECKGLERROR
- qglColor4ub (255, 255, 255, 255);
- CHECKGLERROR
+ R_Mesh_Finish();
}
projects / xonotic / darkplaces.git / blobdiff