diff --git a/.gitignore b/.gitignore index 2549032b..bebbac75 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,11 @@ eclipse* neo/ipch *~ *.gch +*.dll +*.exe +*.7z +*.zip +imgui.ini Doom3BFG.exe base/_common.crc diff --git a/neo/cm/CollisionModel_load.cpp b/neo/cm/CollisionModel_load.cpp index 093a9e36..5dcaa0e2 100644 --- a/neo/cm/CollisionModel_load.cpp +++ b/neo/cm/CollisionModel_load.cpp @@ -3088,7 +3088,7 @@ void idCollisionModelManagerLocal::ConvertBrushSides( cm_model_t* model, const i { planes[i] = mapBrush->GetSide( i )->GetPlane(); planes[i].FixDegeneracies( DEGENERATE_DIST_EPSILON ); - + // Admer: also offset em idVec3 reverseOriginOffset = originOffset * -1.0f; planes[i].TranslateSelf( reverseOriginOffset ); diff --git a/neo/idlib/MapFile.cpp b/neo/idlib/MapFile.cpp index 6f8d24d3..34fb65b8 100644 --- a/neo/idlib/MapFile.cpp +++ b/neo/idlib/MapFile.cpp @@ -801,10 +801,10 @@ idMapBrush::IsOriginBrush */ 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() ); - if ( material && material->GetContentFlags() & CONTENTS_ORIGIN ) + if( material && material->GetContentFlags() & CONTENTS_ORIGIN ) { return true; } @@ -1316,25 +1316,25 @@ void idMapEntity::CalculateBrushOrigin() { // Collect the origin brushes idList 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( primitives[i] ); - if ( brush->IsOriginBrush() ) + if( brush->IsOriginBrush() ) { originBrushes.Append( brush ); } } } - if ( !originBrushes.Num() ) + if( !originBrushes.Num() ) { return; } // 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; idBounds bounds; diff --git a/neo/idlib/ParallelJobList.h b/neo/idlib/ParallelJobList.h index 368e4223..37d6cfce 100644 --- a/neo/idlib/ParallelJobList.h +++ b/neo/idlib/ParallelJobList.h @@ -72,7 +72,7 @@ enum jobListParallelism_t // Admer: prevent Visual Studio from incorrectly highlighting AddJob, as the same is defined in winspool.h #ifdef AddJob -#undef AddJob + #undef AddJob #endif /* diff --git a/neo/renderer/Material.cpp b/neo/renderer/Material.cpp index 2179df52..fe355550 100644 --- a/neo/renderer/Material.cpp +++ b/neo/renderer/Material.cpp @@ -2437,7 +2437,7 @@ void idMaterial::ParseMaterial( idLexer& src ) unsmoothedTangents = true; continue; } - else if ( !token.Icmp( "origin" ) ) + else if( !token.Icmp( "origin" ) ) { SetMaterialFlag( MF_ORIGIN ); contentFlags = CONTENTS_ORIGIN; diff --git a/neo/renderer/RenderBackend.cpp b/neo/renderer/RenderBackend.cpp index 84f88ee5..ac4a58c8 100644 --- a/neo/renderer/RenderBackend.cpp +++ b/neo/renderer/RenderBackend.cpp @@ -5909,7 +5909,7 @@ void idRenderBackend::DrawViewInternal( const viewDef_t* _viewDef, const int ste Tonemap( _viewDef ); } - if ( !r_skipBloom.GetBool() ) + if( !r_skipBloom.GetBool() ) { Bloom( _viewDef ); }