unsigned char *lmpdata;
char lmpname[MAX_QPATH];
int texflags;
+ int j;
texflags = TEXF_ALPHA;
if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (path, pic->name))
if(pic->texflags == texflags)
+ {
+ if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
+ pic->autoload = false; // persist it
return pic;
+ }
if (numcachepics == MAX_CACHED_PICS)
{
return pic;
}
+ pic->hasalpha = true; // assume alpha unless we know it has none
pic->texflags = texflags;
pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT);
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
{
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;
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;
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))
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:
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;
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)
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;
float sinar = sin(ar);
float cosar = cos(ar);
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);
if(!r_draw2d.integer && !r_draw2d_force)
return;
{
float floats[36];
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);
if(!r_draw2d.integer && !r_draw2d_force)
return;
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);
{
float floats[36];
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4);
if(!r_draw2d.integer && !r_draw2d_force)
return;
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);
{
int num;
- _DrawQ_ProcessDrawFlag(flags);
+ _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1);
if(!r_draw2d.integer && !r_draw2d_force)
return;
//[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;
// 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);
projects / xonotic / darkplaces.git / blobdiff