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

[xonotic/netradiant.git] / radiant / patchmodule.cpp

diff --git a/radiant/patchmodule.cpp b/radiant/patchmodule.cpp
index c257dc652174494c18a0e9233ea4e22fe9a8e729..7f273591a9947346c4829d31561f711d36996a75 100644 (file)
--- a/radiant/patchmodule.cpp
+++ b/radiant/patchmodule.cpp
@@ -27,221 +27,196 @@
 #include "patch.h"
 #include "patchmanip.h"
 
-namespace {
-    std::size_t g_patchModuleCount = 0;
+namespace
+{
+std::size_t g_patchModuleCount = 0;
 }
 
-void Patch_Construct(EPatchType type)
-{
-    if (++g_patchModuleCount != 1) {
-        return;
-    }
+void Patch_Construct( EPatchType type ){
+       if ( ++g_patchModuleCount != 1 ) {
+               return;
+       }
 
-    PatchFilters_construct();
+       PatchFilters_construct();
 
-    PatchPreferences_construct();
+       PatchPreferences_construct();
 
-    Patch_registerPreferencesPage();
+       Patch_registerPreferencesPage();
 
-    Patch::constructStatic(type);
-    PatchInstance::constructStatic();
+       Patch::constructStatic( type );
+       PatchInstance::constructStatic();
 
-    if (type == ePatchTypeDoom3) {
-        MAX_PATCH_WIDTH = MAX_PATCH_HEIGHT = 99;
-    } else {
-        MAX_PATCH_WIDTH = MAX_PATCH_HEIGHT = 31; // matching q3map2
-    }
+       if ( type == ePatchTypeDoom3 ) {
+               MAX_PATCH_WIDTH = MAX_PATCH_HEIGHT = 99;
+       }
+       else
+       {
+               MAX_PATCH_WIDTH = MAX_PATCH_HEIGHT = 31; // matching q3map2
+       }
 }
 
-void Patch_Destroy()
-{
-    if (--g_patchModuleCount != 0) {
-        return;
-    }
+void Patch_Destroy(){
+       if ( --g_patchModuleCount != 0 ) {
+               return;
+       }
 
-    Patch::destroyStatic();
-    PatchInstance::destroyStatic();
+       Patch::destroyStatic();
+       PatchInstance::destroyStatic();
 }
 
-class CommonPatchCreator : public PatchCreator {
+class CommonPatchCreator : public PatchCreator
+{
 public:
-    void Patch_undoSave(scene::Node &patch) const
-    {
-        Node_getPatch(patch)->undoSave();
-    }
-
-    void Patch_resize(scene::Node &patch, std::size_t width, std::size_t height) const
-    {
-        Node_getPatch(patch)->setDims(width, height);
-    }
-
-    PatchControlMatrix Patch_getControlPoints(scene::Node &node) const
-    {
-        Patch &patch = *Node_getPatch(node);
-        return PatchControlMatrix(patch.getHeight(), patch.getWidth(), patch.getControlPoints().data());
-    }
-
-    void Patch_controlPointsChanged(scene::Node &patch) const
-    {
-        return Node_getPatch(patch)->controlPointsChanged();
-    }
-
-    const char *Patch_getShader(scene::Node &patch) const
-    {
-        return Node_getPatch(patch)->GetShader();
-    }
-
-    void Patch_setShader(scene::Node &patch, const char *shader) const
-    {
-        Node_getPatch(patch)->SetShader(shader);
-    }
+void Patch_undoSave( scene::Node& patch ) const {
+       Node_getPatch( patch )->undoSave();
+}
+void Patch_resize( scene::Node& patch, std::size_t width, std::size_t height ) const {
+       Node_getPatch( patch )->setDims( width, height );
+}
+PatchControlMatrix Patch_getControlPoints( scene::Node& node ) const {
+       Patch& patch = *Node_getPatch( node );
+       return PatchControlMatrix( patch.getHeight(), patch.getWidth(), patch.getControlPoints().data() );
+}
+void Patch_controlPointsChanged( scene::Node& patch ) const {
+       return Node_getPatch( patch )->controlPointsChanged();
+}
+const char* Patch_getShader( scene::Node& patch ) const {
+       return Node_getPatch( patch )->GetShader();
+}
+void Patch_setShader( scene::Node& patch, const char* shader ) const {
+       Node_getPatch( patch )->SetShader( shader );
+}
 };
 
-class Quake3PatchCreator : public CommonPatchCreator {
+class Quake3PatchCreator : public CommonPatchCreator
+{
 public:
-    scene::Node &createPatch()
-    {
-        return (new PatchNodeQuake3())->node();
-    }
+scene::Node& createPatch(){
+       return ( new PatchNodeQuake3() )->node();
+}
 };
 
 Quake3PatchCreator g_Quake3PatchCreator;
 
-PatchCreator &GetQuake3PatchCreator()
-{
-    return g_Quake3PatchCreator;
+PatchCreator& GetQuake3PatchCreator(){
+       return g_Quake3PatchCreator;
 }
 
-class Doom3PatchCreator : public CommonPatchCreator {
+class Doom3PatchCreator : public CommonPatchCreator
+{
 public:
-    scene::Node &createPatch()
-    {
-        return (new PatchNodeDoom3(true))->node();
-    }
+scene::Node& createPatch(){
+       return ( new PatchNodeDoom3( true ) )->node();
+}
 };
 
 Doom3PatchCreator g_Doom3PatchCreator;
 
-PatchCreator &GetDoom3PatchCreator()
-{
-    return g_Doom3PatchCreator;
+PatchCreator& GetDoom3PatchCreator(){
+       return g_Doom3PatchCreator;
 }
 
-class Doom3PatchDef2Creator : public CommonPatchCreator {
+class Doom3PatchDef2Creator : public CommonPatchCreator
+{
 public:
-    scene::Node &createPatch()
-    {
-        return (new PatchNodeDoom3())->node();
-    }
+scene::Node& createPatch(){
+       return ( new PatchNodeDoom3() )->node();
+}
 };
 
 Doom3PatchDef2Creator g_Doom3PatchDef2Creator;
 
-PatchCreator &GetDoom3PatchDef2Creator()
-{
-    return g_Doom3PatchDef2Creator;
+PatchCreator& GetDoom3PatchDef2Creator(){
+       return g_Doom3PatchDef2Creator;
 }
 
 #include "modulesystem/singletonmodule.h"
 #include "modulesystem/moduleregistry.h"
 
 class PatchDependencies :
-        public GlobalRadiantModuleRef,
-        public GlobalSceneGraphModuleRef,
-        public GlobalShaderCacheModuleRef,
-        public GlobalSelectionModuleRef,
-        public GlobalOpenGLModuleRef,
-        public GlobalUndoModuleRef,
-        public GlobalFilterModuleRef {
+       public GlobalRadiantModuleRef,
+       public GlobalSceneGraphModuleRef,
+       public GlobalShaderCacheModuleRef,
+       public GlobalSelectionModuleRef,
+       public GlobalOpenGLModuleRef,
+       public GlobalUndoModuleRef,
+       public GlobalFilterModuleRef
+{
 };
 
-class PatchQuake3API : public TypeSystemRef {
-    PatchCreator *m_patchquake3;
+class PatchQuake3API : public TypeSystemRef
+{
+PatchCreator* m_patchquake3;
 public:
-    typedef PatchCreator Type;
+typedef PatchCreator Type;
+STRING_CONSTANT( Name, "quake3" );
 
-    STRING_CONSTANT(Name, "quake3");
+PatchQuake3API(){
+       Patch_Construct( ePatchTypeQuake3 );
 
-    PatchQuake3API()
-    {
-        Patch_Construct(ePatchTypeQuake3);
-
-        m_patchquake3 = &GetQuake3PatchCreator();
-        g_patchCreator = m_patchquake3;
-    }
-
-    ~PatchQuake3API()
-    {
-        Patch_Destroy();
-    }
-
-    PatchCreator *getTable()
-    {
-        return m_patchquake3;
-    }
+       m_patchquake3 = &GetQuake3PatchCreator();
+       g_patchCreator = m_patchquake3;
+}
+~PatchQuake3API(){
+       Patch_Destroy();
+}
+PatchCreator* getTable(){
+       return m_patchquake3;
+}
 };
 
 typedef SingletonModule<PatchQuake3API, PatchDependencies> PatchQuake3Module;
 typedef Static<PatchQuake3Module> StaticPatchQuake3Module;
-StaticRegisterModule staticRegisterPatchQuake3(StaticPatchQuake3Module::instance());
+StaticRegisterModule staticRegisterPatchQuake3( StaticPatchQuake3Module::instance() );
 
 
-class PatchDoom3API : public TypeSystemRef {
-    PatchCreator *m_patchdoom3;
-public:
-    typedef PatchCreator Type;
-
-    STRING_CONSTANT(Name, "doom3");
-
-    PatchDoom3API()
-    {
-        Patch_Construct(ePatchTypeDoom3);
 
-        m_patchdoom3 = &GetDoom3PatchCreator();
-    }
+class PatchDoom3API : public TypeSystemRef
+{
+PatchCreator* m_patchdoom3;
+public:
+typedef PatchCreator Type;
+STRING_CONSTANT( Name, "doom3" );
 
-    ~PatchDoom3API()
-    {
-        Patch_Destroy();
-    }
+PatchDoom3API(){
+       Patch_Construct( ePatchTypeDoom3 );
 
-    PatchCreator *getTable()
-    {
-        return m_patchdoom3;
-    }
+       m_patchdoom3 = &GetDoom3PatchCreator();
+}
+~PatchDoom3API(){
+       Patch_Destroy();
+}
+PatchCreator* getTable(){
+       return m_patchdoom3;
+}
 };
 
 typedef SingletonModule<PatchDoom3API, PatchDependencies> PatchDoom3Module;
 typedef Static<PatchDoom3Module> StaticPatchDoom3Module;
-StaticRegisterModule staticRegisterPatchDoom3(StaticPatchDoom3Module::instance());
+StaticRegisterModule staticRegisterPatchDoom3( StaticPatchDoom3Module::instance() );
 
 
-class PatchDef2Doom3API : public TypeSystemRef {
-    PatchCreator *m_patchdef2doom3;
+class PatchDef2Doom3API : public TypeSystemRef
+{
+PatchCreator* m_patchdef2doom3;
 public:
-    typedef PatchCreator Type;
-
-    STRING_CONSTANT(Name, "def2doom3");
+typedef PatchCreator Type;
+STRING_CONSTANT( Name, "def2doom3" );
 
-    PatchDef2Doom3API()
-    {
-        Patch_Construct(ePatchTypeDoom3);
+PatchDef2Doom3API(){
+       Patch_Construct( ePatchTypeDoom3 );
 
-        m_patchdef2doom3 = &GetDoom3PatchDef2Creator();
-        g_patchCreator = m_patchdef2doom3;
-    }
-
-    ~PatchDef2Doom3API()
-    {
-        Patch_Destroy();
-    }
-
-    PatchCreator *getTable()
-    {
-        return m_patchdef2doom3;
-    }
+       m_patchdef2doom3 = &GetDoom3PatchDef2Creator();
+       g_patchCreator = m_patchdef2doom3;
+}
+~PatchDef2Doom3API(){
+       Patch_Destroy();
+}
+PatchCreator* getTable(){
+       return m_patchdef2doom3;
+}
 };
 
 typedef SingletonModule<PatchDef2Doom3API, PatchDependencies> PatchDef2Doom3Module;
 typedef Static<PatchDef2Doom3Module> StaticPatchDef2Doom3Module;
-StaticRegisterModule staticRegisterPatchDef2Doom3(StaticPatchDef2Doom3Module::instance());
+StaticRegisterModule staticRegisterPatchDef2Doom3( StaticPatchDef2Doom3Module::instance() );