* fixed a lot of compiler warnings (mostly const char * stuff and use of uninitialize...

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

diff --git a/contrib/bobtoolz/DBrush.h b/contrib/bobtoolz/DBrush.h
index 112f22940791136057d3bee51a2a65b0db5a6df3..65013dccf5aa0eafe740e73b0dbf819a073dd4a7 100644 (file)
--- a/contrib/bobtoolz/DBrush.h
+++ b/contrib/bobtoolz/DBrush.h
@@ -24,34 +24,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #if !defined(AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_)
 #define AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include <stdio.h>
-#include <list>
-#include "mathlib.h"
-#include "str.h"
-
-class DPlane;
-class DWinding;
-class DPoint;
-class _QERFaceData;
-
-namespace scene
-{
-  class Node;
-  class Instance;
-}
+#include "DPlane.h"
 
 #define POINT_IN_BRUSH 0
 #define POINT_ON_BRUSH 1
 #define POINT_OUT_BRUSH        2
 
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
 class DBrush  
 {
 public:
-       DPlane* AddFace(const vec3_t va, const vec3_t vb, const vec3_t vc, const char* textureName, bool bDetail);
+       DPlane* AddFace(vec3_t va, vec3_t vb, vec3_t vc, const char* textureName, bool bDetail);
        void SaveToFile(FILE* pFile);
 
        void Rotate(vec3_t vOrigin, vec3_t vRotation);
@@ -59,7 +45,7 @@ public:
 
        DPlane* HasPlaneInverted(DPlane* chkPlane);
        DPlane* HasPlane(DPlane* chkPlane);
-       DPlane* AddFace(const vec3_t va, const vec3_t vb, const vec3_t vc, const _QERFaceData* texData);
+       DPlane* AddFace(vec3_t va, vec3_t vb, vec3_t vc, _QERFaceData* texData);
 
        bool ResetTextures(const char* textureName, float fScale[2], float fShift[2], int rotation, const char* newTextureName, int bResetTextureName, int bResetScale[2], int bResetShift[2], int bResetRotation);
        bool IsDetail();
@@ -75,9 +61,9 @@ public:
        int BuildPoints();
        void BuildBounds();
        void BuildFromWinding(DWinding* w);
-  scene::Node* BuildInRadiant(bool allowDestruction, int* changeCnt, scene::Node* entity = NULL);
+       brush_t* BuildInRadiant(bool allowDestruction, int* changeCnt, entity_t* entity = NULL);
 
-       void ResetChecks(std::list<Str>* exclusionList);
+       void ResetChecks(list<Str>* exclusionList);
 
        void ClearFaces();
        void ClearPoints();
@@ -85,11 +71,12 @@ public:
        int RemoveRedundantPlanes( void );
        void RemovePlane( DPlane* plane );
        int PointPosition(vec3_t pnt);
+       void RemoveFromRadiant( void );
 
        
        void CutByPlane(DPlane* cutPlane, DBrush** newBrush1, DBrush** newBrush2);
 
-       void LoadFromBrush(scene::Instance& brush, bool textured);
+       void LoadFromBrush_t(brush_t* brush, bool textured);
        void AddPoint(vec3_t pnt);
 
        DPlane* FindPlaneWithClosestNormal( vec_t* normal );
@@ -101,10 +88,9 @@ public:
        bool operator== (DBrush* other);
 
 //     members
-  scene::Node* QER_entity;
-  scene::Node* QER_brush;
-       std::list<DPlane*> faceList;
-       std::list<DPoint*> pointList;
+       brush_t* QER_brush;
+       list<DPlane*> faceList;
+       list<DPoint*> pointList;
        int m_nBrushID;
        vec3_t bbox_min, bbox_max;
        bool bBoundsBuilt;