Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / plugins / shaders / plugin.cpp

diff --git a/plugins/shaders/plugin.cpp b/plugins/shaders/plugin.cpp
index 93f215d70d2d55564055a26a7a7856c5bd7a6f58..4576a6416e7ef4502c60ddcd845414d36cf1437e 100644 (file)
--- a/plugins/shaders/plugin.cpp
+++ b/plugins/shaders/plugin.cpp
@@ -31,48 +31,41 @@
 #include "shaders.h"
 
 class ShadersDependencies :
-        public GlobalFileSystemModuleRef,
-        public GlobalTexturesModuleRef,
-        public GlobalScripLibModuleRef,
-        public GlobalRadiantModuleRef {
-    ImageModuleRef m_bitmapModule;
+       public GlobalFileSystemModuleRef,
+       public GlobalTexturesModuleRef,
+       public GlobalScripLibModuleRef,
+       public GlobalRadiantModuleRef
+{
+ImageModuleRef m_bitmapModule;
 public:
-    ShadersDependencies() :
-            m_bitmapModule("png")
-    {
-    }
-
-    ImageModuleRef &getBitmapModule()
-    {
-        return m_bitmapModule;
-    }
+ShadersDependencies() :
+       m_bitmapModule( "png" ){
+}
+ImageModuleRef& getBitmapModule(){
+       return m_bitmapModule;
+}
 };
 
-class ShadersQ3API {
-    ShaderSystem *m_shadersq3;
+class ShadersQ3API
+{
+ShaderSystem* m_shadersq3;
 public:
-    typedef ShaderSystem Type;
-
-    STRING_CONSTANT(Name, "quake3");
-
-    ShadersQ3API(ShadersDependencies &dependencies)
-    {
-        g_shadersExtension = "shader";
-        g_shadersDirectory = "scripts/";
-        g_bitmapModule = dependencies.getBitmapModule().getTable();
-        Shaders_Construct();
-        m_shadersq3 = &GetShaderSystem();
-    }
-
-    ~ShadersQ3API()
-    {
-        Shaders_Destroy();
-    }
-
-    ShaderSystem *getTable()
-    {
-        return m_shadersq3;
-    }
+typedef ShaderSystem Type;
+STRING_CONSTANT( Name, "quake3" );
+
+ShadersQ3API( ShadersDependencies& dependencies ){
+       g_shadersExtension = "shader";
+       g_shadersDirectory = "scripts/";
+       g_bitmapModule = dependencies.getBitmapModule().getTable();
+       Shaders_Construct();
+       m_shadersq3 = &GetShaderSystem();
+}
+~ShadersQ3API(){
+       Shaders_Destroy();
+}
+ShaderSystem* getTable(){
+       return m_shadersq3;
+}
 };
 
 typedef SingletonModule<ShadersQ3API, ShadersDependencies, DependenciesAPIConstructor<ShadersQ3API, ShadersDependencies> > ShadersQ3Module;
@@ -80,34 +73,29 @@ typedef SingletonModule<ShadersQ3API, ShadersDependencies, DependenciesAPIConstr
 ShadersQ3Module g_ShadersQ3Module;
 
 
-class ShadersDoom3API {
-    ShaderSystem *m_shadersdoom3;
+class ShadersDoom3API
+{
+ShaderSystem* m_shadersdoom3;
 public:
-    typedef ShaderSystem Type;
-
-    STRING_CONSTANT(Name, "doom3");
-
-    ShadersDoom3API(ShadersDependencies &dependencies)
-    {
-        g_shadersExtension = "mtr";
-        g_shadersDirectory = "materials/";
-        g_enableDefaultShaders = false;
-        g_shaderLanguage = SHADERLANGUAGE_DOOM3;
-        g_useShaderList = false;
-        g_bitmapModule = dependencies.getBitmapModule().getTable();
-        Shaders_Construct();
-        m_shadersdoom3 = &GetShaderSystem();
-    }
-
-    ~ShadersDoom3API()
-    {
-        Shaders_Destroy();
-    }
-
-    ShaderSystem *getTable()
-    {
-        return m_shadersdoom3;
-    }
+typedef ShaderSystem Type;
+STRING_CONSTANT( Name, "doom3" );
+
+ShadersDoom3API( ShadersDependencies& dependencies ){
+       g_shadersExtension = "mtr";
+       g_shadersDirectory = "materials/";
+       g_enableDefaultShaders = false;
+       g_shaderLanguage = SHADERLANGUAGE_DOOM3;
+       g_useShaderList = false;
+       g_bitmapModule = dependencies.getBitmapModule().getTable();
+       Shaders_Construct();
+       m_shadersdoom3 = &GetShaderSystem();
+}
+~ShadersDoom3API(){
+       Shaders_Destroy();
+}
+ShaderSystem* getTable(){
+       return m_shadersdoom3;
+}
 };
 
 typedef SingletonModule<ShadersDoom3API, ShadersDependencies, DependenciesAPIConstructor<ShadersDoom3API, ShadersDependencies> > ShadersDoom3Module;
@@ -115,34 +103,29 @@ typedef SingletonModule<ShadersDoom3API, ShadersDependencies, DependenciesAPICon
 ShadersDoom3Module g_ShadersDoom3Module;
 
 
-class ShadersQuake4API {
-    ShaderSystem *m_shadersquake4;
+class ShadersQuake4API
+{
+ShaderSystem* m_shadersquake4;
 public:
-    typedef ShaderSystem Type;
-
-    STRING_CONSTANT(Name, "quake4");
-
-    ShadersQuake4API(ShadersDependencies &dependencies)
-    {
-        g_shadersExtension = "mtr";
-        g_shadersDirectory = "materials/";
-        g_enableDefaultShaders = false;
-        g_shaderLanguage = SHADERLANGUAGE_QUAKE4;
-        g_useShaderList = false;
-        g_bitmapModule = dependencies.getBitmapModule().getTable();
-        Shaders_Construct();
-        m_shadersquake4 = &GetShaderSystem();
-    }
-
-    ~ShadersQuake4API()
-    {
-        Shaders_Destroy();
-    }
-
-    ShaderSystem *getTable()
-    {
-        return m_shadersquake4;
-    }
+typedef ShaderSystem Type;
+STRING_CONSTANT( Name, "quake4" );
+
+ShadersQuake4API( ShadersDependencies& dependencies ){
+       g_shadersExtension = "mtr";
+       g_shadersDirectory = "materials/";
+       g_enableDefaultShaders = false;
+       g_shaderLanguage = SHADERLANGUAGE_QUAKE4;
+       g_useShaderList = false;
+       g_bitmapModule = dependencies.getBitmapModule().getTable();
+       Shaders_Construct();
+       m_shadersquake4 = &GetShaderSystem();
+}
+~ShadersQuake4API(){
+       Shaders_Destroy();
+}
+ShaderSystem* getTable(){
+       return m_shadersquake4;
+}
 };
 
 typedef SingletonModule<ShadersQuake4API, ShadersDependencies, DependenciesAPIConstructor<ShadersQuake4API, ShadersDependencies> > ShadersQuake4Module;
@@ -150,11 +133,11 @@ typedef SingletonModule<ShadersQuake4API, ShadersDependencies, DependenciesAPICo
 ShadersQuake4Module g_ShadersQuake4Module;
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer &server)
-{
-    initialiseModule(server);
 
-    g_ShadersQ3Module.selfRegister();
-    g_ShadersDoom3Module.selfRegister();
-    g_ShadersQuake4Module.selfRegister();
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+       initialiseModule( server );
+
+       g_ShadersQ3Module.selfRegister();
+       g_ShadersDoom3Module.selfRegister();
+       g_ShadersQuake4Module.selfRegister();
 }