#include "quakedef.h"
-//#define GL_COLOR_INDEX8_EXT 0x80E5
-
cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
static rtexture_t *char_texture;
static rtexturepool_t *drawtexturepool;
-static byte pointerimage[256] =
+static qbyte pointerimage[256] =
{
"333333332......."
"26777761........"
static rtexture_t *draw_generatemousepointer(void)
{
int i;
- byte buffer[256][4];
+ qbyte buffer[256][4];
for (i = 0;i < 256;i++)
{
if (pointerimage[i] == '.')
// must match NUMCROSSHAIRS in r_crosshairs.c
#define NUMCROSSHAIRS 5
-static byte *crosshairtexdata[NUMCROSSHAIRS] =
+static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
{
"................"
"................"
{
int i;
char *in;
- byte data[16*16][4];
+ qbyte data[16*16][4];
in = crosshairtexdata[num];
for (i = 0;i < 16*16;i++)
{
data[i][0] = 255;
data[i][1] = 255;
data[i][2] = 255;
- data[i][3] = (byte) ((int) (in[i] - '0') * 255 / 7);
+ 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);
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (path, pic->name))
return pic;
- //for (pic = cachepics, i = 0;i < numcachepics;pic++, i++)
- // if (!strcmp (path, pic->name))
- // return pic;
if (numcachepics == MAX_CACHED_PICS)
Sys_Error ("numcachepics == MAX_CACHED_PICS");
{
if (!strcmp(path, "conchars"))
{
- byte *pix;
+ qbyte *pix;
// conchars is a raw image and with the wrong transparent color
- pix = (byte *)p;
+ pix = (qbyte *)p;
for (i = 0;i < 128 * 128;i++)
if (pix[i] == 0)
pix[i] = 255;
return pic;
}
+cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
+{
+ int crc, hashkey;
+ cachepic_t *pic;
+
+ crc = CRC_Block(picname, strlen(picname));
+ hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+ for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+ if (!strcmp (picname, pic->name))
+ break;
+
+ if (pic)
+ {
+ if (pic->tex && R_TextureWidth(pic->tex) == width && R_TextureHeight(pic->tex) == height && (R_TextureHasAlpha(pic->tex) != 0) == (alpha != 0))
+ {
+ R_UpdateTexture(pic->tex, pixels);
+ return pic;
+ }
+ }
+ else
+ {
+ if (pic == NULL)
+ {
+ if (numcachepics == MAX_CACHED_PICS)
+ Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ pic = cachepics + (numcachepics++);
+ strcpy (pic->name, picname);
+ // link into list
+ pic->chain = cachepichash[hashkey];
+ cachepichash[hashkey] = pic;
+ }
+ }
+
+ pic->width = width;
+ 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);
+ return pic;
+}
+
+void Draw_FreePic(char *picname)
+{
+ int crc;
+ int hashkey;
+ cachepic_t *pic;
+ // this doesn't really free the pic, but does free it's texture
+ crc = CRC_Block(picname, strlen(picname));
+ hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
+ for (pic = cachepichash[hashkey];pic;pic = pic->chain)
+ {
+ if (!strcmp (picname, pic->name))
+ {
+ R_FreeTexture(pic->tex);
+ pic->width = 0;
+ pic->height = 0;
+ return;
+ }
+ }
+}
+
/*
===============
Draw_Init
R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap);
}
-void GL_BrightenScreen(void)
-{
- float f;
-
- if (r_brightness.value < 0.1f)
- Cvar_SetValue("r_brightness", 0.1f);
- if (r_brightness.value > 5.0f)
- Cvar_SetValue("r_brightness", 5.0f);
-
- if (r_contrast.value < 0.2f)
- Cvar_SetValue("r_contrast", 0.2f);
- if (r_contrast.value > 1.0f)
- Cvar_SetValue("r_contrast", 1.0f);
-
- if (!(lighthalf && !hardwaregammasupported) && r_brightness.value < 1.01f && r_contrast.value > 0.99f)
- return;
-
- if (!r_render.integer)
- return;
-
- glDisable(GL_TEXTURE_2D);
- CHECKGLERROR
- glEnable(GL_BLEND);
- CHECKGLERROR
- f = r_brightness.value;
- // only apply lighthalf using software color correction if hardware is not available (speed reasons)
- if (lighthalf && !hardwaregammasupported)
- f *= 2;
- if (f >= 1.01f)
- {
- glBlendFunc (GL_DST_COLOR, GL_ONE);
- CHECKGLERROR
- glBegin (GL_TRIANGLES);
- while (f >= 1.01f)
- {
- if (f >= 2)
- glColor3f (1, 1, 1);
- else
- glColor3f (f-1, f-1, f-1);
- glVertex2f (-5000, -5000);
- glVertex2f (10000, -5000);
- glVertex2f (-5000, 10000);
- f *= 0.5;
- }
- glEnd ();
- CHECKGLERROR
- }
- if (r_contrast.value <= 0.99f)
- {
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- CHECKGLERROR
- if (lighthalf && hardwaregammasupported)
- glColor4f (0.5, 0.5, 0.5, 1 - r_contrast.value);
- else
- glColor4f (1, 1, 1, 1 - r_contrast.value);
- CHECKGLERROR
- glBegin (GL_TRIANGLES);
- glVertex2f (-5000, -5000);
- glVertex2f (10000, -5000);
- glVertex2f (-5000, 10000);
- glEnd ();
- CHECKGLERROR
- }
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- CHECKGLERROR
-
- glEnable (GL_CULL_FACE);
- CHECKGLERROR
- glEnable (GL_DEPTH_TEST);
- CHECKGLERROR
- glDisable(GL_BLEND);
- CHECKGLERROR
- glEnable(GL_TEXTURE_2D);
- CHECKGLERROR
-}
+extern cvar_t gl_mesh_drawmode;
+extern int gl_maxdrawrangeelementsvertices;
+extern int gl_maxdrawrangeelementsindices;
void R_DrawQueue(void)
{
- int pos, num, chartexnum;
+ int pos, num, chartexnum, overbright;
float x, y, w, h, s, t, u, v;
cachepic_t *pic;
drawqueue_t *dq;
char *str, *currentpic;
- int batch, additive;
+ int batch, batchcount, additive;
unsigned int color;
+ drawqueuemesh_t *mesh;
if (!r_render.integer)
return;
- glViewport(vid.realx, vid.realy, vid.realwidth, vid.realheight);
+ qglViewport(vid.realx, vid.realy, vid.realwidth, vid.realheight);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999);
+ qglMatrixMode(GL_PROJECTION);
+ qglLoadIdentity();
+ qglOrtho(0, vid.conwidth, vid.conheight, 0, -99999, 99999);
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
+ qglMatrixMode(GL_MODELVIEW);
+ qglLoadIdentity();
- glDisable(GL_DEPTH_TEST);
- glDisable(GL_CULL_FACE);
- glDisable(GL_ALPHA_TEST);
- glEnable(GL_BLEND);
- glEnable(GL_TEXTURE_2D);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ 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);
chartexnum = R_GetTexture(char_texture);
additive = false;
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
currentpic = "";
pic = NULL;
- glBindTexture(GL_TEXTURE_2D, 0);
+ qglBindTexture(GL_TEXTURE_2D, 0);
color = 0;
- glColor4ub(0,0,0,0);
-
- // LordHavoc: NEAREST mode on text if not scaling up
- /*
- if (vid.realwidth <= (int) vid.conwidth)
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- CHECKGLERROR
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- CHECKGLERROR
- }
- else
- {
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- CHECKGLERROR
- glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- CHECKGLERROR
- }
- */
+ qglColor4ub(0,0,0,0);
+ 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 (batch)
{
batch = false;
- glEnd();
+ qglEnd();
}
additive = true;
- glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+ qglBlendFunc(GL_SRC_ALPHA, GL_ONE);
}
}
else
if (batch)
{
batch = false;
- glEnd();
+ qglEnd();
}
additive = false;
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}
}
if (color != dq->color)
{
color = dq->color;
- if (lighthalf)
- glColor4ub((byte)((color >> 25) & 0x7F), (byte)((color >> 17) & 0x7F), (byte)((color >> 9) & 0x7F), (byte)(color & 0xFF));
- else
- glColor4ub((byte)((color >> 24) & 0xFF), (byte)((color >> 16) & 0xFF), (byte)((color >> 8) & 0xFF), (byte)(color & 0xFF));
+ 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();
}
x = dq->x;
y = dq->y;
if (batch)
{
batch = false;
- glEnd();
+ qglEnd();
}
currentpic = str;
pic = Draw_CachePic(str);
- glBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
+ qglBindTexture(GL_TEXTURE_2D, R_GetTexture(pic->tex));
}
if (w == 0)
w = pic->width;
if (!batch)
{
batch = true;
- glBegin(GL_QUADS);
+ qglBegin(GL_TRIANGLES);
+ batchcount = 0;
}
- //DrawQuad(dq->x, dq->y, w, h, 0, 0, 1, 1);
- glTexCoord2f (0, 0);glVertex2f (x , y );
- glTexCoord2f (1, 0);glVertex2f (x+w, y );
- glTexCoord2f (1, 1);glVertex2f (x+w, y+h);
- glTexCoord2f (0, 1);glVertex2f (x , y+h);
+ 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 (batch)
{
batch = false;
- glEnd();
+ qglEnd();
}
currentpic = "";
- glBindTexture(GL_TEXTURE_2D, 0);
+ qglBindTexture(GL_TEXTURE_2D, 0);
}
if (!batch)
{
batch = true;
- glBegin(GL_QUADS);
+ qglBegin(GL_TRIANGLES);
+ batchcount = 0;
}
- //DrawQuad(dq->x, dq->y, dq->scalex, dq->scaley, 0, 0, 1, 1);
- glTexCoord2f (0, 0);glVertex2f (x , y );
- glTexCoord2f (1, 0);glVertex2f (x+w, y );
- glTexCoord2f (1, 1);glVertex2f (x+w, y+h);
- glTexCoord2f (0, 1);glVertex2f (x , y+h);
+ 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:
if (batch)
{
batch = false;
- glEnd();
+ qglEnd();
}
currentpic = "conchars";
- glBindTexture(GL_TEXTURE_2D, chartexnum);
+ qglBindTexture(GL_TEXTURE_2D, chartexnum);
}
if (!batch)
{
batch = true;
- glBegin(GL_QUADS);
+ qglBegin(GL_TRIANGLES);
+ batchcount = 0;
}
while ((num = *str++) && x < vid.conwidth)
{
t = (num >> 4)*0.0625f + (0.5f / 256.0f);
u = 0.0625f - (1.0f / 256.0f);
v = 0.0625f - (1.0f / 256.0f);
- //DrawQuad(x, y, w, h, (num & 15)*0.0625f + (0.5f / 256.0f), (num >> 4)*0.0625f + (0.5f / 256.0f), 0.0625f - (1.0f / 256.0f), 0.0625f - (1.0f / 256.0f));
- glTexCoord2f (s , t );glVertex2f (x , y );
- glTexCoord2f (s+u, t );glVertex2f (x+w, y );
- glTexCoord2f (s+u, t+v);glVertex2f (x+w, y+h);
- glTexCoord2f (s , t+v);glVertex2f (x , y+h);
+ 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);
+ batchcount++;
}
x += w;
}
break;
+ case DRAWQUEUE_MESH:
+ if (batch)
+ {
+ batch = false;
+ qglEnd();
+ }
+ 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)
+ {
+ 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
+ }
+
+ 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
+ }
+ // 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;
}
}
if (batch)
- glEnd();
- CHECKGLERROR
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ qglEnd();
CHECKGLERROR
- GL_BrightenScreen();
+ if (!v_hwgamma.integer)
+ {
+ qglDisable(GL_TEXTURE_2D);
+ CHECKGLERROR
+ t = v_contrast.value * (float) (1 << v_overbrightbits.integer);
+ if (t >= 1.01f)
+ {
+ qglBlendFunc (GL_DST_COLOR, GL_ONE);
+ CHECKGLERROR
+ qglBegin (GL_TRIANGLES);
+ 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);
+ 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
+ }
+ 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
+ }
+ qglEnable(GL_TEXTURE_2D);
+ CHECKGLERROR
+ }
- glColor3f(1,1,1);
+ 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