celisej567/cool-source-archive
1
0
Fork 0
mirror of https://github.com/celisej567/cool-source-archive.git synced 2026-09-21 20:10:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't call CM_ScalePhysCollide if scale = 1.0

Browse Source 
default staticprop to StaticPropLump_t
This commit is contained in:
Fisual
2021-12-10 13:06:46 +07:00
parent 6c11dd6732
commit f10f4bbab1
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/staticpropmgr.cpp
+19 -3
View File
@@ -1202,7 +1202,14 @@ void CStaticProp::InsertPropIntoKDTree()
vcollide_t *pCollide = CM_VCollideForModel( -1, m_pModel ); vcollide_t *pCollide = CM_VCollideForModel( -1, m_pModel );
if ( pCollide && pCollide->solidCount ) if ( pCollide && pCollide->solidCount )
{ {
physcollision->CollideGetAABB( &mins, &maxs, CM_ScalePhysCollide( pCollide, m_Scale ), m_Origin, m_Angles ); if (m_Scale == 1.0f)
{
physcollision->CollideGetAABB(&mins, &maxs, pCollide->solids[0], m_Origin, m_Angles);
}
else
{
physcollision->CollideGetAABB(&mins, &maxs, CM_ScalePhysCollide(pCollide, m_Scale), m_Origin, m_Angles);
}
} }
else else
{ {
@@ -1255,7 +1262,14 @@ void CStaticProp::CreateVPhysics( IPhysicsEnvironment *pPhysEnv, IVPhysicsKeyHan
if (pVCollide) if (pVCollide)
{ {
pPhysCollide = CM_ScalePhysCollide( pVCollide, m_Scale ); if (m_Scale == 1.0f)
{
pPhysCollide = pVCollide->solids[0];
}
else
{
pPhysCollide = CM_ScalePhysCollide(pVCollide, m_Scale);
}
IVPhysicsKeyParser *pParse = physcollision->VPhysicsKeyParserCreate( pVCollide->pKeyValues ); IVPhysicsKeyParser *pParse = physcollision->VPhysicsKeyParserCreate( pVCollide->pKeyValues );
while ( !pParse->Finished() ) while ( !pParse->Finished() )
@@ -1449,7 +1463,9 @@ void CStaticPropMgr::UnserializeModels( CUtlBuffer& buf )
break; break;
default: default:
Error("Unexpected version while deserializing lumps."); //Error("Unexpected version while deserializing lumps.");
UnserializeLump<StaticPropLump_t>(&lump, buf); break;
} }
m_StaticProps[i].Init(i, lump, m_StaticPropDict[lump.m_PropType].m_pModel); m_StaticProps[i].Init(i, lump, m_StaticPropDict[lump.m_PropType].m_pModel);