X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=plugins%2Fimage%2Fimage.cpp;h=f7f73522e2ac66749a633b023b90fc4ce9f79520;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=fcfdd01875510561f8db08617b2cb2aec269d05a;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git

diff --git a/plugins/image/image.cpp b/plugins/image/image.cpp
index fcfdd018..f7f73522 100644
--- a/plugins/image/image.cpp
+++ b/plugins/image/image.cpp
@@ -19,8 +19,6 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "image.h"
-
 #include "ifilesystem.h"
 #include "iimage.h"
 
@@ -29,27 +27,30 @@
 #include "bmp.h"
 #include "pcx.h"
 #include "dds.h"
+#include "ktx.h"
 
 
 #include "modulesystem/singletonmodule.h"
 
-class ImageDependencies : public GlobalFileSystemModuleRef
-{
+class ImageDependencies : public GlobalFileSystemModuleRef {
 };
 
-class ImageTGAAPI
-{
-_QERPlugImageTable m_imagetga;
+class ImageTGAAPI {
+    _QERPlugImageTable m_imagetga;
 public:
-typedef _QERPlugImageTable Type;
-STRING_CONSTANT( Name, "tga" );
+    typedef _QERPlugImageTable Type;
 
-ImageTGAAPI(){
-	m_imagetga.loadImage = LoadTGA;
-}
-_QERPlugImageTable* getTable(){
-	return &m_imagetga;
-}
+    STRING_CONSTANT(Name, "tga");
+
+    ImageTGAAPI()
+    {
+        m_imagetga.loadImage = LoadTGA;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagetga;
+    }
 };
 
 typedef SingletonModule<ImageTGAAPI> ImageTGAModule;
@@ -57,19 +58,22 @@ typedef SingletonModule<ImageTGAAPI> ImageTGAModule;
 ImageTGAModule g_ImageTGAModule;
 
 
-class ImageJPGAPI
-{
-_QERPlugImageTable m_imagejpg;
+class ImageJPGAPI {
+    _QERPlugImageTable m_imagejpg;
 public:
-typedef _QERPlugImageTable Type;
-STRING_CONSTANT( Name, "jpg" );
+    typedef _QERPlugImageTable Type;
 
-ImageJPGAPI(){
-	m_imagejpg.loadImage = LoadJPG;
-}
-_QERPlugImageTable* getTable(){
-	return &m_imagejpg;
-}
+    STRING_CONSTANT(Name, "jpg");
+
+    ImageJPGAPI()
+    {
+        m_imagejpg.loadImage = LoadJPG;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagejpg;
+    }
 };
 
 typedef SingletonModule<ImageJPGAPI, ImageDependencies> ImageJPGModule;
@@ -77,19 +81,22 @@ typedef SingletonModule<ImageJPGAPI, ImageDependencies> ImageJPGModule;
 ImageJPGModule g_ImageJPGModule;
 
 
-class ImageBMPAPI
-{
-_QERPlugImageTable m_imagebmp;
+class ImageBMPAPI {
+    _QERPlugImageTable m_imagebmp;
 public:
-typedef _QERPlugImageTable Type;
-STRING_CONSTANT( Name, "bmp" );
+    typedef _QERPlugImageTable Type;
 
-ImageBMPAPI(){
-	m_imagebmp.loadImage = LoadBMP;
-}
-_QERPlugImageTable* getTable(){
-	return &m_imagebmp;
-}
+    STRING_CONSTANT(Name, "bmp");
+
+    ImageBMPAPI()
+    {
+        m_imagebmp.loadImage = LoadBMP;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagebmp;
+    }
 };
 
 typedef SingletonModule<ImageBMPAPI, ImageDependencies> ImageBMPModule;
@@ -97,19 +104,22 @@ typedef SingletonModule<ImageBMPAPI, ImageDependencies> ImageBMPModule;
 ImageBMPModule g_ImageBMPModule;
 
 
-class ImagePCXAPI
-{
-_QERPlugImageTable m_imagepcx;
+class ImagePCXAPI {
+    _QERPlugImageTable m_imagepcx;
 public:
-typedef _QERPlugImageTable Type;
-STRING_CONSTANT( Name, "pcx" );
+    typedef _QERPlugImageTable Type;
 
-ImagePCXAPI(){
-	m_imagepcx.loadImage = LoadPCX32;
-}
-_QERPlugImageTable* getTable(){
-	return &m_imagepcx;
-}
+    STRING_CONSTANT(Name, "pcx");
+
+    ImagePCXAPI()
+    {
+        m_imagepcx.loadImage = LoadPCX32;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagepcx;
+    }
 };
 
 typedef SingletonModule<ImagePCXAPI, ImageDependencies> ImagePCXModule;
@@ -117,19 +127,22 @@ typedef SingletonModule<ImagePCXAPI, ImageDependencies> ImagePCXModule;
 ImagePCXModule g_ImagePCXModule;
 
 
-class ImageDDSAPI
-{
-_QERPlugImageTable m_imagedds;
+class ImageDDSAPI {
+    _QERPlugImageTable m_imagedds;
 public:
-typedef _QERPlugImageTable Type;
-STRING_CONSTANT( Name, "dds" );
+    typedef _QERPlugImageTable Type;
 
-ImageDDSAPI(){
-	m_imagedds.loadImage = LoadDDS;
-}
-_QERPlugImageTable* getTable(){
-	return &m_imagedds;
-}
+    STRING_CONSTANT(Name, "dds");
+
+    ImageDDSAPI()
+    {
+        m_imagedds.loadImage = LoadDDS;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagedds;
+    }
 };
 
 typedef SingletonModule<ImageDDSAPI, ImageDependencies> ImageDDSModule;
@@ -137,12 +150,37 @@ typedef SingletonModule<ImageDDSAPI, ImageDependencies> ImageDDSModule;
 ImageDDSModule g_ImageDDSModule;
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
-	initialiseModule( server );
+class ImageKTXAPI {
+    _QERPlugImageTable m_imagektx;
+public:
+    typedef _QERPlugImageTable Type;
+
+    STRING_CONSTANT(Name, "ktx");
+
+    ImageKTXAPI()
+    {
+        m_imagektx.loadImage = LoadKTX;
+    }
+
+    _QERPlugImageTable *getTable()
+    {
+        return &m_imagektx;
+    }
+};
 
-	g_ImageTGAModule.selfRegister();
-	g_ImageJPGModule.selfRegister();
-	g_ImageBMPModule.selfRegister();
-	g_ImagePCXModule.selfRegister();
-	g_ImageDDSModule.selfRegister();
+typedef SingletonModule<ImageKTXAPI, ImageDependencies> ImageKTXModule;
+
+ImageKTXModule g_ImageKTXModule;
+
+
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer &server)
+{
+    initialiseModule(server);
+
+    g_ImageTGAModule.selfRegister();
+    g_ImageJPGModule.selfRegister();
+    g_ImageBMPModule.selfRegister();
+    g_ImagePCXModule.selfRegister();
+    g_ImageDDSModule.selfRegister();
+    g_ImageKTXModule.selfRegister();
 }