//=============================================================================
/* 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[11356] =
+static qbyte concharimage[FONT_FILESIZE] =
{
#include "lhfont.h"
};
{
int i;
qbyte buffer[65536][4], *data = NULL;
+ double random;
- fs_filesize = 11356;
+ fs_filesize = FONT_FILESIZE;
data = LoadTGA (concharimage, 256, 256);
fs_filesize = -1;
-
- for (i = 0;i < 32768;i++)
+// Gold numbers
+ for (i = 0;i < 8192;i++)
{
- buffer[i][0] = 255;
- buffer[i][1] = 255;
- buffer[i][2] = 255;
+ 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];
}
-
- for (i = 32768;i < 65536;i++)
+// 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++)
{
- buffer[i][0] = 255;
- buffer[i][1] = 0;
- buffer[i][2] = 0;
+ 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);
}
}
// 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)
================
*/
// 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)) {
+ if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+
+ {
clvideo_t *video;
video = CL_GetVideo(path);
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, TEXF_ALPHA | TEXF_PRECACHE);
+ pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
{
// compatibility with older versions
- pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+ 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)))
{
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, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
+ 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, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
+ pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
}
}
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)
{
Con_Printf("Draw_CachePic: failed to load %s\n", path);
- pic->tex = r_notexture;
+ pic->tex = r_texture_notexture;
}
pic->width = R_TextureWidth(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 == 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
return pic;
}
-void Draw_FreePic(char *picname)
+void Draw_FreePic(const char *picname)
{
int crc;
int hashkey;
numcachepics = 0;
memset(cachepichash, 0, sizeof(cachepichash));
- char_texture = Draw_CachePic("gfx/conchars")->tex;
+ char_texture = Draw_CachePic("gfx/conchars", true)->tex;
}
static void gl_draw_shutdown(void)
}
}
- r_view_width = bound(0, r_refdef.width, vid.realwidth);
- r_view_height = bound(0, r_refdef.height, vid.realheight);
+ 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.realwidth - r_refdef.width);
- r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height);
+ 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(1, r_refdef.fov_x, 170);
- r_view_fov_y = bound(1, r_refdef.fov_y, 170);
+ 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.realheight - (r_view_y + r_view_height), r_view_width, r_view_height);
- GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
+ 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);
{
dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
color = dq->color;
-
+
if(dq->flags == DRAWFLAG_ADDITIVE)
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
else if(dq->flags == DRAWFLAG_MODULATE)
R_Mesh_State(&m);
at = varray_texcoord2f[0];
av = varray_vertex3f;
- while ((num = *str++) && x < vid.conwidth)
+ while ((num = *str++) && x < vid_conwidth.integer)
{
if (num != ' ')
{
if (batchcount >= 128)
{
GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
GL_LockArrays(0, 0);
batchcount = 0;
at = varray_texcoord2f[0];
if (batchcount > 0)
{
GL_LockArrays(0, batchcount * 4);
- R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+ R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
GL_LockArrays(0, 0);
}
break;
m.pointer_texcoord[0] = NULL;
R_Mesh_State(&m);
GL_LockArrays(0, mesh->num_vertices);
- R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+ R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
GL_LockArrays(0, 0);
break;
case DRAWQUEUE_SETCLIP:
{
// We have to convert the con coords into real coords
int x , y, width, height;
- x = dq->x * ((float)vid.realwidth / vid.conwidth);
- // OGL uses top to bottom
- y = dq->y * ((float) vid.realheight / vid.conheight);
- width = dq->scalex * ((float)vid.realwidth / vid.conwidth);
- height = dq->scaley * ((float)vid.realheight / vid.conheight);
+ 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);
GL_Scissor(x, y, width, height);
break;
case DRAWQUEUE_RESETCLIP:
GL_ScissorTest(false);
- break;
+ break;
}
}
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(3, 1, polygonelements);
+ R_Mesh_Draw(0, 3, 1, polygonelements);
VectorScale(c, 0.5, c);
}
}
{
GL_BlendFunc(GL_ONE, GL_ONE);
GL_Color(c[0], c[1], c[2], 1);
- R_Mesh_Draw(3, 1, polygonelements);
+ R_Mesh_Draw(0, 3, 1, polygonelements);
}
}
}
projects / xonotic / darkplaces.git / blobdiff