Merge branch 'master' into divVerent/farplanedist-sky-fix

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

diff --git a/plugins/shaders/plugin.cpp b/plugins/shaders/plugin.cpp
index 6ef23c372b60d942f12559e0d37ac5057c2a92ce..3f2cc48351fc6d4780ef16caa5a7d209ac9ece4d 100644 (file)
--- a/plugins/shaders/plugin.cpp
+++ b/plugins/shaders/plugin.cpp
@@ -1,23 +1,23 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include "plugin.h"
 
@@ -33,46 +33,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "shaders.h"
 
 class ShadersDependencies :
-  public GlobalFileSystemModuleRef,
-  public GlobalTexturesModuleRef,
-  public GlobalScripLibModuleRef,
-  public GlobalRadiantModuleRef
+       public GlobalFileSystemModuleRef,
+       public GlobalTexturesModuleRef,
+       public GlobalScripLibModuleRef,
+       public GlobalRadiantModuleRef
 {
-  ImageModuleRef m_bitmapModule;
+ImageModuleRef m_bitmapModule;
 public:
-  ShadersDependencies() :
-    m_bitmapModule("bmp")
-  {
-  }
-  ImageModuleRef& getBitmapModule()
-  {
-    return m_bitmapModule;
-  }
+ShadersDependencies() :
+       m_bitmapModule( "bmp" ){
+}
+ImageModuleRef& getBitmapModule(){
+       return m_bitmapModule;
+}
 };
 
 class ShadersQ3API
 {
-  ShaderSystem* m_shadersq3;
+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;
@@ -82,30 +77,27 @@ ShadersQ3Module g_ShadersQ3Module;
 
 class ShadersDoom3API
 {
-  ShaderSystem* m_shadersdoom3;
+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,30 +107,27 @@ ShadersDoom3Module g_ShadersDoom3Module;
 
 class ShadersQuake4API
 {
-  ShaderSystem* m_shadersquake4;
+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;
@@ -147,11 +136,10 @@ ShadersQuake4Module g_ShadersQuake4Module;
 
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
-{
-  initialiseModule(server);
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+       initialiseModule( server );
 
-  g_ShadersQ3Module.selfRegister();
-  g_ShadersDoom3Module.selfRegister();
-  g_ShadersQuake4Module.selfRegister();
+       g_ShadersQ3Module.selfRegister();
+       g_ShadersDoom3Module.selfRegister();
+       g_ShadersQuake4Module.selfRegister();
 }