Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-09 20:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Remove dpEntity pointers from collision checking (#1529)

Browse Source 
* chore: Remove dpEntity pointers from collision checking

* Update fn documentation in ProximityMonitorComponent.h

* use more idiomatic method to calculate vector index

* feedback

* missed a ranges::find replacement

* adjust for feedback. last changes tonight.

* okay, also remove unneeded include. then sleep.

* for real tho

* update to use unordered_set instead of set
This commit is contained in:
jadebenn
2024-04-05 00:52:26 -05:00
committed by GitHub
parent b340d7c8f9
commit 06e7d57e0d
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dPhysics/dpEntity.cpp
View File

@@ -3,8 +3,6 @@
#include "dpShapeBox.h"
#include "dpGrid.h"
#include <iostream>
dpEntity::dpEntity(const LWOOBJID& objectID, dpShapeType shapeType, bool isStatic) {
m_ObjectID = objectID;
m_IsStatic = isStatic;
@@ -76,16 +74,17 @@ void dpEntity::CheckCollision(dpEntity* other) {
return;
}
bool wasFound = m_CurrentlyCollidingObjects.contains(other->GetObjectID());
bool isColliding = m_CollisionShape->IsColliding(other->GetShape());
const auto objId = other->GetObjectID();
const auto objItr = m_CurrentlyCollidingObjects.find(objId);
const bool wasFound = objItr != m_CurrentlyCollidingObjects.cend();
const bool isColliding = m_CollisionShape->IsColliding(other->GetShape());
if (isColliding && !wasFound) {
m_CurrentlyCollidingObjects.emplace(other->GetObjectID(), other);
m_NewObjects.push_back(other);
m_CurrentlyCollidingObjects.emplace(objId);
m_NewObjects.push_back(objId);
} else if (!isColliding && wasFound) {
m_CurrentlyCollidingObjects.erase(other->GetObjectID());
m_RemovedObjects.push_back(other);
m_CurrentlyCollidingObjects.erase(objItr);
m_RemovedObjects.push_back(objId);
}
}