my own uncrustify run
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -35,59 +35,51 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
class MapXMLDependencies :
|
||||
public GlobalRadiantModuleRef,
|
||||
public GlobalBrushModuleRef,
|
||||
public GlobalFiletypesModuleRef,
|
||||
public GlobalEntityClassManagerModuleRef,
|
||||
public GlobalSceneGraphModuleRef
|
||||
public GlobalRadiantModuleRef,
|
||||
public GlobalBrushModuleRef,
|
||||
public GlobalFiletypesModuleRef,
|
||||
public GlobalEntityClassManagerModuleRef,
|
||||
public GlobalSceneGraphModuleRef
|
||||
{
|
||||
PatchModuleRef m_patchDef2Doom3Module;
|
||||
PatchModuleRef m_patchDoom3Module;
|
||||
PatchModuleRef m_patchDef2Doom3Module;
|
||||
PatchModuleRef m_patchDoom3Module;
|
||||
public:
|
||||
MapXMLDependencies() :
|
||||
GlobalBrushModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("brushtypes")),
|
||||
GlobalEntityClassManagerModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("entityclass")),
|
||||
m_patchDef2Doom3Module("def2doom3"),
|
||||
m_patchDoom3Module("doom3")
|
||||
{
|
||||
}
|
||||
BrushCreator& getBrushDoom3()
|
||||
{
|
||||
return GlobalBrushModule::getTable();
|
||||
}
|
||||
PatchCreator& getPatchDoom3()
|
||||
{
|
||||
return *m_patchDoom3Module.getTable();
|
||||
}
|
||||
PatchCreator& getPatchDef2Doom3()
|
||||
{
|
||||
return *m_patchDef2Doom3Module.getTable();
|
||||
}
|
||||
MapXMLDependencies() :
|
||||
GlobalBrushModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "brushtypes" ) ),
|
||||
GlobalEntityClassManagerModuleRef( GlobalRadiant().getRequiredGameDescriptionKeyValue( "entityclass" ) ),
|
||||
m_patchDef2Doom3Module( "def2doom3" ),
|
||||
m_patchDoom3Module( "doom3" ){
|
||||
}
|
||||
BrushCreator& getBrushDoom3(){
|
||||
return GlobalBrushModule::getTable();
|
||||
}
|
||||
PatchCreator& getPatchDoom3(){
|
||||
return *m_patchDoom3Module.getTable();
|
||||
}
|
||||
PatchCreator& getPatchDef2Doom3(){
|
||||
return *m_patchDef2Doom3Module.getTable();
|
||||
}
|
||||
};
|
||||
|
||||
class MapXMLAPI : public TypeSystemRef, public MapFormat
|
||||
{
|
||||
public:
|
||||
typedef MapFormat Type;
|
||||
STRING_CONSTANT(Name, "xmldoom3");
|
||||
typedef MapFormat Type;
|
||||
STRING_CONSTANT( Name, "xmldoom3" );
|
||||
|
||||
MapXMLAPI()
|
||||
{
|
||||
GlobalFiletypesModule::getTable().addType(Type::Name(), Name(), filetype_t("xml doom3 maps", "*.xmap"));
|
||||
}
|
||||
MapFormat* getTable()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
MapXMLAPI(){
|
||||
GlobalFiletypesModule::getTable().addType( Type::Name(), Name(), filetype_t( "xml doom3 maps", "*.xmap" ) );
|
||||
}
|
||||
MapFormat* getTable(){
|
||||
return this;
|
||||
}
|
||||
|
||||
void readGraph(scene::Node& root, TextInputStream& inputStream, EntityCreator& entityTable) const
|
||||
{
|
||||
Map_Read(root, inputStream, entityTable);
|
||||
}
|
||||
void writeGraph(scene::Node& root, GraphTraversalFunc traverse, TextOutputStream& outputStream) const
|
||||
{
|
||||
Map_Write(root, traverse, outputStream);
|
||||
}
|
||||
void readGraph( scene::Node& root, TextInputStream& inputStream, EntityCreator& entityTable ) const {
|
||||
Map_Read( root, inputStream, entityTable );
|
||||
}
|
||||
void writeGraph( scene::Node& root, GraphTraversalFunc traverse, TextOutputStream& outputStream ) const {
|
||||
Map_Write( root, traverse, outputStream );
|
||||
}
|
||||
};
|
||||
|
||||
typedef SingletonModule<MapXMLAPI, MapXMLDependencies> MapXMLModule;
|
||||
@@ -96,12 +88,11 @@ MapXMLModule g_MapXMLModule;
|
||||
|
||||
|
||||
|
||||
extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
|
||||
{
|
||||
GlobalErrorStream::instance().setOutputStream(server.getErrorStream());
|
||||
GlobalOutputStream::instance().setOutputStream(server.getOutputStream());
|
||||
GlobalDebugMessageHandler::instance().setHandler(server.getDebugMessageHandler());
|
||||
GlobalModuleServer::instance().set(server);
|
||||
extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
|
||||
GlobalErrorStream::instance().setOutputStream( server.getErrorStream() );
|
||||
GlobalOutputStream::instance().setOutputStream( server.getOutputStream() );
|
||||
GlobalDebugMessageHandler::instance().setHandler( server.getDebugMessageHandler() );
|
||||
GlobalModuleServer::instance().set( server );
|
||||
|
||||
g_MapXMLModule.selfRegister();
|
||||
g_MapXMLModule.selfRegister();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user