real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions 2 Activity

Recognise alpha-channel DDS files in GUI

Browse Source 
This was SVN commit r2562.
This commit is contained in:
Ykkrosh 2005-07-29 03:18:41 +00:00
parent 4c7838970d
commit a18bb56add
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/gui/GUIRenderer.cpp
View File

@ -404,9 +404,21 @@ void GUIRenderer::UpdateDrawCallCache(DrawCalls &Calls, CStr &SpriteName, CRect
tex_info(h, &t_w, &t_h, &TexFormat, NULL, NULL);
float TexWidth = (float)t_w, TexHeight = (float)t_h;
// TODO: Detect the presence of an alpha channel in a nicer way
Call.m_EnableBlending = (TexFormat == GL_RGBA || TexFormat == GL_BGRA);
// TODO: Detect the presence of an alpha channel in a more precise way
// (particularly for no-alpha DXT1 textures)
switch (TexFormat)
{
case GL_RGBA:
case GL_BGRA:
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
Call.m_EnableBlending = true;
break;
default:
Call.m_EnableBlending = false;
break;
}
// Textures are positioned by defining a rectangular block of the
// texture (usually the whole texture), and a rectangular block on
@ -508,22 +520,6 @@ void GUIRenderer::UpdateDrawCallCache(DrawCalls &Calls, CStr &SpriteName, CRect
else
{
Call.m_Effects = NULL;
/* TODO: Delete this code
_CrtMemState s;
_CrtMemCheckpoint(&s);
struct ::_CrtMemBlockHeader
{
struct _CrtMemBlockHeader * pBlockHeaderNext;
struct _CrtMemBlockHeader * pBlockHeaderPrev;
char * szFileName;
int nLine;
size_t nDataSize;
int nBlockUse;
long lRequest;
};
debug_printf("%d %s\n", s.pBlockHeader->lRequest, SpriteName.c_str());
*/
}
Calls.push_back(Call);