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

Use better API terminology for radii

Browse Source 
- SetProximityRadius just calls AddProximityRadius so its clear what is going on.
- created struct BoxDimensions for clear reading of what the floats are
This commit is contained in:
David Markowitz
2023-06-16 19:53:22 -07:00
parent be17d1a467
commit 68a5cc1d89
10 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dGame/dComponents/ProximityMonitorComponent.cpp
View File

@@ -36,23 +36,24 @@ void ProximityMonitorComponent::LoadTemplateData() {
GeneralUtils::TryParse(proximitySplit.at(0), radiusSmall);
GeneralUtils::TryParse(proximitySplit.at(1), radiusLarge);
if (radiusSmall != -1.0f && radiusLarge != -1.0f) {
SetProximityRadius(radiusSmall, "rocketSmall");
SetProximityRadius(radiusLarge, "rocketLarge");
AddProximityRadius(radiusSmall, "rocketSmall");
AddProximityRadius(radiusLarge, "rocketLarge");
}
}
}
void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::string& name) {
dpEntity* en = new dpEntity(m_ParentEntity->GetObjectID(), proxRadius);
en->SetPosition(m_ParentEntity->GetPosition());
void ProximityMonitorComponent::AddProximityRadius(float proxRadius, const std::string& name) {
dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), proxRadius);
entity->SetPosition(m_ParentEntity->GetPosition());
dpWorld::Instance().AddEntity(en);
m_ProximitiesData.insert(std::make_pair(name, en));
dpWorld::Instance().AddEntity(entity);
m_ProximitiesData.insert(std::make_pair(name, entity));
}
void ProximityMonitorComponent::SetProximityRadius(dpEntity* entity, const std::string& name) {
dpWorld::Instance().AddEntity(entity);
void ProximityMonitorComponent::AddProximityRadius(const BoxDimensions& dimensions, const std::string& name) {
dpEntity* entity = new dpEntity(m_ParentEntity->GetObjectID(), dimensions);
entity->SetPosition(m_ParentEntity->GetPosition());
dpWorld::Instance().AddEntity(entity);
m_ProximitiesData.insert(std::make_pair(name, entity));
}