X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=40146424c1f108b4f39179df95ffd156ab09e3cd;hb=863110d59f30b08b53d29a48aedaf22546f17ad2;hp=e63b7d4ba9f287efbe6d15f799598d93b3397f3b;hpb=71c88e4a876a4cfcccf312e3cd4ddbb1ced6d11f;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index e63b7d4b..40146424 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -22,13 +22,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "image.h" #include "wad.h" +#include "cl_video.h" + static rtexture_t *char_texture; //============================================================================= /* Support Routines */ -#define MAX_CACHED_PICS 256 +#define FONT_FILESIZE 13468 +#define MAX_CACHED_PICS 1024 #define CACHEPICHASHSIZE 256 static cachepic_t *cachepichash[CACHEPICHASHSIZE]; static cachepic_t cachepics[MAX_CACHED_PICS]; @@ -36,43 +39,64 @@ static int numcachepics; static rtexturepool_t *drawtexturepool; -static qbyte concharimage[11356] = +static unsigned char 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; + unsigned char buffer[65536][4], *data = NULL; + double random; - fs_filesize = 11356; - data = LoadTGA (concharimage, 256, 256); - fs_filesize = -1; - - for (i = 0;i < 32768;i++) + data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256); +// 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 + (unsigned char)(random * 64); + buffer[i][1] = 71 + (unsigned char)(random * 32); + buffer[i][2] = 23 + (unsigned char)(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 + (unsigned char)(random * 64); + buffer[i][1] = 95 + (unsigned char)(random * 64); + buffer[i][2] = 95 + (unsigned char)(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 + (unsigned char)(random * 64); + buffer[i][1] = 71 + (unsigned char)(random * 32); + buffer[i][2] = 23 + (unsigned char)(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 + (unsigned char)(random * 64); + buffer[i][1] = 43 + (unsigned char)(random * 32); + buffer[i][2] = 27 + (unsigned char)(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] = -{ +static char *pointerimage = "333333332......." "26777761........" "2655541........." @@ -89,12 +113,12 @@ static qbyte pointerimage[256] = "................" "................" "................" -}; +; static rtexture_t *draw_generatemousepointer(void) { int i; - qbyte buffer[256][4]; + unsigned char buffer[256][4]; for (i = 0;i < 256;i++) { if (pointerimage[i] == '.') @@ -116,9 +140,9 @@ static rtexture_t *draw_generatemousepointer(void) } // must match NUMCROSSHAIRS in r_crosshairs.c -#define NUMCROSSHAIRS 5 +#define NUMCROSSHAIRS 6 -static qbyte *crosshairtexdata[NUMCROSSHAIRS] = +static char *crosshairtexdata[NUMCROSSHAIRS] = { "................" "................" @@ -166,10 +190,10 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] = ".......44......." ".......44......." "................" + "................" ".......77......." ".......77......." "................" - "................" , "................" "................" @@ -185,7 +209,7 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] = "........7......." "........7......." "........7......." - "................" + "........7......." "................" , "................" @@ -204,13 +228,30 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] = "................" "................" "................" + , + "................" + "................" + "................" + "................" + "................" + "................" + "................" + ".......55......." + ".......55......." + "................" + "................" + "................" + "................" + "................" + "................" + "................" }; static rtexture_t *draw_generatecrosshair(int num) { int i; char *in; - qbyte data[16*16][4]; + unsigned char data[16*16][4]; in = crosshairtexdata[num]; for (i = 0;i < 16*16;i++) { @@ -226,7 +267,7 @@ static rtexture_t *draw_generatecrosshair(int num) data[i][0] = 255; data[i][1] = 255; data[i][2] = 255; - data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7); + data[i][3] = (unsigned char) ((int) (in[i] - '0') * 255 / 7); } } return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL); @@ -236,7 +277,7 @@ static rtexture_t *draw_generateditherpattern(void) { #if 1 int x, y; - qbyte data[8*8*4]; + unsigned char data[8*8*4]; for (y = 0;y < 8;y++) { for (x = 0;x < 8;x++) @@ -247,7 +288,7 @@ static rtexture_t *draw_generateditherpattern(void) } return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL); #else - qbyte data[16]; + unsigned char 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); @@ -260,72 +301,90 @@ Draw_CachePic ================ */ // 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; + int crc, hashkey; cachepic_t *pic; qpic_t *p; + int flags; + + if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) + + { + clvideo_t *video; - crc = CRC_Block(path, strlen(path)); + video = CL_GetVideo(path); + if( video ) + return &video->cpif; + } + + crc = CRC_Block((unsigned char *)path, strlen(path)); hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE; for (pic = cachepichash[hashkey];pic;pic = pic->chain) if (!strcmp (path, pic->name)) return pic; if (numcachepics == MAX_CACHED_PICS) - Sys_Error ("numcachepics == MAX_CACHED_PICS"); + { + Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n"); + // 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")) + 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))) + if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4))) { 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, TEXF_ALPHA | TEXF_PRECACHE, palette_complete); + // conchars is a raw image and with color 0 as transparent instead of 255 + pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font); } 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_transparent); } } if (pic->tex == NULL && !strcmp(path, "gfx/conchars")) pic->tex = draw_generateconchars(); - if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga")) + if (pic->tex == NULL && !strcmp(path, "ui/mousepointer")) pic->tex = draw_generatemousepointer(); - if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001")) pic->tex = draw_generatemousepointer(); - if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1")) pic->tex = draw_generatecrosshair(0); - if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2")) pic->tex = draw_generatecrosshair(1); - if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3")) pic->tex = draw_generatecrosshair(2); - if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4")) pic->tex = draw_generatecrosshair(3); - if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5")) pic->tex = draw_generatecrosshair(4); - if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga")) + if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6")) + pic->tex = draw_generatecrosshair(5); + if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern")) 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); @@ -333,12 +392,12 @@ cachepic_t *Draw_CachePic (char *path) 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, unsigned char *pixels) { int crc, hashkey; cachepic_t *pic; - crc = CRC_Block(picname, strlen(picname)); + crc = CRC_Block((unsigned char *)picname, strlen(picname)); hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE; for (pic = cachepichash[hashkey];pic;pic = pic->chain) if (!strcmp (picname, pic->name)) @@ -357,7 +416,11 @@ cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte * if (pic == NULL) { if (numcachepics == MAX_CACHED_PICS) - Sys_Error ("numcachepics == MAX_CACHED_PICS"); + { + Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n"); + // FIXME: support NULL in callers? + return cachepics; // return the first one + } pic = cachepics + (numcachepics++); strcpy (pic->name, picname); // link into list @@ -374,13 +437,13 @@ cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte * return pic; } -void Draw_FreePic(char *picname) +void Draw_FreePic(const 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)); + crc = CRC_Block((unsigned char *)picname, strlen(picname)); hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE; for (pic = cachepichash[hashkey];pic;pic = pic->chain) { @@ -406,7 +469,7 @@ static void gl_draw_start(void) 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) @@ -461,19 +524,17 @@ void R_DrawQueue(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_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); @@ -492,7 +553,7 @@ void R_DrawQueue(void) { 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) @@ -527,7 +588,7 @@ void R_DrawQueue(void) 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 != ' ') { @@ -549,7 +610,7 @@ void R_DrawQueue(void) 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]; @@ -561,12 +622,12 @@ void R_DrawQueue(void) 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; case DRAWQUEUE_MESH: - mesh = (void *)(dq + 1); + mesh = (drawqueuemesh_t *)(dq + 1); m.pointer_vertex = mesh->data_vertex3f; m.pointer_color = mesh->data_color4f; m.pointer_texcoord[0] = mesh->data_texcoord2f; @@ -575,18 +636,18 @@ void R_DrawQueue(void) 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); @@ -595,7 +656,18 @@ void R_DrawQueue(void) break; case DRAWQUEUE_RESETCLIP: GL_ScissorTest(false); - break; + break; + case DRAWQUEUE_LINEWIDTH: + qglLineWidth(x); + break; + case DRAWQUEUE_LINES: + mesh = (drawqueuemesh_t *)(dq + 1); + GL_Color(c[0], c[1], c[2], c[3]); + qglBegin(GL_LINE_LOOP); + for (num = 0;num < mesh->num_vertices;num++) + qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]); + qglEnd(); + break; } } @@ -621,7 +693,7 @@ void R_DrawQueue(void) 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); } } @@ -637,7 +709,7 @@ void R_DrawQueue(void) { 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); } } }