summaryrefslogtreecommitdiff
path: root/src/graphicsmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-09 22:46:34 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-09 23:50:09 +0300
commitff11053f5f638749c3564c464dc41ebc474b4897 (patch)
tree8cf7ed8485528c7498612199c7ca56a6fd84f5e5 /src/graphicsmanager.cpp
parentb2c1c301b1e39fbbbb5bde3d4d55d14a9873b51f (diff)
downloadManaVerse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.gz
ManaVerse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.bz2
ManaVerse-ff11053f5f638749c3564c464dc41ebc474b4897.tar.xz
ManaVerse-ff11053f5f638749c3564c464dc41ebc474b4897.zip
Move static methods from Image class to ImageHelper class.
Remove SDL merge method. It was very slow and unused.
Diffstat (limited to 'src/graphicsmanager.cpp')
-rw-r--r--src/graphicsmanager.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index eaab12e03..61e157353 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -25,7 +25,7 @@
#include "graphicsvertexes.h"
#include "logger.h"
-#include "resources/image.h"
+#include "resources/imagehelper.h"
#include "utils/paths.h"
#include "utils/stringutils.h"
@@ -153,7 +153,7 @@ void GraphicsManager::initGraphics(bool noOpenGL)
useOpenGL = config.getIntValue("opengl");
// Setup image loading for the right image format
- Image::setLoadAsOpenGL(useOpenGL);
+ ImageHelper::setLoadAsOpenGL(useOpenGL);
GraphicsVertexes::setLoadAsOpenGL(useOpenGL);
// Create the graphics context
@@ -210,7 +210,7 @@ void GraphicsManager::updateTextureFormat()
if (formats[f] == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT)
{
delete []formats;
- Image::setInternalTextureType(
+ ImageHelper::setInternalTextureType(
GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
logger->log1("using s3tc texture compression");
return;
@@ -218,19 +218,19 @@ void GraphicsManager::updateTextureFormat()
else if (formats[f] == GL_COMPRESSED_RGBA_FXT1_3DFX)
{
delete []formats;
- Image::setInternalTextureType(
+ ImageHelper::setInternalTextureType(
GL_COMPRESSED_RGBA_FXT1_3DFX);
logger->log1("using fxt1 texture compression");
return;
}
}
- Image::setInternalTextureType(GL_COMPRESSED_RGBA_ARB);
+ ImageHelper::setInternalTextureType(GL_COMPRESSED_RGBA_ARB);
logger->log1("using texture compression");
return;
}
else
{
- Image::setInternalTextureType(GL_COMPRESSED_RGBA_ARB);
+ ImageHelper::setInternalTextureType(GL_COMPRESSED_RGBA_ARB);
logger->log1("using texture compression");
return;
}
@@ -240,12 +240,12 @@ void GraphicsManager::updateTextureFormat()
// using default formats
if (config.getBoolValue("newtextures"))
{
- Image::setInternalTextureType(GL_RGBA);
+ ImageHelper::setInternalTextureType(GL_RGBA);
logger->log1("using RGBA texture format");
}
else
{
- Image::setInternalTextureType(4);
+ ImageHelper::setInternalTextureType(4);
logger->log1("using 4 texture format");
}
#endif