X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=13a695f05cf488163fd4bdd2ff0eef94d620c48b;hb=73624ef15d754ca65acb6f2037989fb582cd7b92;hp=8885586b816310ce1155100066ed0d1788db6328;hpb=224f9edae92441767654e2c10eb568bb91f86eb1;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 8885586b..13a695f0 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "image.h" -cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"}; - static rtexture_t *char_texture; //============================================================================= @@ -199,10 +197,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 } /* @@ -270,7 +282,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; } @@ -330,7 +342,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; @@ -369,23 +381,18 @@ static void gl_draw_newmap(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); } -float blendtexcoord2f[6] = {0, 0, 0, 0, 0, 0}; float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10}; int quadelements[768]; -float textverts[128*4*3]; -float texttexcoords[128*4*2]; void R_DrawQueue(void) { - int pos, num, chartexnum, overbright, texnum, additive, batch; + 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; @@ -411,42 +418,43 @@ void R_DrawQueue(void) quadelements[pos++] = num + 3; } } - GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight); + qglViewport(0, 0, vid.realwidth, vid.realheight); 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_TextureState(&m); currentpic = ""; pic = NULL; texnum = 0; color = 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); - additive = (dq->flags & DRAWFLAG_ADDITIVE) != 0; color = dq->color; - m.blendfunc1 = GL_SRC_ALPHA; - if (additive) - m.blendfunc2 = GL_ONE; + + 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 - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.depthdisable = true; - R_Mesh_MainState(&m); + 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) * r_colorscale; - c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f) * r_colorscale; - c[2] = (float) ((color >> 8) & 0xFF) * (1.0f / 255.0f) * r_colorscale; + 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; @@ -455,51 +463,20 @@ void R_DrawQueue(void) switch(dq->command) { - case DRAWQUEUE_PIC: - str = (char *)(dq + 1); - if (strcmp(str, currentpic)) - { - currentpic = str; - if (*str) - { - pic = Draw_CachePic(str); - m.tex[0] = R_GetTexture(pic->tex); - } - else - m.tex[0] = 0; - R_Mesh_TextureState(&m); - } - if (*str) - { - if (w == 0) - w = pic->width; - if (h == 0) - h = pic->height; - } - GL_Color(c[0], c[1], c[2], c[3]); - R_Mesh_GetSpace(4); - varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 0; - varray_texcoord2f[0][2] = 1;varray_texcoord2f[0][3] = 0; - varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 1; - varray_texcoord2f[0][6] = 0;varray_texcoord2f[0][7] = 1; - varray_vertex3f[ 0] = x ;varray_vertex3f[ 1] = y ;varray_vertex3f[ 2] = 10; - varray_vertex3f[ 3] = x+w;varray_vertex3f[ 4] = y ;varray_vertex3f[ 5] = 10; - varray_vertex3f[ 6] = x+w;varray_vertex3f[ 7] = y+h;varray_vertex3f[ 8] = 10; - varray_vertex3f[ 9] = x ;varray_vertex3f[10] = y+h;varray_vertex3f[11] = 10; - R_Mesh_Draw(4, 2, quadelements); - break; 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; - R_Mesh_TextureState(&m); } batchcount = 0; - at = texttexcoords; - av = textverts; - GL_Color(c[0], c[1], c[2], c[3]); + m.pointer_vertex = varray_vertex3f; + m.pointer_texcoord[0] = varray_texcoord2f[0]; + R_Mesh_State(&m); + at = varray_texcoord2f[0]; + av = varray_vertex3f; while ((num = *str++) && x < vid.conwidth) { if (num != ' ') @@ -521,37 +498,46 @@ void R_DrawQueue(void) batchcount++; if (batchcount >= 128) { - R_Mesh_GetSpace(batchcount * 4); - R_Mesh_CopyVertex3f(textverts, batchcount * 4); - R_Mesh_CopyTexCoord2f(0, texttexcoords, batchcount * 4); R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); batchcount = 0; - at = texttexcoords; - av = textverts; + at = varray_texcoord2f[0]; + av = varray_vertex3f; } } x += w; } if (batchcount > 0) - { - R_Mesh_GetSpace(batchcount * 4); - R_Mesh_CopyVertex3f(textverts, batchcount * 4); - R_Mesh_CopyTexCoord2f(0, texttexcoords, batchcount * 4); R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements); - } break; case DRAWQUEUE_MESH: mesh = (void *)(dq + 1); + m.pointer_vertex = mesh->data_vertex3f; + m.pointer_color = mesh->data_color4f; m.tex[0] = R_GetTexture(mesh->texture); - R_Mesh_TextureState(&m); - GL_UseColorArray(); - R_Mesh_GetSpace(mesh->numvertices); - R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numvertices); - R_Mesh_CopyTexCoord2f(0, mesh->texcoord2f, mesh->numvertices); - R_Mesh_CopyColor4f(mesh->color4f, mesh->numvertices); - R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->element3i); + m.pointer_texcoord[0] = mesh->data_texcoord2f; + R_Mesh_State(&m); + R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i); + m.pointer_color = NULL; currentpic = "\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; } } @@ -559,7 +545,10 @@ void R_DrawQueue(void) { // all the blends ignore depth memset(&m, 0, sizeof(m)); - m.depthdisable = true; + m.pointer_vertex = blendvertex3f; + R_Mesh_State(&m); + GL_DepthMask(true); + GL_DepthTest(false); if (v_color_enable.integer) { c[0] = v_color_white_r.value; @@ -568,18 +557,12 @@ void R_DrawQueue(void) } else c[0] = c[1] = c[2] = v_contrast.value; - VectorScale(c, (float) (1 << v_overbrightbits.integer), c); if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f) { - m.blendfunc1 = GL_DST_COLOR; - m.blendfunc2 = GL_ONE; - R_Mesh_State(&m); + GL_BlendFunc(GL_DST_COLOR, GL_ONE); 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_GetSpace(3); - R_Mesh_CopyVertex3f(blendvertex3f, 3); - R_Mesh_CopyTexCoord2f(0, blendtexcoord2f, 3); R_Mesh_Draw(3, 1, polygonelements); VectorScale(c, 0.5, c); } @@ -594,16 +577,10 @@ void R_DrawQueue(void) c[0] = c[1] = c[2] = v_brightness.value; if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f) { - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ONE; - R_Mesh_State(&m); + GL_BlendFunc(GL_ONE, GL_ONE); GL_Color(c[0], c[1], c[2], 1); - R_Mesh_GetSpace(3); - R_Mesh_CopyVertex3f(blendvertex3f, 3); - R_Mesh_CopyTexCoord2f(0, blendtexcoord2f, 3); R_Mesh_Draw(3, 1, polygonelements); } } - R_Mesh_Finish(); }