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

[xonotic/netradiant.git] / contrib / prtview / portals.h

diff --git a/contrib/prtview/portals.h b/contrib/prtview/portals.h
index b3d290528824f1b67ed11f204cba29148c3a72a6..4865108855fd835a0cdef9322c8c409ef98d093f 100644 (file)
--- a/contrib/prtview/portals.h
+++ b/contrib/prtview/portals.h
@@ -28,29 +28,28 @@
 
 class CBspPoint {
 public:
-    float p[3];
+float p[3];
 };
 
 class CBspPortal {
 public:
-    CBspPortal();
-
-    ~CBspPortal();
+CBspPortal();
+~CBspPortal();
 
 protected:
 
 public:
-    CBspPoint center;
-    unsigned point_count;
-    CBspPoint *point;
-    CBspPoint *inner_point;
-    float fp_color_random[4];
-    float min[3];
-    float max[3];
-    float dist;
-    bool hint;
-
-    bool Build(char *def);
+CBspPoint center;
+unsigned point_count;
+CBspPoint *point;
+CBspPoint *inner_point;
+float fp_color_random[4];
+float min[3];
+float max[3];
+float dist;
+bool hint;
+
+bool Build( char *def );
 };
 
 #ifdef PATH_MAX
@@ -59,101 +58,101 @@ const int PRTVIEW_PATH_MAX = PATH_MAX;
 const int PRTVIEW_PATH_MAX = 260;
 #endif
 typedef guint32 PackedColour;
-#define RGB(r, g, b) ( (guint32)( ( (guint8) ( r ) | ( (guint16) ( g ) << 8 ) ) | ( ( (guint32) (guint8) ( b ) ) << 16 ) ) )
-#define GetRValue(rgb)      ( (guint8)( rgb ) )
-#define GetGValue(rgb)      ( (guint8)( ( (guint16)( rgb ) ) >> 8 ) )
-#define GetBValue(rgb)      ( (guint8)( ( rgb ) >> 16 ) )
+#define RGB( r, g, b ) ( (guint32)( ( (guint8) ( r ) | ( (guint16) ( g ) << 8 ) ) | ( ( (guint32) (guint8) ( b ) ) << 16 ) ) )
+#define GetRValue( rgb )      ( (guint8)( rgb ) )
+#define GetGValue( rgb )      ( (guint8)( ( (guint16)( rgb ) ) >> 8 ) )
+#define GetBValue( rgb )      ( (guint8)( ( rgb ) >> 16 ) )
 
 
 class CPortals {
 public:
 
-    CPortals();
-
-    ~CPortals();
+CPortals();
+~CPortals();
 
 protected:
 
 
 public:
 
-    void Load();     // use filename in fn
-    void Purge();
-
-    void FixColors();
-
-    char fn[PRTVIEW_PATH_MAX];
-
-    int zbuffer;
-    int polygons;
-    int lines;
-    bool show_3d;
-    bool aa_3d;
-    bool fog;
-    PackedColour color_3d;
-    float width_3d;      // in 8'ths
-    float fp_color_3d[4];
-    PackedColour color_fog;
-    float fp_color_fog[4];
-    float trans_3d;
-    float clip_range;
-    bool clip;
-
-    bool show_2d;
-    bool aa_2d;
-    PackedColour color_2d;
-    float width_2d;      // in 8'ths
-    float fp_color_2d[4];
-
-    CBspPortal *portal;
-    int *portal_sort;
-    bool hint_flags;
+void Load();     // use filename in fn
+void Purge();
+
+void FixColors();
+
+char fn[PRTVIEW_PATH_MAX];
+
+int zbuffer;
+int polygons;
+int lines;
+bool show_3d;
+bool aa_3d;
+bool fog;
+PackedColour color_3d;
+float width_3d;      // in 8'ths
+float fp_color_3d[4];
+PackedColour color_fog;
+float fp_color_fog[4];
+float trans_3d;
+float clip_range;
+bool clip;
+
+bool show_2d;
+bool aa_2d;
+PackedColour color_2d;
+float width_2d;      // in 8'ths
+float fp_color_2d[4];
+
+CBspPortal *portal;
+int *portal_sort;
+bool hint_flags;
 //     CBspNode *node;
 
-    unsigned int node_count;
-    unsigned int portal_count;
+unsigned int node_count;
+unsigned int portal_count;
 };
 
-class CubicClipVolume {
+class CubicClipVolume
+{
 public:
-    Vector3 cam, min, max;
+Vector3 cam, min, max;
 };
 
-class CPortalsDrawSolid : public OpenGLRenderable {
+class CPortalsDrawSolid : public OpenGLRenderable
+{
 public:
-    mutable CubicClipVolume clip;
-
-    void render(RenderStateFlags state) const;
+mutable CubicClipVolume clip;
+void render( RenderStateFlags state ) const;
 };
 
-class CPortalsDrawSolidOutline : public OpenGLRenderable {
+class CPortalsDrawSolidOutline : public OpenGLRenderable
+{
 public:
-    mutable CubicClipVolume clip;
-
-    void render(RenderStateFlags state) const;
+mutable CubicClipVolume clip;
+void render( RenderStateFlags state ) const;
 };
 
-class CPortalsDrawWireframe : public OpenGLRenderable {
+class CPortalsDrawWireframe : public OpenGLRenderable
+{
 public:
-    void render(RenderStateFlags state) const;
+void render( RenderStateFlags state ) const;
 };
 
-class CPortalsRender : public Renderable {
+class CPortalsRender : public Renderable
+{
 public:
-    CPortalsDrawSolid m_drawSolid;
-    CPortalsDrawSolidOutline m_drawSolidOutline;
-    CPortalsDrawWireframe m_drawWireframe;
-
-    void renderSolid(Renderer &renderer, const VolumeTest &volume) const;
+CPortalsDrawSolid m_drawSolid;
+CPortalsDrawSolidOutline m_drawSolidOutline;
+CPortalsDrawWireframe m_drawWireframe;
 
-    void renderWireframe(Renderer &renderer, const VolumeTest &volume) const;
+void renderSolid( Renderer& renderer, const VolumeTest& volume ) const;
+void renderWireframe( Renderer& renderer, const VolumeTest& volume ) const;
 };
 
 extern CPortals portals;
 extern CPortalsRender render;
 
 void Portals_constructShaders();
-
 void Portals_destroyShaders();
 
 void Portals_shadersChanged();