*/
#include "quakedef.h"
+#include "image.h"
+#include "wad.h"
+
+#include "cl_video.h"
-cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
static rtexture_t *char_texture;
//=============================================================================
/* Support Routines */
+#define FONT_FILESIZE 13468
#define MAX_CACHED_PICS 256
#define CACHEPICHASHSIZE 256
static cachepic_t *cachepichash[CACHEPICHASHSIZE];
static rtexturepool_t *drawtexturepool;
+static qbyte concharimage[FONT_FILESIZE] =
+{
+#include "lhfont.h"
+};
+
+extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
+
+static rtexture_t *draw_generateconchars(void)
+{
+ int i;
+ qbyte buffer[65536][4], *data = NULL;
+ double random;
+
+ fs_filesize = FONT_FILESIZE;
+ data = LoadTGA (concharimage, 256, 256);
+ fs_filesize = -1;
+// Gold numbers
+ for (i = 0;i < 8192;i++)
+ {
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 83 + (qbyte)(random * 64);
+ buffer[i][1] = 71 + (qbyte)(random * 32);
+ buffer[i][2] = 23 + (qbyte)(random * 16);
+ buffer[i][3] = data[i*4+0];
+ }
+// White chars
+ for (i = 8192;i < 32768;i++)
+ {
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 95 + (qbyte)(random * 64);
+ buffer[i][1] = 95 + (qbyte)(random * 64);
+ buffer[i][2] = 95 + (qbyte)(random * 64);
+ buffer[i][3] = data[i*4+0];
+ }
+// Gold numbers
+ for (i = 32768;i < 40960;i++)
+ {
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 83 + (qbyte)(random * 64);
+ buffer[i][1] = 71 + (qbyte)(random * 32);
+ buffer[i][2] = 23 + (qbyte)(random * 16);
+ buffer[i][3] = data[i*4+0];
+ }
+// Red chars
+ for (i = 40960;i < 65536;i++)
+ {
+ random = lhrandom (0.0,1.0);
+ buffer[i][0] = 96 + (qbyte)(random * 64);
+ buffer[i][1] = 43 + (qbyte)(random * 32);
+ buffer[i][2] = 27 + (qbyte)(random * 32);
+ buffer[i][3] = data[i*4+0];
+ }
+
+#if 0
+ Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
+
+ Mem_Free(data);
+ return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
static qbyte pointerimage[256] =
{
"333333332......."
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
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
{
".......44......."
".......44......."
"................"
+ "................"
".......77......."
".......77......."
"................"
- "................"
,
"................"
"................"
"........7......."
"........7......."
"........7......."
- "................"
+ "........7......."
"................"
,
"................"
"................"
"................"
"................"
+ ,
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ ".......55......."
+ ".......55......."
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
};
static rtexture_t *draw_generatecrosshair(int num)
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)
+{
+#if 1
+ int x, y;
+ qbyte data[8*8*4];
+ for (y = 0;y < 8;y++)
+ {
+ for (x = 0;x < 8;x++)
+ {
+ data[(y*8+x)*4+0] = data[(y*8+x)*4+1] = data[(y*8+x)*4+2] = ((x^y) & 4) ? 255 : 0;
+ data[(y*8+x)*4+3] = 255;
+ }
+ }
+ return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
+#else
+ 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);
+#endif
}
/*
================
*/
// FIXME: move this to client somehow
-cachepic_t *Draw_CachePic (char *path)
+cachepic_t *Draw_CachePic (const char *path, qboolean persistent)
{
int i, crc, hashkey;
cachepic_t *pic;
qpic_t *p;
+ int flags;
+
+ if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+
+ {
+ clvideo_t *video;
+
+ video = CL_GetVideo(path);
+ if( video )
+ return &video->cpif;
+ }
crc = CRC_Block(path, strlen(path));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
return pic;
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
- strcpy (pic->name, path);
+ strlcpy (pic->name, path, sizeof(pic->name));
// link into list
pic->chain = cachepichash[hashkey];
cachepichash[hashkey] = pic;
+ flags = TEXF_ALPHA;
+ if (persistent)
+ flags |= TEXF_PRECACHE;
+ if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+ flags |= TEXF_CLAMP;
+
// load the pic from disk
- pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, false, true);
- if (pic->tex == NULL && (p = W_GetLumpName (path)))
+ pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
+ 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, flags);
+ // 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_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
+ }
+ else
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
}
- 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, "gfx/conchars"))
+ pic->tex = draw_generateconchars();
if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
pic->tex = draw_generatemousepointer();
+ if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga"))
+ pic->tex = draw_generatemousepointer();
if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
pic->tex = draw_generatecrosshair(0);
if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.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/crosshair6.tga"))
+ pic->tex = draw_generatecrosshair(5);
+ if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+ pic->tex = draw_generateditherpattern();
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_texture_notexture;
+ }
pic->width = R_TextureWidth(pic->tex);
pic->height = R_TextureHeight(pic->tex);
return pic;
}
-cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, qbyte *pixels)
{
int crc, hashkey;
cachepic_t *pic;
if (pic)
{
- if (pic->tex && R_TextureWidth(pic->tex) == width && R_TextureHeight(pic->tex) == height && (R_TextureHasAlpha(pic->tex) != 0) == (alpha != 0))
+ if (pic->tex && pic->width == width && pic->height == height)
{
R_UpdateTexture(pic->tex, pixels);
return pic;
if (pic == NULL)
{
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
strcpy (pic->name, picname);
// link into list
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;
}
-void Draw_FreePic(char *picname)
+void Draw_FreePic(const char *picname)
{
int crc;
int hashkey;
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
{
- if (!strcmp (picname, pic->name))
+ if (!strcmp (picname, pic->name) && pic->tex)
{
R_FreeTexture(pic->tex);
pic->width = 0;
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
- char_texture = Draw_CachePic("conchars")->tex;
+ char_texture = Draw_CachePic("gfx/conchars", true)->tex;
}
static void gl_draw_shutdown(void)
void GL_Draw_Init (void)
{
- Cvar_RegisterVariable (&scr_conalpha);
-
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
}
-extern cvar_t gl_mesh_drawmode;
-extern int gl_maxdrawrangeelementsvertices;
-extern int gl_maxdrawrangeelementsindices;
+float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
+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, texnum, batch;
+ float x, y, w, h, s, t, u, v, *av, *at, c[4];
cachepic_t *pic;
drawqueue_t *dq;
- char *str, *currentpic;
- int batch, batchcount, additive;
+ char *str;
+ int batchcount;
unsigned int color;
drawqueuemesh_t *mesh;
+ 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();
+ 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;
+ }
+ }
- 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);
+ r_view_width = bound(0, r_refdef.width, vid.width);
+ r_view_height = bound(0, r_refdef.height, vid.height);
+ r_view_depth = 1;
+ r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
+ r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
+ r_view_z = 0;
+ r_view_fov_x = bound(0.1, r_refdef.fov_x, 170);
+ r_view_fov_y = bound(0.1, r_refdef.fov_y, 170);
+ r_view_matrix = r_refdef.viewentitymatrix;
+ GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
+
+ qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
+ GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
+ qglDepthFunc(GL_LEQUAL);
+ R_Mesh_Matrix(&r_identitymatrix);
chartexnum = R_GetTexture(char_texture);
- additive = false;
- qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- currentpic = "";
+ memset(&m, 0, sizeof(m));
+
pic = NULL;
- qglBindTexture(GL_TEXTURE_2D, 0);
+ texnum = 0;
color = 0;
- qglColor4ub(0,0,0,0);
+ GL_Color(1,1,1,1);
- overbright = v_overbrightbits.integer;
batch = false;
batchcount = 0;
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);
- }
- }
+ color = dq->color;
+
+ if(dq->flags == DRAWFLAG_ADDITIVE)
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+ else if(dq->flags == DRAWFLAG_MODULATE)
+ GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+ else if(dq->flags == DRAWFLAG_2XMODULATE)
+ GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
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();
- }
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ GL_DepthMask(true);
+ GL_DepthTest(false);
+
+ c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f);
+ c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f);
+ c[2] = (float) ((color >> 8) & 0xFF) * (1.0f / 255.0f);
+ c[3] = (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 (batch)
- {
- batch = false;
- qglEnd();
- }
- currentpic = str;
- pic = Draw_CachePic(str);
- qglBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
- }
- 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++;
- }
- break;
case DRAWQUEUE_STRING:
+ GL_Color(c[0], c[1], c[2], c[3]);
str = (char *)(dq + 1);
- if (strcmp("conchars", currentpic))
- {
- if (batch)
- {
- batch = false;
- qglEnd();
- }
- currentpic = "conchars";
- qglBindTexture(GL_TEXTURE_2D, chartexnum);
- }
- if (!batch)
- {
- batch = true;
- qglBegin(GL_TRIANGLES);
- batchcount = 0;
- }
- while ((num = *str++) && x < vid.conwidth)
+ batchcount = 0;
+ m.pointer_vertex = varray_vertex3f;
+ m.pointer_color = NULL;
+ m.pointer_texcoord[0] = varray_texcoord2f[0];
+ m.tex[0] = chartexnum;
+ R_Mesh_State(&m);
+ at = varray_texcoord2f[0];
+ av = varray_vertex3f;
+ while ((num = *str++) && x < vid_conwidth.integer)
{
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[ 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;
+ at += 8;
+ av += 12;
batchcount++;
+ if (batchcount >= 128)
+ {
+ GL_LockArrays(0, batchcount * 4);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+ GL_LockArrays(0, 0);
+ batchcount = 0;
+ at = varray_texcoord2f[0];
+ av = varray_vertex3f;
+ }
}
x += w;
}
- break;
- case DRAWQUEUE_MESH:
- if (batch)
+ if (batchcount > 0)
{
- batch = false;
- qglEnd();
+ GL_LockArrays(0, batchcount * 4);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+ GL_LockArrays(0, 0);
}
+ break;
+ case DRAWQUEUE_MESH:
mesh = (void *)(dq + 1);
- qglBindTexture(GL_TEXTURE_2D, R_GetTexture(mesh->texture));
-
- if (gl_mesh_drawmode.integer < 0)
- Cvar_SetValueQuick(&gl_mesh_drawmode, 0);
- if (gl_mesh_drawmode.integer > 3)
- Cvar_SetValueQuick(&gl_mesh_drawmode, 3);
- if (gl_mesh_drawmode.integer >= 3 && qglDrawRangeElements == NULL)
- Cvar_SetValueQuick(&gl_mesh_drawmode, 2);
-
- if (gl_mesh_drawmode.integer > 0)
+ m.pointer_vertex = mesh->data_vertex3f;
+ m.pointer_color = mesh->data_color4f;
+ m.pointer_texcoord[0] = mesh->data_texcoord2f;
+ m.tex[0] = R_GetTexture(mesh->texture);
+ if (!m.tex[0])
+ m.pointer_texcoord[0] = NULL;
+ R_Mesh_State(&m);
+ GL_LockArrays(0, mesh->num_vertices);
+ R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+ GL_LockArrays(0, 0);
+ break;
+ case DRAWQUEUE_SETCLIP:
{
- 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
- }
+ // We have to convert the con coords into real coords
+ int x , y, width, height;
+ x = dq->x * ((float)vid.width / vid_conwidth.integer);
+ // OGL uses top to bottom
+ y = dq->y * ((float) vid.height / vid_conheight.integer);
+ width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
+ height = dq->scaley * ((float)vid.height / vid_conheight.integer);
- if (gl_mesh_drawmode.integer >= 3/* && (mesh->numvertices) <= gl_maxdrawrangeelementsvertices && (mesh->numindices) <= gl_maxdrawrangeelementsindices*/)
- {
- // GL 1.2 or GL 1.1 with extension
- GL_LockArray(0, mesh->numvertices);
- qglDrawRangeElements(GL_TRIANGLES, 0, mesh->numvertices, mesh->numindices, GL_UNSIGNED_INT, mesh->indices);
- CHECKGLERROR
- GL_UnlockArray();
- }
- else if (gl_mesh_drawmode.integer >= 2)
- {
- // GL 1.1
- GL_LockArray(0, mesh->numvertices);
- qglDrawElements(GL_TRIANGLES, mesh->numindices, GL_UNSIGNED_INT, mesh->indices);
- CHECKGLERROR
- GL_UnlockArray();
- }
- else if (gl_mesh_drawmode.integer >= 1)
- {
- int i;
- // GL 1.1
- // feed it manually using glArrayElement
- GL_LockArray(0, mesh->numvertices);
- qglBegin(GL_TRIANGLES);
- for (i = 0;i < mesh->numindices;i++)
- qglArrayElement(mesh->indices[i]);
- qglEnd();
- CHECKGLERROR
- GL_UnlockArray();
- }
- else
- {
- int i, in;
- // GL 1.1 but not using vertex arrays - 3dfx glquake minigl driver
- // feed it manually
- qglBegin(GL_TRIANGLES);
- for (i = 0;i < mesh->numindices;i++)
- {
- in = mesh->indices[i];
- qglColor4ub(mesh->colors[in * 4], mesh->colors[in * 4 + 1], mesh->colors[in * 4 + 2], mesh->colors[in * 4 + 3]);
- qglTexCoord2f(mesh->texcoords[in * 2], mesh->texcoords[in * 2 + 1]);
- qglVertex3f(mesh->vertices[in * 3], mesh->vertices[in * 3 + 1], mesh->vertices[in * 3 + 2]);
- }
- qglEnd();
- CHECKGLERROR
- }
- if (gl_mesh_drawmode.integer > 0)
- {
- qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
- qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
- qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
+ GL_Scissor(x, y, width, height);
+
+ GL_ScissorTest(true);
}
- // 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
- currentpic = "\0";
+ break;
+ case DRAWQUEUE_RESETCLIP:
+ GL_ScissorTest(false);
break;
}
}
- if (batch)
- qglEnd();
- CHECKGLERROR
- if (!v_hwgamma.integer)
+ if (!vid_usinghwgamma)
{
- qglDisable(GL_TEXTURE_2D);
- CHECKGLERROR
- t = v_contrast.value * (float) (1 << v_overbrightbits.integer);
- if (t >= 1.01f)
+ // all the blends ignore depth
+ memset(&m, 0, sizeof(m));
+ m.pointer_vertex = blendvertex3f;
+ R_Mesh_State(&m);
+ GL_DepthMask(true);
+ GL_DepthTest(false);
+ if (v_color_enable.integer)
{
- qglBlendFunc (GL_DST_COLOR, GL_ONE);
- CHECKGLERROR
- qglBegin (GL_TRIANGLES);
- while (t >= 1.01f)
+ 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;
+ if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
+ {
+ GL_BlendFunc(GL_DST_COLOR, GL_ONE);
+ while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 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);
- t *= 0.5;
+ 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);
+ VectorScale(c, 0.5, c);
}
- qglEnd ();
- CHECKGLERROR
}
- else if (t <= 0.99f)
+ if (v_color_enable.integer)
{
- 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
+ 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)
{
- 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
+ GL_BlendFunc(GL_ONE, GL_ONE);
+ GL_Color(c[0], c[1], c[2], 1);
+ R_Mesh_Draw(0, 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
}
projects / xonotic / darkplaces.git / blobdiff