perf(particlesys): Reduce cost of ParticleSystemManager::findParticleSystem() by 80% (TheSuperHackers#2217)

Author: xezon

Core/GameEngine/Include/Common/STLTypedefs.h

@@ -64,6 +64,7 @@ class Object;
 enum NameKeyType CPP_11(: Int);
 enum ObjectID CPP_11(: Int);
 enum DrawableID CPP_11(: Int);
+enum ParticleSystemID CPP_11(: Int);
 
 #include <algorithm>
 #include <bitset>
@@ -147,6 +148,7 @@ namespace rts
 		}
 	};
 
+#ifdef USING_STLPORT
 	template<> struct hash<NameKeyType>
 	{
 		size_t operator()(NameKeyType nkt) const
@@ -174,6 +176,16 @@ namespace rts
 		}
 	};
 
+	template<> struct hash<ParticleSystemID>
+	{
+		size_t operator()(ParticleSystemID nkt) const
+		{
+			std::hash<UnsignedInt> tmp;
+			return tmp((UnsignedInt)nkt);
+		}
+	};
+#endif // USING_STLPORT
+
 	template<> struct hash<const Char*>
 	{
 		size_t operator()(const Char* s) const

Core/GameEngine/Include/GameClient/ParticleSys.h

@@ -742,7 +742,8 @@ class ParticleSystemManager : public SubsystemInterface,
 public:
 
 	typedef std::list<ParticleSystem*> ParticleSystemList;
-	typedef std::list<ParticleSystem*>::iterator ParticleSystemListIt;
+	typedef ParticleSystemList::iterator ParticleSystemListIt;
+	typedef std::hash_map<ParticleSystemID, ParticleSystem *, rts::hash<ParticleSystemID>, rts::equal_to<ParticleSystemID> > ParticleSystemIDMap;
 	typedef std::hash_map<AsciiString, ParticleSystemTemplate *, rts::hash<AsciiString>, rts::equal_to<AsciiString> > TemplateMap;
 
 	ParticleSystemManager( void );
@@ -831,6 +832,7 @@ class ParticleSystemManager : public SubsystemInterface,
 
 private:
 	TemplateMap m_templateMap;		///< a hash map of all particle system templates
+	ParticleSystemIDMap m_systemMap; ///< a hash map of all particle systems
 };
 
 /// The particle system manager singleton

Core/GameEngine/Source/GameClient/System/ParticleSys.cpp

@@ -2945,6 +2945,7 @@ void ParticleSystemManager::reset( void )
 		deleteInstance(m_allParticleSystemList.front());
 	}
 	DEBUG_ASSERTCRASH(m_particleSystemCount == 0, ("ParticleSystemManager::reset: m_particleSystemCount is %u, not 0", m_particleSystemCount));
+	DEBUG_ASSERTCRASH(m_systemMap.size() == 0, ("ParticleSystemManager::reset: m_systemMap size is %zu, not 0", m_systemMap.size()));
 
 	// sanity, our lists must be empty!!
 	for( Int i = 0; i < NUM_PARTICLE_PRIORITIES; ++i )
@@ -3040,21 +3041,15 @@ ParticleSystemID ParticleSystemManager::createAttachedParticleSystemID(
 ParticleSystem *ParticleSystemManager::findParticleSystem( ParticleSystemID id )
 {
 	if (id == INVALID_PARTICLE_SYSTEM_ID)
-		return nullptr;	// my, that was easy
-
-	ParticleSystem *system = nullptr;
-
-	for( ParticleSystemListIt it = m_allParticleSystemList.begin(); it != m_allParticleSystemList.end(); ++it ) {
-		system = *it;
-		DEBUG_ASSERTCRASH(system != nullptr, ("ParticleSystemManager::findParticleSystem: ParticleSystem is null"));
+		return nullptr;
 
-		if( system->getSystemID() == id ) {
-			return system;
-		}
+	ParticleSystemIDMap::const_iterator it = m_systemMap.find(id);
+	if (it != m_systemMap.end())
+	{
+		return it->second;
 	}
 
 	return nullptr;
-
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3218,6 +3213,7 @@ void ParticleSystemManager::friend_addParticleSystem( ParticleSystem *particleSy
 {
 	DEBUG_ASSERTCRASH(particleSystemToAdd != nullptr, ("ParticleSystemManager::friend_addParticleSystem: ParticleSystem is null"));
 	m_allParticleSystemList.push_back(particleSystemToAdd);
+	m_systemMap[particleSystemToAdd->getSystemID()] = particleSystemToAdd;
 	++m_particleSystemCount;
 }
 
@@ -3228,6 +3224,7 @@ void ParticleSystemManager::friend_removeParticleSystem( ParticleSystem *particl
 {
 	ParticleSystemListIt it = std::find(m_allParticleSystemList.begin(), m_allParticleSystemList.end(), particleSystemToRemove);
 	if (it != m_allParticleSystemList.end()) {
+		m_systemMap.erase((*it)->getSystemID());
 		m_allParticleSystemList.erase(it);
 		--m_particleSystemCount;
 	} else {