windows updates

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@495 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-10-01 18:12:51 +00:00
parent 421f424b20
commit 94521a6548
4 changed files with 54 additions and 42 deletions

View File

@ -11,9 +11,7 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetU
}
TextureManager::~TextureManager()
{
// DeleteAllTextures();
{
std::map<std::string, GLuint>::const_iterator iter;
for(iter = textures.begin(); iter != textures.end(); iter++)
@ -62,21 +60,21 @@ GLuint TextureManager::getTexture(const std::string imageURL)
fullURL.c_str(),
SOIL_LOAD_AUTO,
SOIL_CREATE_NEW_ID,
SOIL_FLAG_POWER_OF_TWO
//| SOIL_FLAG_MIPMAPS
| SOIL_FLAG_MULTIPLY_ALPHA
| SOIL_FLAG_COMPRESS_TO_DXT
// SOIL_FLAG_POWER_OF_TWO
// SOIL_FLAG_MIPMAPS
// SOIL_FLAG_MULTIPLY_ALPHA
SOIL_FLAG_COMPRESS_TO_DXT
//| SOIL_FLAG_DDS_LOAD_DIRECT
);
textures[imageURL]=tex;
return tex;
}
// return LoadTexture(fullUrl.c_str(),false);
}
}
unsigned int TextureManager::getTextureMemorySize()
{
return 0;//GetTotalTextureSize();
return 0;
}