X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=e63b7d4ba9f287efbe6d15f799598d93b3397f3b;hb=64fc4c197c0dba80bef067fd75d369aa727d5123;hp=6304fb8e63dd0fd43a00c36ecc3cf94e979026ba;hpb=cd21cb3be9de4da3b2c1d2cb029352947b48166c;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 6304fb8e..e63b7d4b 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "image.h" +#include "wad.h" + static rtexture_t *char_texture; @@ -34,6 +36,41 @@ static int numcachepics; static rtexturepool_t *drawtexturepool; +static qbyte concharimage[11356] = +{ +#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; + + fs_filesize = 11356; + data = LoadTGA (concharimage, 256, 256); + fs_filesize = -1; + + for (i = 0;i < 32768;i++) + { + buffer[i][0] = 255; + buffer[i][1] = 255; + buffer[i][2] = 255; + buffer[i][3] = data[i*4+0]; + } + + for (i = 32768;i < 65536;i++) + { + buffer[i][0] = 255; + buffer[i][1] = 0; + buffer[i][2] = 0; + buffer[i][3] = data[i*4+0]; + } + 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......." @@ -197,10 +234,24 @@ static rtexture_t *draw_generatecrosshair(int num) 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 } /* @@ -252,8 +303,13 @@ cachepic_t *Draw_CachePic (char *path) pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete); } } + + 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")) @@ -268,7 +324,7 @@ cachepic_t *Draw_CachePic (char *path) pic->tex = draw_generateditherpattern(); if (pic->tex == NULL) { - Con_Printf ("Draw_CachePic: failed to load %s\n", path); + Con_Printf("Draw_CachePic: failed to load %s\n", path); pic->tex = r_notexture; } @@ -328,7 +384,7 @@ void Draw_FreePic(char *picname) 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; @@ -382,7 +438,7 @@ void R_DrawQueue(void) float x, y, w, h, s, t, u, v, *av, *at, c[4]; cachepic_t *pic; drawqueue_t *dq; - char *str, *currentpic; + char *str; int batchcount; unsigned int color; drawqueuemesh_t *mesh; @@ -404,22 +460,31 @@ void R_DrawQueue(void) quadelements[pos++] = num + 3; } } - GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight); + + r_view_width = bound(0, r_refdef.width, vid.realwidth); + r_view_height = bound(0, r_refdef.height, vid.realheight); + 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_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); qglDepthFunc(GL_LEQUAL); - R_Mesh_Start(); R_Mesh_Matrix(&r_identitymatrix); chartexnum = R_GetTexture(char_texture); memset(&m, 0, sizeof(m)); - m.tex[0] = 0; - R_Mesh_State_Texture(&m); - currentpic = ""; pic = NULL; texnum = 0; color = 0; + GL_Color(1,1,1,1); batch = false; batchcount = 0; @@ -427,11 +492,13 @@ void R_DrawQueue(void) { dq = (drawqueue_t *)(r_refdef.drawqueue + pos); color = dq->color; - - if(dq->flags & DRAWFLAG_ADDITIVE) + + if(dq->flags == DRAWFLAG_ADDITIVE) GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - else if(dq->flags & DRAWFLAG_MODULATE) + 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 GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -452,15 +519,12 @@ void R_DrawQueue(void) case DRAWQUEUE_STRING: GL_Color(c[0], c[1], c[2], c[3]); str = (char *)(dq + 1); - if (strcmp("gfx/conchars", currentpic)) - { - currentpic = "gfx/conchars"; - m.tex[0] = chartexnum; - } batchcount = 0; - GL_VertexPointer(varray_vertex3f); + m.pointer_vertex = varray_vertex3f; + m.pointer_color = NULL; m.pointer_texcoord[0] = varray_texcoord2f[0]; - R_Mesh_State_Texture(&m); + m.tex[0] = chartexnum; + R_Mesh_State(&m); at = varray_texcoord2f[0]; av = varray_vertex3f; while ((num = *str++) && x < vid.conwidth) @@ -484,7 +548,9 @@ void R_DrawQueue(void) batchcount++; if (batchcount >= 128) { + GL_LockArrays(0, batchcount * 4); R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); + GL_LockArrays(0, 0); batchcount = 0; at = varray_texcoord2f[0]; av = varray_vertex3f; @@ -493,18 +559,43 @@ void R_DrawQueue(void) x += w; } if (batchcount > 0) + { + GL_LockArrays(0, batchcount * 4); R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); + GL_LockArrays(0, 0); + } break; case DRAWQUEUE_MESH: mesh = (void *)(dq + 1); - GL_VertexPointer(mesh->vertex3f); - GL_ColorPointer(mesh->color4f); + 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); - m.pointer_texcoord[0] = mesh->texcoord2f; - R_Mesh_State_Texture(&m); - R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->element3i); - currentpic = "\0"; + if (!m.tex[0]) + 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); + 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); + + GL_Scissor(x, y, width, height); + + GL_ScissorTest(true); + } break; + case DRAWQUEUE_RESETCLIP: + GL_ScissorTest(false); + break; } } @@ -512,7 +603,8 @@ void R_DrawQueue(void) { // all the blends ignore depth memset(&m, 0, sizeof(m)); - R_Mesh_State_Texture(&m); + m.pointer_vertex = blendvertex3f; + R_Mesh_State(&m); GL_DepthMask(true); GL_DepthTest(false); if (v_color_enable.integer) @@ -526,7 +618,6 @@ void R_DrawQueue(void) if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f) { GL_BlendFunc(GL_DST_COLOR, GL_ONE); - GL_VertexPointer(blendvertex3f); 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); @@ -545,11 +636,9 @@ void R_DrawQueue(void) if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f) { GL_BlendFunc(GL_ONE, GL_ONE); - GL_VertexPointer(blendvertex3f); GL_Color(c[0], c[1], c[2], 1); R_Mesh_Draw(3, 1, polygonelements); } } - R_Mesh_Finish(); }