my own uncrustify run
This commit is contained in:
Rudolf Polzer
@@ -1,21 +1,21 @@
|
||||
/*
|
||||
BobToolz plugin for GtkRadiant
|
||||
Copyright (C) 2001 Gordon Biggans
|
||||
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 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.
|
||||
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
|
||||
*/
|
||||
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
|
||||
*/
|
||||
|
||||
// DMap.cpp: implementation of the DMap class.
|
||||
//
|
||||
@@ -49,130 +49,120 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
// Construction/Destruction
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
DMap::DMap()
|
||||
{
|
||||
DMap::DMap(){
|
||||
m_nNextEntity = 1;
|
||||
AddEntity("worldspawn", 0);
|
||||
AddEntity( "worldspawn", 0 );
|
||||
}
|
||||
|
||||
DMap::~DMap()
|
||||
{
|
||||
DMap::~DMap(){
|
||||
ClearEntities();
|
||||
}
|
||||
|
||||
DEntity* DMap::AddEntity(char *classname, int ID)
|
||||
{
|
||||
DEntity* DMap::AddEntity( char *classname, int ID ){
|
||||
DEntity* newEntity;
|
||||
if(ID == -1)
|
||||
newEntity = new DEntity(classname, m_nNextEntity++);
|
||||
else
|
||||
newEntity = new DEntity(classname, ID);
|
||||
if ( ID == -1 ) {
|
||||
newEntity = new DEntity( classname, m_nNextEntity++ );
|
||||
}
|
||||
else{
|
||||
newEntity = new DEntity( classname, ID );
|
||||
}
|
||||
|
||||
entityList.push_back( newEntity );
|
||||
|
||||
entityList.push_back(newEntity);
|
||||
|
||||
return newEntity;
|
||||
}
|
||||
|
||||
void DMap::ClearEntities()
|
||||
{
|
||||
void DMap::ClearEntities(){
|
||||
m_nNextEntity = 1;
|
||||
|
||||
for(std::list<DEntity *>::const_iterator deadEntity=entityList.begin(); deadEntity!=entityList.end(); deadEntity++)
|
||||
for ( std::list<DEntity *>::const_iterator deadEntity = entityList.begin(); deadEntity != entityList.end(); deadEntity++ )
|
||||
delete *deadEntity;
|
||||
|
||||
entityList.clear();
|
||||
}
|
||||
|
||||
DEntity* DMap::GetEntityForID(int ID)
|
||||
{
|
||||
DEntity* DMap::GetEntityForID( int ID ){
|
||||
DEntity* findEntity = NULL;
|
||||
|
||||
for(std::list<DEntity *>::const_iterator chkEntity=entityList.begin(); chkEntity!=entityList.end(); chkEntity++)
|
||||
for ( std::list<DEntity *>::const_iterator chkEntity = entityList.begin(); chkEntity != entityList.end(); chkEntity++ )
|
||||
{
|
||||
if((*chkEntity)->m_nID == ID)
|
||||
{
|
||||
findEntity = (*chkEntity);
|
||||
if ( ( *chkEntity )->m_nID == ID ) {
|
||||
findEntity = ( *chkEntity );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(!findEntity)
|
||||
findEntity = AddEntity("worldspawn", ID);
|
||||
if ( !findEntity ) {
|
||||
findEntity = AddEntity( "worldspawn", ID );
|
||||
}
|
||||
|
||||
return findEntity;
|
||||
}
|
||||
|
||||
|
||||
DEntity* DMap::GetWorldSpawn()
|
||||
{
|
||||
return GetEntityForID(0);
|
||||
DEntity* DMap::GetWorldSpawn(){
|
||||
return GetEntityForID( 0 );
|
||||
}
|
||||
|
||||
void DMap::BuildInRadiant(bool bAllowDestruction)
|
||||
{
|
||||
for(std::list<DEntity *>::const_iterator buildEntity=entityList.begin(); buildEntity!=entityList.end(); buildEntity++)
|
||||
(*buildEntity)->BuildInRadiant(bAllowDestruction);
|
||||
void DMap::BuildInRadiant( bool bAllowDestruction ){
|
||||
for ( std::list<DEntity *>::const_iterator buildEntity = entityList.begin(); buildEntity != entityList.end(); buildEntity++ )
|
||||
( *buildEntity )->BuildInRadiant( bAllowDestruction );
|
||||
}
|
||||
|
||||
void DMap::LoadAll(bool bLoadPatches)
|
||||
{
|
||||
void DMap::LoadAll( bool bLoadPatches ){
|
||||
ClearEntities();
|
||||
|
||||
GlobalSelectionSystem().setSelectedAll(false);
|
||||
GlobalSelectionSystem().setSelectedAll( false );
|
||||
|
||||
class load_entities_t : public scene::Traversable::Walker
|
||||
{
|
||||
DMap* m_map;
|
||||
bool m_bLoadPatches;
|
||||
public:
|
||||
load_entities_t(DMap* map, bool bLoadPatches)
|
||||
: m_map(map), m_bLoadPatches(bLoadPatches)
|
||||
{
|
||||
}
|
||||
bool pre(scene::Node& node) const
|
||||
{
|
||||
if(Node_isEntity(node))
|
||||
{
|
||||
DEntity* loadEntity = m_map->AddEntity("", 0);
|
||||
loadEntity->LoadFromEntity(node, m_bLoadPatches);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
} load_entities(this, bLoadPatches);
|
||||
class load_entities_t : public scene::Traversable::Walker
|
||||
{
|
||||
DMap* m_map;
|
||||
bool m_bLoadPatches;
|
||||
public:
|
||||
load_entities_t( DMap* map, bool bLoadPatches )
|
||||
: m_map( map ), m_bLoadPatches( bLoadPatches ){
|
||||
}
|
||||
bool pre( scene::Node& node ) const {
|
||||
if ( Node_isEntity( node ) ) {
|
||||
DEntity* loadEntity = m_map->AddEntity( "", 0 );
|
||||
loadEntity->LoadFromEntity( node, m_bLoadPatches );
|
||||
}
|
||||
return false;
|
||||
}
|
||||
} load_entities( this, bLoadPatches );
|
||||
|
||||
Node_getTraversable(GlobalSceneGraph().root())->traverse(load_entities);
|
||||
Node_getTraversable( GlobalSceneGraph().root() )->traverse( load_entities );
|
||||
}
|
||||
|
||||
int DMap::FixBrushes()
|
||||
{
|
||||
int DMap::FixBrushes(){
|
||||
int count = 0;
|
||||
for(std::list<DEntity *>::const_iterator fixEntity=entityList.begin(); fixEntity!=entityList.end(); fixEntity++)
|
||||
for ( std::list<DEntity *>::const_iterator fixEntity = entityList.begin(); fixEntity != entityList.end(); fixEntity++ )
|
||||
{
|
||||
count += (*fixEntity)->FixBrushes();
|
||||
count += ( *fixEntity )->FixBrushes();
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
void DMap::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)
|
||||
{
|
||||
for(std::list<DEntity *>::const_iterator texEntity=entityList.begin(); texEntity!=entityList.end(); texEntity++)
|
||||
void DMap::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 ){
|
||||
for ( std::list<DEntity *>::const_iterator texEntity = entityList.begin(); texEntity != entityList.end(); texEntity++ )
|
||||
{
|
||||
if(string_equal_nocase("worldspawn", (*texEntity)->m_Classname))
|
||||
(*texEntity)->ResetTextures(textureName, fScale, fShift, rotation, newTextureName,
|
||||
bResetTextureName, bResetScale, bResetShift, bResetRotation, true);
|
||||
if ( string_equal_nocase( "worldspawn", ( *texEntity )->m_Classname ) ) {
|
||||
( *texEntity )->ResetTextures( textureName, fScale, fShift, rotation, newTextureName,
|
||||
bResetTextureName, bResetScale, bResetShift, bResetRotation, true );
|
||||
}
|
||||
else
|
||||
{
|
||||
if((*texEntity)->ResetTextures( textureName, fScale, fShift, rotation, newTextureName,
|
||||
bResetTextureName, bResetScale, bResetShift, bResetRotation, false))
|
||||
RebuildEntity(*texEntity);
|
||||
if ( ( *texEntity )->ResetTextures( textureName, fScale, fShift, rotation, newTextureName,
|
||||
bResetTextureName, bResetScale, bResetShift, bResetRotation, false ) ) {
|
||||
RebuildEntity( *texEntity );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DMap::RebuildEntity(DEntity *ent)
|
||||
{
|
||||
void DMap::RebuildEntity( DEntity *ent ){
|
||||
ent->RemoveFromRadiant();
|
||||
ent->BuildInRadiant(false);
|
||||
ent->BuildInRadiant( false );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user