Merge branch 'master' into windows

This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
3089 changed files with 38639 additions and 844820 deletions
+2 -10
View File
@@ -236,13 +236,6 @@ public:
IMaterial *m_pMaterial;
};
// Particle simulation list, used to determine what particles to simulate and how.
struct ParticleSimListEntry_t
{
CNewParticleEffect* m_pNewParticleEffect;
bool m_bBoundingBoxOnly;
};
//-----------------------------------------------------------------------------
// interface IParticleEffect:
@@ -722,9 +715,8 @@ private:
const CViewSetup& view, const VMatrix &worldToPixels, float flFocalDist );
bool RetireParticleCollections( CParticleSystemDefinition* pDef, int nCount, RetireInfo_t *pInfo, float flScreenArea, float flMaxTotalArea );
void BuildParticleSimList( CUtlVector< ParticleSimListEntry_t > &list );
bool EarlyRetireParticleSystems( int nCount, ParticleSimListEntry_t *ppEffects );
void BuildParticleSimList( CUtlVector< CNewParticleEffect* > &list );
bool EarlyRetireParticleSystems( int nCount, CNewParticleEffect **ppEffects );
static int RetireSort( const void *p1, const void *p2 );
private: