my own uncrustify run

This commit is contained in:
Rudolf Polzer
2012-03-27 12:03:21 +02:00
parent 203343b01a
commit e4287c28bb
1056 changed files with 194610 additions and 205971 deletions

View File

@@ -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");
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;
}
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");
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;
}
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");
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;
}
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();
}

View File

@@ -1,25 +1,25 @@
/*
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
*/
#if !defined(INCLUDED_PLUGIN_H)
#if !defined( INCLUDED_PLUGIN_H )
#define INCLUDED_PLUGIN_H
#endif

File diff suppressed because it is too large Load Diff

View File

@@ -1,34 +1,34 @@
/*
Copyright (c) 2001, Loki software, inc.
All rights reserved.
Copyright (c) 2001, Loki software, inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
Neither the name of Loki software nor the names of its contributors may be used
to endorse or promote products derived from this software without specific prior
written permission.
Neither the name of Loki software nor the names of its contributors may be used
to endorse or promote products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !defined(INCLUDED_SHADERS_H)
#if !defined( INCLUDED_SHADERS_H )
#define INCLUDED_SHADERS_H
void Shaders_Construct();
@@ -38,9 +38,9 @@ ShaderSystem& GetShaderSystem();
enum ShaderLanguage
{
SHADERLANGUAGE_QUAKE3,
SHADERLANGUAGE_DOOM3,
SHADERLANGUAGE_QUAKE4
SHADERLANGUAGE_QUAKE3,
SHADERLANGUAGE_DOOM3,
SHADERLANGUAGE_QUAKE4
};
extern const char* g_shadersExtension;