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; | ^~~~ ```
67 lines
2 KiB
C++
67 lines
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
|
|
*/
|
|
|
|
// 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 "DPoint.h"
|
|
|
|
#define FACE_DETAIL 0x8000000
|
|
|
|
#if _MSC_VER > 1000
|
|
#pragma once
|
|
#endif // _MSC_VER > 1000
|
|
|
|
class DWinding;
|
|
|
|
class DPlane
|
|
{
|
|
public:
|
|
DPlane( vec3_t va, vec3_t vb, vec3_t vc, const char* textureName, bool bDetail );
|
|
void ScaleTexture();
|
|
DWinding* BaseWindingForPlane();
|
|
|
|
void Rebuild();
|
|
|
|
bool AddToBrush_t( brush_t *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( vec3_t va, vec3_t vb, vec3_t vc, _QERFaceData* texData );
|
|
DPlane() { }
|
|
virtual ~DPlane();
|
|
|
|
bool m_bChkOk;
|
|
_QERFaceData texInfo;
|
|
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_)
|