fix(proximity): a proximity set again replaces the old one; UnsetProximityRadius

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-01 03:29:42 -05:00
parent e34ae60724
commit 4fcce48397
2 changed files with 13 additions and 0 deletions

View File

@@ -28,6 +28,8 @@ ProximityMonitorComponent::~ProximityMonitorComponent() {
}
void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::string& name, const uint32_t collisionGroup) {
// A proximity set again under its name replaces the old one
UnsetProximityRadius(name);
dpEntity* en = new dpEntity(m_Parent->GetObjectID(), proxRadius);
en->SetCollisionGroup(collisionGroup);
en->SetPosition(m_Parent->GetPosition());
@@ -37,11 +39,19 @@ void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::
}
void ProximityMonitorComponent::SetProximityRadius(dpEntity* entity, const std::string& name) {
UnsetProximityRadius(name);
dpWorld::AddEntity(entity);
entity->SetPosition(m_Parent->GetPosition());
m_ProximitiesData.insert(std::make_pair(name, entity));
}
void ProximityMonitorComponent::UnsetProximityRadius(const std::string& name) {
const auto iter = m_ProximitiesData.find(name);
if (iter == m_ProximitiesData.end()) return;
if (iter->second) dpWorld::RemoveEntity(iter->second);
m_ProximitiesData.erase(iter);
}
const std::unordered_set<LWOOBJID>& ProximityMonitorComponent::GetProximityObjects(const std::string& name) const {
const auto iter = m_ProximitiesData.find(name);

View File

@@ -45,6 +45,9 @@ public:
*/
void SetProximityRadius(dpEntity* entity, const std::string& name);
// Removes the proximity of that name (Lua UnsetProximityRadius)
void UnsetProximityRadius(const std::string& name);
/**
* Returns the last of entities that are used to check proximity, given a name
* @param name the proximity name to retrieve physics objects for