X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=5c06e4938416c95d9682e12541bf37075136b967;hb=1ea860909ea670451b5200ccd30aa19241cd081a;hp=4fdee6f4d80f2bb58ed8c2eaf284c2177158f39e;hpb=ac26fe8251232ec2eb02c89b9df3d07444063211;p=xonotic%2Fdarkplaces.git diff --git a/gl_draw.c b/gl_draw.c index 4fdee6f4..5c06e493 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -318,6 +318,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) unsigned char *lmpdata; char lmpname[MAX_QPATH]; int texflags; + int j; texflags = TEXF_ALPHA; if (!(cachepicflags & CACHEPICFLAG_NOCLAMP)) @@ -330,8 +331,17 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE; for (pic = cachepichash[hashkey];pic;pic = pic->chain) if (!strcmp (path, pic->name)) - if(pic->texflags == texflags) + if(!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag + { + if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT)) + { + if(pic->tex) + pic->autoload = false; // persist it + else + goto reload; // load it below, and then persist + } return pic; + } if (numcachepics == MAX_CACHED_PICS) { @@ -345,6 +355,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) pic->chain = cachepichash[hashkey]; cachepichash[hashkey] = pic; +reload: // check whether it is an dynamic texture (if so, we can directly use its texture handler) pic->tex = CL_GetDynTexture( path ); // if so, set the width/height, too @@ -355,6 +366,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) return pic; } + pic->hasalpha = true; // assume alpha unless we know it has none pic->texflags = texflags; pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT); @@ -364,10 +376,23 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) pixels = loadimagepixelsbgra(path+4, false, true, r_texture_convertsRGB_2d.integer != 0, NULL); if (pixels) { + pic->hasalpha = false; + if (pic->texflags & TEXF_ALPHA) + { + for (j = 3;j < image_width * image_height * 4;j += 4) + { + if (pixels[j] < 255) + { + pic->hasalpha = true; + break; + } + } + } + pic->width = image_width; pic->height = image_height; if (!pic->autoload) - pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags, -1, NULL); + pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags & (pic->hasalpha ? ~0 : ~TEXF_ALPHA), -1, NULL); } else { @@ -438,7 +463,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) cachepic_t *Draw_CachePic (const char *path) { - return Draw_CachePic_Flags (path, 0); + return Draw_CachePic_Flags (path, 0); // default to persistent! } int draw_frame = 1; @@ -517,7 +542,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u pic->height = height; if (pic->tex) R_FreeTexture(pic->tex); - pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, (alpha ? TEXF_ALPHA : 0) | TEXF_ALLOWUPDATES, -1, NULL); + pic->tex = R_LoadTexture2D(drawtexturepool, picname, width, height, pixels_bgra, TEXTYPE_BGRA, (alpha ? TEXF_ALPHA : 0), -1, NULL); return pic; } @@ -546,7 +571,7 @@ static float snap_to_pixel_x(float x, float roundUpAt); extern int con_linewidth; // to force rewrapping void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, float voffset) { - int i; + int i, ch; float maxwidth; char widthfile[MAX_QPATH]; char *widthbuf; @@ -610,16 +635,16 @@ void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, dpsnprintf(widthfile, sizeof(widthfile), "%s.width", fnt->texpath); // unspecified width == 1 (base width) - for(i = 1; i < 256; ++i) - fnt->width_of[i] = 1; + for(ch = 0; ch < 256; ++ch) + fnt->width_of[ch] = 1; // FIXME load "name.width", if it fails, fill all with 1 if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize))) { float extraspacing = 0; const char *p = widthbuf; - int ch = 0; + ch = 0; while(ch < 256) { if(!COM_ParseToken_Simple(&p, false, false)) @@ -641,17 +666,6 @@ void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, case '-': case '.': fnt->width_of[ch] = atof(com_token) + extraspacing; - if (fnt->ft2) - { - for (i = 0; i < MAX_FONT_SIZES; ++i) - { - //Font_MapForIndex(fnt->ft2, i)->width_of[ch] = snap_to_pixel_x(fnt->width_of[ch] * fnt->req_sizes[i], 0.4); - ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i); - if (!map) - break; - map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size); - } - } ch++; break; default: @@ -680,8 +694,20 @@ void LoadFont(qboolean override, const char *name, dp_font_t *fnt, float scale, Mem_Free(widthbuf); } - maxwidth = fnt->width_of[1]; - for(i = 2; i < 256; ++i) + if(fnt->ft2) + { + for (i = 0; i < MAX_FONT_SIZES; ++i) + { + ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i); + if (!map) + break; + for(ch = 0; ch < 256; ++ch) + map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size); + } + } + + maxwidth = fnt->width_of[0]; + for(i = 1; i < 256; ++i) maxwidth = max(maxwidth, fnt->width_of[i]); fnt->maxwidth = maxwidth; @@ -868,10 +894,28 @@ static void LoadFont_f(void) voffset = atof(Cmd_Argv(i)); continue; } + + if (sizes == -1) + continue; // no slot for other sizes + // parse one of sizes sz = atof(Cmd_Argv(i)); if (sz > 0.001f && sz < 1000.0f) // do not use crap sizes { + // search for duplicated sizes + int j; + for (j=0; jreq_sizes[j] == sz) + break; + if (j != sizes) + continue; // sz already in req_sizes, don't add it again + + if (sizes == MAX_FONT_SIZES) + { + Con_Printf("Warning: specified more than %i different font sizes, exceding ones are ignored\n", MAX_FONT_SIZES); + sizes = -1; + continue; + } f->req_sizes[sizes] = sz; sizes++; } @@ -959,54 +1003,76 @@ void GL_Draw_Init (void) R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL); } -void _DrawQ_Setup(void) +static void _DrawQ_Setup(void) { r_viewport_t viewport; - if (r_refdef.draw2dstage) + if (r_refdef.draw2dstage == 1) return; - r_refdef.draw2dstage = true; + r_refdef.draw2dstage = 1; CHECKGLERROR R_Viewport_InitOrtho(&viewport, &identitymatrix, r_refdef.view.x, vid.height - r_refdef.view.y - r_refdef.view.height, r_refdef.view.width, r_refdef.view.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL); R_SetViewport(&viewport); GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1); - qglDepthFunc(GL_LEQUAL);CHECKGLERROR - qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR - GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces + GL_DepthFunc(GL_LEQUAL); + GL_PolygonOffset(0,0); + GL_CullFace(GL_NONE); R_EntityMatrix(&identitymatrix); - GL_DepthMask(true); GL_DepthRange(0, 1); GL_PolygonOffset(0, 0); GL_DepthTest(false); GL_Color(1,1,1,1); GL_AlphaTest(false); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } qboolean r_draw2d_force = false; -static void _DrawQ_ProcessDrawFlag(int flags) +void _DrawQ_SetupAndProcessDrawFlag(int flags, cachepic_t *pic, float alpha) { _DrawQ_Setup(); CHECKGLERROR if(!r_draw2d.integer && !r_draw2d_force) return; + DrawQ_ProcessDrawFlag(flags, (alpha < 1) || (pic && pic->hasalpha)); +} +void DrawQ_ProcessDrawFlag(int flags, qboolean alpha) +{ if(flags == DRAWFLAG_ADDITIVE) - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + { + GL_DepthMask(false); + GL_BlendFunc(alpha ? GL_SRC_ALPHA : GL_ONE, GL_ONE); + } else if(flags == DRAWFLAG_MODULATE) + { + GL_DepthMask(false); GL_BlendFunc(GL_DST_COLOR, GL_ZERO); + } else if(flags == DRAWFLAG_2XMODULATE) - GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR); + { + GL_DepthMask(false); + GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR); + } else if(flags == DRAWFLAG_SCREEN) - GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - else + { + GL_DepthMask(false); + GL_BlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE); + } + else if(alpha) + { + GL_DepthMask(false); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + } + else + { + GL_DepthMask(true); + GL_BlendFunc(GL_ONE, GL_ZERO); + } } void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags) { float floats[36]; - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha); if(!r_draw2d.integer && !r_draw2d_force) return; @@ -1063,7 +1129,7 @@ void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height, float sinar = sin(ar); float cosar = cos(ar); - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha); if(!r_draw2d.integer && !r_draw2d_force) return; @@ -1114,7 +1180,7 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr { float floats[36]; - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha); if(!r_draw2d.integer && !r_draw2d_force) return; @@ -1439,7 +1505,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma if (maxlen < 1) maxlen = 1<<30; - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 0); if(!r_draw2d.integer && !r_draw2d_force) return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000); @@ -1783,7 +1849,7 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height { float floats[36]; - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4); if(!r_draw2d.integer && !r_draw2d_force) return; @@ -1817,11 +1883,13 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0); } -void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags) +void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags, qboolean hasalpha) { - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_Setup(); + CHECKGLERROR if(!r_draw2d.integer && !r_draw2d_force) return; + DrawQ_ProcessDrawFlag(flags, hasalpha); R_Mesh_ResetTextureState(); R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1); @@ -1834,42 +1902,77 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags) { int num; - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1); if(!r_draw2d.integer && !r_draw2d_force) return; GL_Color(1,1,1,1); - CHECKGLERROR - qglBegin(GL_LINE_LOOP); - for (num = 0;num < mesh->num_vertices;num++) + switch(vid.renderpath) { - if (mesh->data_color4f) - GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]); - qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]); + case RENDERPATH_GL11: + case RENDERPATH_GL13: + case RENDERPATH_GL20: + case RENDERPATH_CGGL: + CHECKGLERROR + qglBegin(GL_LINE_LOOP); + for (num = 0;num < mesh->num_vertices;num++) + { + if (mesh->data_color4f) + GL_Color(mesh->data_color4f[num*4+0], mesh->data_color4f[num*4+1], mesh->data_color4f[num*4+2], mesh->data_color4f[num*4+3]); + qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]); + } + qglEnd(); + CHECKGLERROR + break; + case RENDERPATH_D3D9: + //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + case RENDERPATH_D3D10: + Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + case RENDERPATH_D3D11: + Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; } - qglEnd(); - CHECKGLERROR } //[515]: this is old, delete void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags) { - _DrawQ_ProcessDrawFlag(flags); + _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha); if(!r_draw2d.integer && !r_draw2d_force) return; R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1); - CHECKGLERROR - //qglLineWidth(width);CHECKGLERROR + switch(vid.renderpath) + { + case RENDERPATH_GL11: + case RENDERPATH_GL13: + case RENDERPATH_GL20: + case RENDERPATH_CGGL: + CHECKGLERROR - GL_Color(r,g,b,alpha); - CHECKGLERROR - qglBegin(GL_LINES); - qglVertex2f(x1, y1); - qglVertex2f(x2, y2); - qglEnd(); - CHECKGLERROR + //qglLineWidth(width);CHECKGLERROR + + GL_Color(r,g,b,alpha); + CHECKGLERROR + qglBegin(GL_LINES); + qglVertex2f(x1, y1); + qglVertex2f(x2, y2); + qglEnd(); + CHECKGLERROR + break; + case RENDERPATH_D3D9: + //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + case RENDERPATH_D3D10: + Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + case RENDERPATH_D3D11: + Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__); + break; + } } void DrawQ_SetClipArea(float x, float y, float width, float height) @@ -1881,8 +1984,8 @@ void DrawQ_SetClipArea(float x, float y, float width, float height) // OGL uses top to bottom ix = (int)(0.5 + x * ((float)vid.width / vid_conwidth.integer)); iy = (int)(0.5 + y * ((float) vid.height / vid_conheight.integer)); - iw = (int)(width * ((float)vid.width / vid_conwidth.integer)); - ih = (int)(height * ((float)vid.height / vid_conheight.integer)); + iw = (int)(0.5 + (x+width) * ((float)vid.width / vid_conwidth.integer)) - ix; + ih = (int)(0.5 + (y+height) * ((float) vid.height / vid_conheight.integer)) - iy; GL_Scissor(ix, vid.height - iy - ih, iw, ih); GL_ScissorTest(true); @@ -1896,7 +1999,13 @@ void DrawQ_ResetClipArea(void) void DrawQ_Finish(void) { - r_refdef.draw2dstage = false; + r_refdef.draw2dstage = 0; +} + +void DrawQ_RecalcView(void) +{ + if(r_refdef.draw2dstage) + r_refdef.draw2dstage = -1; // next draw call will set viewport etc. again } static float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10}; @@ -1907,6 +2016,9 @@ void R_DrawGamma(void) { case RENDERPATH_GL20: case RENDERPATH_CGGL: + case RENDERPATH_D3D9: + case RENDERPATH_D3D10: + case RENDERPATH_D3D11: if (vid_usinghwgamma || v_glslgamma.integer) return; break;