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

[xonotic/netradiant.git] / contrib / bobtoolz / DPatch.h

diff --git a/contrib/bobtoolz/DPatch.h b/contrib/bobtoolz/DPatch.h
index e60b1c07a24a34e5e806a1f4c4d98fb7fb1837c1..4d0c26c5718acdad9708811fe1ca654e4dce3a34 100644 (file)
--- a/contrib/bobtoolz/DPatch.h
+++ b/contrib/bobtoolz/DPatch.h
@@ -27,23 +27,24 @@
 #include <list>
 #include <stdlib.h>
 
-typedef struct {
-    bool mergable;
-    int pos1;
-    int pos2;
+typedef struct
+{
+       bool mergable;
+       int pos1;
+       int pos2;
 } patch_merge_t;
 
 typedef struct {
-    float xyz[3];
-    float st[2];
-    float normal[3];
-    float lightmap[2];
+       float xyz[3];
+       float st[2];
+       float normal[3];
+       float lightmap[2];
 } drawVert_t;
 
-namespace scene {
-    class Node;
-
-    class Instance;
+namespace scene
+{
+class Node;
+class Instance;
 }
 
 const int MAX_PATCH_WIDTH = 32;
@@ -51,42 +52,29 @@ const int MAX_PATCH_HEIGHT = 32;
 const int MIN_PATCH_WIDTH = 3;
 const int MIN_PATCH_HEIGHT = 3;
 
-class DPatch {
+class DPatch
+{
 public:
-    std::list<DPatch> SplitRows();
-
-    std::list<DPatch> SplitCols();
-
-    std::list<DPatch> Split();
-
-    void Transpose();
-
+std::list<DPatch> SplitRows();
+std::list<DPatch> SplitCols();
+std::list<DPatch> Split();
+void Transpose();
 //DPatch* TransposePatch(DPatch* p1);
 //void DebugPrint();
-    void Invert();
-
-    DPatch *MergePatches(patch_merge_t merge_info, DPatch *p1, DPatch *p2);
-
-    patch_merge_t IsMergable(DPatch *other);
-
-    bool ResetTextures(const char *oldTextureName, const char *newTextureName);
-
-    scene::Node *QER_entity;
-    scene::Node *QER_brush;
-
-    void LoadFromPatch(scene::Instance &patch);
-
-    void BuildInRadiant(scene::Node *entity = NULL);
-
-    void SetTexture(const char *textureName);
-
-    char texture[256];
-    int width, height;
-    drawVert_t points[MAX_PATCH_WIDTH][MAX_PATCH_HEIGHT];
-
-    DPatch();
-
-    virtual ~DPatch();
+void Invert();
+DPatch* MergePatches( patch_merge_t merge_info, DPatch* p1, DPatch* p2 );
+patch_merge_t IsMergable( DPatch* other );
+bool ResetTextures( const char *oldTextureName, const char *newTextureName );
+scene::Node* QER_entity;
+scene::Node* QER_brush;
+void LoadFromPatch( scene::Instance& patch );
+void BuildInRadiant( scene::Node* entity = NULL );
+void SetTexture( const char* textureName );
+char texture[256];
+int width, height;
+drawVert_t points[MAX_PATCH_WIDTH][MAX_PATCH_HEIGHT];
+DPatch();
+virtual ~DPatch();
 
 };