ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-26 13:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed texcompression being disabled after each restart

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@163 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
namespace 2007-04-25 18:54:37 +00:00
parent 389cb33239
commit 47e6646181
4 changed files with 68 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,6 +1,10 @@
This is the changelog for developers, != changelog for the end user This is the changelog for developers, != changelog for the end user
that we distribute with the binaries. (see changelog) that we distribute with the binaries. (see changelog)
25/04/2007
- Fixed texcompression beeing disabled after each restart
- Fixed gtk-searchpopup in treeviews
15/03/2007 15/03/2007
namespace namespace
- Fixed brushexport2 output float-format (Shaderman) - Fixed brushexport2 output float-format (Shaderman)

2
radiant/GtkRadiant.vcproj
View file

@ -54,7 +54,7 @@
BrowseInformation="0" BrowseInformation="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
DebugInformationFormat="3" DebugInformationFormat="4"
DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"
/> />
<Tool <Tool

105
radiant/textures.cpp
View file

@ -534,7 +534,6 @@ TexturesCache& GetTexturesCache()
void Textures_Realise() void Textures_Realise()
{ {
SetTexParameters(g_texture_mode);
g_texturesmap->realise(); g_texturesmap->realise();
} }
@ -564,7 +563,6 @@ void Textures_ModeChanged()
} }
glBindTexture( GL_TEXTURE_2D, 0 ); glBindTexture( GL_TEXTURE_2D, 0 );
//qglFinish();
} }
g_texturesModeChangedNotify(); g_texturesModeChangedNotify();
} }
@ -593,55 +591,62 @@ void Textures_UpdateTextureCompressionFormat()
{ {
GLint texture_components = GL_RGBA; GLint texture_components = GL_RGBA;
if (g_texture_globals.bTextureCompressionSupported) if(!g_texturesmap->realised())
{ {
if(g_texture_globals.m_nTextureCompressionFormat != TEXTURECOMPRESSION_NONE texture_components = g_texture_globals.m_nTextureCompressionFormat;
&& g_texture_globals.m_nTextureCompressionFormat != TEXTURECOMPRESSION_RGBA }
&& !g_texture_globals.m_bS3CompressionSupported) else
{ {
globalOutputStream() << "OpenGL extension GL_EXT_texture_compression_s3tc not supported by current graphics drivers\n"; if (g_texture_globals.bTextureCompressionSupported)
g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_RGBA; // if this is not supported either, see below {
} if(g_texture_globals.m_nTextureCompressionFormat != TEXTURECOMPRESSION_NONE
if (g_texture_globals.m_nTextureCompressionFormat == TEXTURECOMPRESSION_RGBA && !g_texture_globals.m_bOpenGLCompressionSupported) && g_texture_globals.m_nTextureCompressionFormat != TEXTURECOMPRESSION_RGBA
{ && !g_texture_globals.m_bS3CompressionSupported)
globalOutputStream() << "OpenGL extension GL_ARB_texture_compression not supported by current graphics drivers\n"; {
g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_NONE; globalOutputStream() << "OpenGL extension GL_EXT_texture_compression_s3tc not supported by current graphics drivers\n";
} g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_RGBA; // if this is not supported either, see below
}
if (g_texture_globals.m_nTextureCompressionFormat == TEXTURECOMPRESSION_RGBA && !g_texture_globals.m_bOpenGLCompressionSupported)
{
globalOutputStream() << "OpenGL extension GL_ARB_texture_compression not supported by current graphics drivers\n";
g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_NONE;
}
switch (g_texture_globals.m_nTextureCompressionFormat) switch (g_texture_globals.m_nTextureCompressionFormat)
{ {
case (TEXTURECOMPRESSION_NONE): case (TEXTURECOMPRESSION_NONE):
{ {
texture_components = GL_RGBA; texture_components = GL_RGBA;
break; break;
} }
case (TEXTURECOMPRESSION_RGBA): case (TEXTURECOMPRESSION_RGBA):
{ {
texture_components = GL_COMPRESSED_RGBA_ARB; texture_components = GL_COMPRESSED_RGBA_ARB;
break; break;
} }
case (TEXTURECOMPRESSION_RGBA_S3TC_DXT1): case (TEXTURECOMPRESSION_RGBA_S3TC_DXT1):
{ {
texture_components = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; texture_components = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
break; break;
} }
case (TEXTURECOMPRESSION_RGBA_S3TC_DXT3): case (TEXTURECOMPRESSION_RGBA_S3TC_DXT3):
{ {
texture_components = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT; texture_components = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
break; break;
} }
case (TEXTURECOMPRESSION_RGBA_S3TC_DXT5): case (TEXTURECOMPRESSION_RGBA_S3TC_DXT5):
{ {
texture_components = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT; texture_components = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
break; break;
} }
} }
} }
else else
{ {
texture_components = GL_RGBA; texture_components = GL_RGBA;
g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_NONE; g_texture_globals.m_nTextureCompressionFormat = TEXTURECOMPRESSION_NONE;
} }
}
Textures_setTextureComponents(texture_components); Textures_setTextureComponents(texture_components);
} }

8
setup/win32/components/gtk2.xml
View file

@ -13,6 +13,8 @@
<dir name="2.10.0"> <dir name="2.10.0">
<dir name="engines"> <dir name="engines">
<file name="libwimp.dll"/> <file name="libwimp.dll"/>
<file name="libclearlooks.dll"/>
<file name="libpixmap.dll"/>
</dir> </dir>
<dir name="immodules"> <dir name="immodules">
<file name="im-ipa.dll"/> <file name="im-ipa.dll"/>
@ -20,6 +22,7 @@
<dir name="loaders"> <dir name="loaders">
<file name="libpixbufloader-bmp.dll"/> <file name="libpixbufloader-bmp.dll"/>
<file name="libpixbufloader-xpm.dll"/> <file name="libpixbufloader-xpm.dll"/>
<file name="libpixbufloader-png.dll"/>
</dir> </dir>
</dir> </dir>
</dir> </dir>
@ -45,6 +48,11 @@
<file name="gtkrc"/> <file name="gtkrc"/>
</dir> </dir>
</dir> </dir>
<dir name="Clearlooks">
<dir name="gtk-2.0">
<file name="gtkrc"/>
</dir>
</dir>
</dir> </dir>
</dir> </dir>
</component> </component>