id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-06-01 17:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup and Astyle

Browse source
This commit is contained in:
Robert Beckebans 2021-09-11 18:02:16 +02:00
parent 2f58f2b0c2
commit cbf17d4f36
6 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -3,6 +3,11 @@ eclipse*
neo/ipch neo/ipch
*~ *~
*.gch *.gch
*.dll
*.exe
*.7z
*.zip
imgui.ini
Doom3BFG.exe Doom3BFG.exe
base/_common.crc base/_common.crc

2
neo/cm/CollisionModel_load.cpp
View file

@ -3088,7 +3088,7 @@ void idCollisionModelManagerLocal::ConvertBrushSides( cm_model_t* model, const i
{ {
planes[i] = mapBrush->GetSide( i )->GetPlane(); planes[i] = mapBrush->GetSide( i )->GetPlane();
planes[i].FixDegeneracies( DEGENERATE_DIST_EPSILON ); planes[i].FixDegeneracies( DEGENERATE_DIST_EPSILON );
// Admer: also offset em // Admer: also offset em
idVec3 reverseOriginOffset = originOffset * -1.0f; idVec3 reverseOriginOffset = originOffset * -1.0f;
planes[i].TranslateSelf( reverseOriginOffset ); planes[i].TranslateSelf( reverseOriginOffset );

14
neo/idlib/MapFile.cpp
View file

@ -801,10 +801,10 @@ idMapBrush::IsOriginBrush
*/ */
bool idMapBrush::IsOriginBrush() const bool idMapBrush::IsOriginBrush() const
{ {
for ( int i = 0; i < GetNumSides(); i++ ) for( int i = 0; i < GetNumSides(); i++ )
{ {
const idMaterial* material = declManager->FindMaterial( sides[i]->GetMaterial() ); const idMaterial* material = declManager->FindMaterial( sides[i]->GetMaterial() );
if ( material && material->GetContentFlags() & CONTENTS_ORIGIN ) if( material && material->GetContentFlags() & CONTENTS_ORIGIN )
{ {
return true; return true;
} }
@ -1316,25 +1316,25 @@ void idMapEntity::CalculateBrushOrigin()
{ {
// Collect the origin brushes // Collect the origin brushes
idList<idMapBrush*> originBrushes; idList<idMapBrush*> originBrushes;
for ( int i = 0; i < primitives.Num(); i++ ) for( int i = 0; i < primitives.Num(); i++ )
{ {
if ( primitives[i]->GetType() == idMapPrimitive::TYPE_BRUSH ) if( primitives[i]->GetType() == idMapPrimitive::TYPE_BRUSH )
{ {
idMapBrush* brush = static_cast<idMapBrush*>( primitives[i] ); idMapBrush* brush = static_cast<idMapBrush*>( primitives[i] );
if ( brush->IsOriginBrush() ) if( brush->IsOriginBrush() )
{ {
originBrushes.Append( brush ); originBrushes.Append( brush );
} }
} }
} }
if ( !originBrushes.Num() ) if( !originBrushes.Num() )
{ {
return; return;
} }
// Accumulate and average the origin brushes centres // Accumulate and average the origin brushes centres
for ( int i = 0; i < originBrushes.Num(); i++ ) for( int i = 0; i < originBrushes.Num(); i++ )
{ {
MapPolygonMesh mesh; MapPolygonMesh mesh;
idBounds bounds; idBounds bounds;

2
neo/idlib/ParallelJobList.h
View file

@ -72,7 +72,7 @@ enum jobListParallelism_t
// Admer: prevent Visual Studio from incorrectly highlighting AddJob, as the same is defined in winspool.h // Admer: prevent Visual Studio from incorrectly highlighting AddJob, as the same is defined in winspool.h
#ifdef AddJob #ifdef AddJob
#undef AddJob #undef AddJob
#endif #endif
/* /*

2
neo/renderer/Material.cpp
View file

@ -2437,7 +2437,7 @@ void idMaterial::ParseMaterial( idLexer& src )
unsmoothedTangents = true; unsmoothedTangents = true;
continue; continue;
} }
else if ( !token.Icmp( "origin" ) ) else if( !token.Icmp( "origin" ) )
{ {
SetMaterialFlag( MF_ORIGIN ); SetMaterialFlag( MF_ORIGIN );
contentFlags = CONTENTS_ORIGIN; contentFlags = CONTENTS_ORIGIN;

2
neo/renderer/RenderBackend.cpp
View file

@ -5909,7 +5909,7 @@ void idRenderBackend::DrawViewInternal( const viewDef_t* _viewDef, const int ste
Tonemap( _viewDef ); Tonemap( _viewDef );
} }
if ( !r_skipBloom.GetBool() ) if( !r_skipBloom.GetBool() )
{ {
Bloom( _viewDef ); Bloom( _viewDef );
} }