Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ProximityMonitorComponent re-pass

Browse Source
This commit is contained in:
David Markowitz 2023-07-11 00:15:05 -07:00
parent c204ea4009
commit 49f3d757e5
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dGame/dComponents/ProximityMonitorComponent.cpp
View File

@ -19,8 +19,6 @@ ProximityMonitorComponent::~ProximityMonitorComponent() {
dpWorld::Instance().RemoveEntity(en.second); dpWorld::Instance().RemoveEntity(en.second);
} }
m_ProximitiesData.clear();
} }
void ProximityMonitorComponent::LoadTemplateData() { void ProximityMonitorComponent::LoadTemplateData() {
@ -44,27 +42,29 @@ void ProximityMonitorComponent::LoadTemplateData() {
void ProximityMonitorComponent::AddProximityRadius(float proxRadius, const std::string& name) { void ProximityMonitorComponent::AddProximityRadius(float proxRadius, const std::string& name) {
dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), proxRadius); dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), proxRadius);
entity->SetPosition(m_ParentEntity->GetPosition()); AddProximityRadius(entity, name);
dpWorld::Instance().AddEntity(entity);
m_ProximitiesData.insert(std::make_pair(name, entity));
} }
void ProximityMonitorComponent::AddProximityRadius(const BoxDimensions& dimensions, const std::string& name) { void ProximityMonitorComponent::AddProximityRadius(const BoxDimensions& dimensions, const std::string& name) {
dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), dimensions); dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), dimensions);
AddProximityRadius(entity, name);
}
void ProximityMonitorComponent::AddProximityRadius(dpEntity* entity, const std::string& name) {
entity->SetPosition(m_ParentEntity->GetPosition()); entity->SetPosition(m_ParentEntity->GetPosition());
dpWorld::Instance().AddEntity(entity); dpWorld::Instance().AddEntity(entity);
m_ProximitiesData.insert(std::make_pair(name, entity)); auto existing = m_ProximitiesData.find(name);
if (existing != m_ProximitiesData.end()) {
dpWorld::Instance().RemoveEntity(existing->second);
}
m_ProximitiesData.insert_or_assign(name, entity);
} }
const std::map<LWOOBJID, dpEntity*>& ProximityMonitorComponent::GetProximityObjects(const std::string& name) { const std::map<LWOOBJID, dpEntity*>& ProximityMonitorComponent::GetProximityObjects(const std::string& name) {
const auto& iter = m_ProximitiesData.find(name); const auto& iter = m_ProximitiesData.find(name);
if (iter == m_ProximitiesData.end()) { return iter == m_ProximitiesData.end() ? m_EmptyObjectMap : iter->second->GetCurrentlyCollidingObjects();
return m_EmptyObjectMap;
}
return iter->second->GetCurrentlyCollidingObjects();
} }
bool ProximityMonitorComponent::IsInProximity(const std::string& name, LWOOBJID objectID) { bool ProximityMonitorComponent::IsInProximity(const std::string& name, LWOOBJID objectID) {
@ -74,24 +74,23 @@ bool ProximityMonitorComponent::IsInProximity(const std::string& name, LWOOBJID
return false; return false;
} }
const auto& collitions = iter->second->GetCurrentlyCollidingObjects(); const auto& collisions = iter->second->GetCurrentlyCollidingObjects();
return collitions.find(objectID) != collitions.end(); return collisions.find(objectID) != collisions.end();
} }
void ProximityMonitorComponent::Update(float deltaTime) { void ProximityMonitorComponent::Update(float deltaTime) {
for (const auto& prox : m_ProximitiesData) { for (const auto& [proximityName, proximityEntity] : m_ProximitiesData) {
if (!prox.second) continue; if (!proximityEntity) continue;
//Process enter events //Process enter events
for (auto* en : prox.second->GetNewObjects()) { for (auto* en : proximityEntity->GetNewObjects()) {
m_ParentEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "ENTER"); m_ParentEntity->OnCollisionProximity(en->GetObjectID(), proximityName, "ENTER");
} }
//Process exit events //Process exit events
for (auto* en : prox.second->GetRemovedObjects()) { for (auto* en : proximityEntity->GetRemovedObjects()) {
m_ParentEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "LEAVE"); m_ParentEntity->OnCollisionProximity(en->GetObjectID(), proximityName, "LEAVE");
} }
} }
} }

6
dGame/dComponents/ProximityMonitorComponent.h
View File

@ -64,17 +64,19 @@ public:
private: private:
void AddProximityRadius(dpEntity* entity, const std::string& name);
/** /**
* All the proximity sensors for this component, indexed by name * All the proximity sensors for this component, indexed by name
*/ */
std::map<std::string, dpEntity*> m_ProximitiesData = {}; std::map<std::string, dpEntity*> m_ProximitiesData;
/** /**
* Default value for the proximity data * Default value for the proximity data
*/ */
static const std::map<LWOOBJID, dpEntity*> m_EmptyObjectMap; static const std::map<LWOOBJID, dpEntity*> m_EmptyObjectMap;
int32_t m_ComponentId = 0; int32_t m_ComponentId = -1;
}; };
#endif // PROXIMITYMONITORCOMPONENT_H #endif // PROXIMITYMONITORCOMPONENT_H