mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2025-01-26 03:11:30 +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; | ^~~~ ```
203 lines
5.2 KiB
C++
203 lines
5.2 KiB
C++
/*
|
|
Copyright (C) 1999-2007 id Software, Inc. and contributors.
|
|
For a list of contributors, see the accompanying CONTRIBUTORS file.
|
|
|
|
This file is part of GtkRadiant.
|
|
|
|
GtkRadiant is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GtkRadiant 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GtkRadiant; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "cpicomodel.h"
|
|
#include "cpicosurface.h"
|
|
|
|
CPicoModel::CPicoModel( const PicoModelKey& key )
|
|
: m_refcount( 1 ){
|
|
load( key.first.GetBuffer(), key.second );
|
|
}
|
|
|
|
CPicoModel::CPicoModel( const Str& name )
|
|
: m_refcount( 1 ){
|
|
load( name.GetBuffer(), 0 );
|
|
}
|
|
|
|
CPicoModel::CPicoModel( const Str& name, const int frame )
|
|
: m_refcount( 1 ){
|
|
load( name.GetBuffer(), frame );
|
|
}
|
|
|
|
CPicoModel::CPicoModel( const char *name, const int frame )
|
|
: m_refcount( 1 ){
|
|
load( name, frame );
|
|
}
|
|
|
|
void CPicoModel::load( const char *name, const int frame ){
|
|
CPicoSurface *surf;
|
|
picoSurface_t *pSurface;
|
|
int i;
|
|
|
|
m_name = new char[strlen( name ) + 1];
|
|
strcpy( m_name,name );
|
|
|
|
m_frame = frame;
|
|
|
|
if ( !( m_pModel = PicoLoadModel( m_name, frame ) ) ) {
|
|
int len = strlen( m_name );
|
|
|
|
// Try loading an mdc if md3 fails and vice-versa (fixme: only do this for games with mdc support)
|
|
if ( !strcmp( m_name + len - 4, ".md3" ) ) {
|
|
m_name[len - 1] = 'c';
|
|
m_pModel = PicoLoadModel( m_name, frame );
|
|
}
|
|
else if ( !strcmp( m_name + len - 4, ".mdc" ) ) {
|
|
m_name[len - 1] = '3';
|
|
m_pModel = PicoLoadModel( m_name, frame );
|
|
}
|
|
}
|
|
|
|
if ( m_pModel ) {
|
|
m_children = g_ptr_array_new();
|
|
aabb_clear( &m_BBox );
|
|
for ( i = 0; i < PicoGetModelNumSurfaces( m_pModel ); i++ )
|
|
{
|
|
pSurface = PicoGetModelSurface( m_pModel,i );
|
|
surf = new CPicoSurface( pSurface );
|
|
g_ptr_array_add( m_children, surf );
|
|
aabb_extend_by_aabb( &m_BBox, surf->GetAABB() );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_BBox.origin[0] = m_BBox.origin[1] = m_BBox.origin[2] = 0;
|
|
m_BBox.extents[0] = m_BBox.extents[1] = m_BBox.extents[2] = 0;
|
|
}
|
|
|
|
m_parents = g_ptr_array_new();
|
|
}
|
|
|
|
CPicoModel::~CPicoModel(){
|
|
if ( m_pModel ) {
|
|
for ( unsigned int i = 0; i < m_children->len; i++ )
|
|
( (CPicoSurface*)m_children->pdata[i] )->DecRef();
|
|
g_ptr_array_free( m_children, FALSE );
|
|
}
|
|
g_ptr_array_free( m_parents, FALSE );
|
|
delete [] m_name;
|
|
}
|
|
|
|
void CPicoModel::AddParent( CPicoParent *parent ){
|
|
g_ptr_array_add( m_parents, parent );
|
|
}
|
|
|
|
void CPicoModel::RemoveParent( CPicoParent *parent ){
|
|
unsigned int i;
|
|
for ( i = 0; i < m_parents->len; i++ ) {
|
|
if ( parent == (CPicoParent*)m_parents->pdata[i] ) {
|
|
g_ptr_array_remove_index_fast( m_parents, i );
|
|
}
|
|
}
|
|
}
|
|
|
|
void CPicoModel::Reload( void ){
|
|
CPicoSurface *surf;
|
|
picoSurface_t *pSurface;
|
|
int i;
|
|
unsigned int j;
|
|
|
|
// Get rid of the old model
|
|
if ( m_pModel ) {
|
|
for ( j = 0; j < m_children->len; j++ ) {
|
|
( (CPicoSurface*)m_children->pdata[j] )->DecRef();
|
|
g_ptr_array_remove_index_fast( m_children, j );
|
|
}
|
|
}
|
|
|
|
// And reload it
|
|
m_pModel = PicoLoadModel( m_name, m_frame );
|
|
|
|
if ( m_pModel ) {
|
|
m_children = g_ptr_array_new();
|
|
aabb_clear( &m_BBox );
|
|
for ( i = 0; i < PicoGetModelNumSurfaces( m_pModel ); i++ )
|
|
{
|
|
pSurface = PicoGetModelSurface( m_pModel,i );
|
|
surf = new CPicoSurface( pSurface );
|
|
g_ptr_array_add( m_children, surf );
|
|
aabb_extend_by_aabb( &m_BBox, surf->GetAABB() );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_BBox.origin[0] = m_BBox.origin[1] = m_BBox.origin[2] = 0;
|
|
m_BBox.extents[0] = m_BBox.extents[1] = m_BBox.extents[2] = 0;
|
|
}
|
|
|
|
for ( j = 0; j < m_parents->len; j++ ) {
|
|
( (CPicoParent*)m_parents->pdata[j] )->UpdateShaders();
|
|
}
|
|
}
|
|
|
|
void CPicoModel::Draw( int state, std::vector<IShader*> shaders, int rflags ) const {
|
|
if ( m_pModel ) {
|
|
for ( unsigned int i = 0; i < m_children->len; i++ )
|
|
( (CPicoSurface*)m_children->pdata[i] )->Draw( state, shaders[i], rflags );
|
|
}
|
|
}
|
|
|
|
void CPicoModel::Draw( int state, int rflags ) const {
|
|
if ( m_pModel ) {
|
|
for ( unsigned int i = 0; i < m_children->len; i++ )
|
|
( (CPicoSurface*)m_children->pdata[i] )->Draw( state, rflags );
|
|
}
|
|
}
|
|
|
|
bool CPicoModel::TestRay( const ray_t *ray, vec_t *dist ) const {
|
|
vec_t dist_start = *dist;
|
|
vec_t dist_local = *dist;
|
|
ray_t ray_local = *ray;
|
|
|
|
if ( !m_pModel ) {
|
|
return false;
|
|
}
|
|
|
|
if ( !aabb_intersect_ray( &m_BBox, &ray_local, &dist_local ) ) {
|
|
return false;
|
|
}
|
|
dist_local = dist_start;
|
|
|
|
for ( unsigned int i = 0; i < m_children->len; i++ )
|
|
{
|
|
if ( ( (CPicoSurface*)m_children->pdata[i] )->TestRay( &ray_local, &dist_local ) ) {
|
|
*dist = dist_local;
|
|
}
|
|
}
|
|
|
|
return *dist < dist_start;
|
|
}
|
|
|
|
int CPicoModel::GetNumSurfaces( void ){
|
|
if ( !m_pModel ) {
|
|
return 0;
|
|
}
|
|
|
|
return m_children->len;
|
|
}
|
|
|
|
char *CPicoModel::GetShaderNameForSurface( const unsigned int surf ){
|
|
if ( !m_pModel || surf >= m_children->len ) {
|
|
return 0;
|
|
}
|
|
|
|
return ( (CPicoSurface*)m_children->pdata[surf] )->GetShaderName();
|
|
}
|