Remove -Wno-pedantic

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

diff --git a/contrib/bobtoolz/DPlane.h b/contrib/bobtoolz/DPlane.h
index 4399b8418e174efc0d2c2c7eb4834cbbc075d7e4..88a33584622747152ebee554a882ebc10f36f4b7 100644 (file)
--- a/contrib/bobtoolz/DPlane.h
+++ b/contrib/bobtoolz/DPlane.h
@@ -1,67 +1,74 @@
-/*\r
-BobToolz plugin for GtkRadiant\r
-Copyright (C) 2001 Gordon Biggans\r
-\r
-This library is free software; you can redistribute it and/or\r
-modify it under the terms of the GNU Lesser General Public\r
-License as published by the Free Software Foundation; either\r
-version 2.1 of the License, or (at your option) any later version.\r
-\r
-This library is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-Lesser General Public License for more details.\r
-\r
-You should have received a copy of the GNU Lesser General Public\r
-License along with this library; if not, write to the Free Software\r
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
-*/\r
-\r
-// DPlane.h: interface for the DPlane class.\r
-//\r
-//////////////////////////////////////////////////////////////////////\r
-\r
-#if !defined(AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_)\r
-#define AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_\r
-\r
-#include "DPoint.h"\r
-\r
-#define FACE_DETAIL 0x8000000\r
-\r
-#if _MSC_VER > 1000\r
-#pragma once\r
-#endif // _MSC_VER > 1000\r
-\r
-class DWinding;\r
-\r
-class DPlane  \r
-{\r
-public:\r
-       DPlane(vec3_t va, vec3_t vb, vec3_t vc, const char* textureName, bool bDetail);\r
-       void ScaleTexture();\r
-       DWinding* BaseWindingForPlane();\r
-\r
-       void Rebuild();\r
-\r
-       bool AddToBrush_t(brush_t *brush);\r
-       bool operator != (DPlane& other);\r
-       bool operator == (DPlane& other);\r
-\r
-       bool IsRedundant(list<DPoint*>& pointList);\r
-       bool PlaneIntersection(DPlane* pl1, DPlane* pl2, vec3_t out);;\r
-\r
-       vec_t DistanceToPoint(vec3_t pnt);\r
-\r
-       DPlane(vec3_t va, vec3_t vb, vec3_t vc, _QERFaceData* texData);\r
-       DPlane() { }\r
-       virtual ~DPlane();\r
-\r
-       bool m_bChkOk;\r
-       _QERFaceData texInfo;\r
-       vec3_t points[3];               // djbob:do we really need these any more?\r
-       vec3_t normal;\r
-       float _d;\r
-};\r
-\r
-//typedef CList<DPlane*, DPlane*> DPlaneList;\r
-#endif // !defined(AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_)\r
+/*
+   BobToolz plugin for GtkRadiant
+   Copyright (C) 2001 Gordon Biggans
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+// DPlane.h: interface for the DPlane class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined( AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_ )
+#define AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_
+
+#include <list>
+#include "ibrush.h"
+#include "string/string.h"
+#include "mathlib.h"
+
+class Brush;
+class DPoint;
+
+#define FACE_DETAIL 0x8000000
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+class DWinding;
+
+class DPlane
+{
+public:
+DPlane( const vec3_t va, const vec3_t vb, const vec3_t vc, const char* textureName, bool bDetail );
+void ScaleTexture();
+DWinding* BaseWindingForPlane();
+
+void Rebuild();
+
+bool AddToBrush( scene::Node& brush );
+bool operator !=( DPlane& other );
+bool operator ==( DPlane& other );
+
+bool IsRedundant( std::list<DPoint*>& pointList );
+bool PlaneIntersection( DPlane* pl1, DPlane* pl2, vec3_t out );
+
+vec_t DistanceToPoint( vec3_t pnt );
+
+DPlane( const vec3_t va, const vec3_t vb, const vec3_t vc, const _QERFaceData* texData );
+DPlane() { }
+virtual ~DPlane();
+
+bool m_bChkOk;
+_QERFaceData texInfo;
+CopiedString m_shader;
+vec3_t points[3];           // djbob:do we really need these any more?
+vec3_t normal;
+float _d;
+};
+
+//typedef CList<DPlane*, DPlane*> DPlaneList;
+#endif // !defined(AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_)