Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-16 04:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename some variables

Browse Source 
- Add order for loading Components
- Enforce all components have Entity* in the first argument
This commit is contained in:
David Markowitz
2023-06-09 02:46:01 -07:00
parent f555ba8c25
commit 6f057204be
49 changed files with 634 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dGame/dComponents/ProximityMonitorComponent.cpp
View File

@@ -25,8 +25,8 @@ ProximityMonitorComponent::~ProximityMonitorComponent() {
}
void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::string& name) {
dpEntity* en = new dpEntity(m_OwningEntity->GetObjectID(), proxRadius);
en->SetPosition(m_OwningEntity->GetPosition());
dpEntity* en = new dpEntity(m_ParentEntity->GetObjectID(), proxRadius);
en->SetPosition(m_ParentEntity->GetPosition());
dpWorld::Instance().AddEntity(en);
m_ProximitiesData.insert(std::make_pair(name, en));
@@ -34,7 +34,7 @@ void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::
void ProximityMonitorComponent::SetProximityRadius(dpEntity* entity, const std::string& name) {
dpWorld::Instance().AddEntity(entity);
entity->SetPosition(m_OwningEntity->GetPosition());
entity->SetPosition(m_ParentEntity->GetPosition());
m_ProximitiesData.insert(std::make_pair(name, entity));
}
@@ -66,12 +66,12 @@ void ProximityMonitorComponent::Update(float deltaTime) {
//Process enter events
for (auto* en : prox.second->GetNewObjects()) {
m_OwningEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "ENTER");
m_ParentEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "ENTER");
}
//Process exit events
for (auto* en : prox.second->GetRemovedObjects()) {
m_OwningEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "LEAVE");
m_ParentEntity->OnCollisionProximity(en->GetObjectID(), prox.first, "LEAVE");
}
}
}