mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2024-11-10 07:11:54 +00:00
8aeff6b09a
The STL now defines `std::byte` so doing `using namespace std`
will conflict will custom definition of `byte`, which this
legacy code is full of.
It looks like NetRadiant went the route of making explicit
usage of `std::` prefixed types and did not renamed the
custom definition of byte, so doing the same reduces diff
noise between the two trees.
This also makes the code future proof if the STL decides
to define some other types with common name.
This patches replaces all usages of `map`, `pair` and
`vector` with `std::map`, `std::pair` and `std::vector`
and remove the `using namespace std` line in `stl_check.h`.
```
libs/mathlib.h:132:44: error: reference to ‘byte’ is ambiguous
132 | void NormalToLatLong( const vec3_t normal, byte bytes[2] );
| ^~~~
In file included from /usr/include/c++/11/bits/stl_algobase.h:61,
from /usr/include/c++/11/bits/char_traits.h:39,
from /usr/include/c++/11/ios:40,
from /usr/include/c++/11/ostream:38,
from /usr/include/c++/11/iostream:39,
from libs/missing.h:76,
from radiant/qe3.h:40,
from radiant/stdafx.h:39,
from radiant/bp_dlg.cpp:28:
/usr/include/c++/11/bits/cpp_type_traits.h:404:30: note: candidates are: ‘enum class std::byte’
404 | enum class byte : unsigned char;
| ^~~~
```
101 lines
3.2 KiB
C++
101 lines
3.2 KiB
C++
/*
|
|
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
|
|
*/
|
|
|
|
// DBrush.h: interface for the DBrush class.
|
|
//
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
#if !defined( AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_ )
|
|
#define AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_
|
|
|
|
#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( 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 );
|
|
void RotateAboutCentre( vec3_t vRotation );
|
|
|
|
DPlane* HasPlaneInverted( DPlane* chkPlane );
|
|
DPlane* HasPlane( DPlane* chkPlane );
|
|
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();
|
|
bool HasTexture( const char* textureName );
|
|
bool IntersectsWith( DBrush *chkBrush );
|
|
bool IntersectsWith( DPlane* p1, DPlane* p2, vec3_t v );
|
|
bool IsCutByPlane( DPlane* cuttingPlane );
|
|
bool GetBounds( vec3_t min, vec3_t max );
|
|
bool HasPoint( vec3_t pnt );
|
|
bool BBoxCollision( DBrush* chkBrush );
|
|
bool BBoxTouch( DBrush* chkBrush );
|
|
|
|
int BuildPoints();
|
|
void BuildBounds();
|
|
void BuildFromWinding( DWinding* w );
|
|
brush_t* BuildInRadiant( bool allowDestruction, int* changeCnt, entity_t* entity = NULL );
|
|
|
|
void ResetChecks( std::list<Str>* exclusionList );
|
|
|
|
void ClearFaces();
|
|
void ClearPoints();
|
|
|
|
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_t( brush_t* brush, bool textured );
|
|
void AddPoint( vec3_t pnt );
|
|
|
|
DPlane* FindPlaneWithClosestNormal( vec_t* normal );
|
|
int FindPointsForPlane( DPlane* plane, DPoint** pnts, int maxpnts );
|
|
|
|
DBrush( int ID = -1 );
|
|
virtual ~DBrush();
|
|
|
|
bool operator==( DBrush* other );
|
|
|
|
// members
|
|
brush_t* QER_brush;
|
|
std::list<DPlane*> faceList;
|
|
std::list<DPoint*> pointList;
|
|
int m_nBrushID;
|
|
vec3_t bbox_min, bbox_max;
|
|
bool bBoundsBuilt;
|
|
};
|
|
|
|
//typedef CList<DBrush*, DBrush*> DBrushList;
|
|
|
|
#endif // !defined(AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_)
|