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

Use vector instead of forward_list for dpGrid

Browse Source 
also swap contains in for find != end on an associative container since we are in c++20 now :)
This commit is contained in:
David Markowitz 2024-02-04 06:10:07 -08:00
parent 050184c558
commit f2e7d2eaac
3 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dPhysics/dpEntity.cpp
View File

@ -76,7 +76,7 @@ void dpEntity::CheckCollision(dpEntity* other) {
return; return;
} }
bool wasFound = (m_CurrentlyCollidingObjects.find(other->GetObjectID()) != m_CurrentlyCollidingObjects.end()); bool wasFound = m_CurrentlyCollidingObjects.contains(other->GetObjectID());
bool isColliding = m_CollisionShape->IsColliding(other->GetShape()); bool isColliding = m_CollisionShape->IsColliding(other->GetShape());

80
dPhysics/dpGrid.cpp
View File

@ -8,24 +8,14 @@ dpGrid::dpGrid(int numCells, int cellSize) {
CELL_SIZE = cellSize; CELL_SIZE = cellSize;
m_DeleteGrid = true; m_DeleteGrid = true;
//fill x m_Cells.resize(NUM_CELLS, std::vector<std::vector<dpEntity*>>(NUM_CELLS));
for (int i = 0; i < NUM_CELLS; i++) {
m_Cells.push_back(std::vector<std::forward_list<dpEntity*>>());
}
//fill z
for (int i = 0; i < NUM_CELLS; i++) {
for (int i = 0; i < NUM_CELLS; i++) {
m_Cells[i].push_back(std::forward_list<dpEntity*>());
}
}
} }
dpGrid::~dpGrid() { dpGrid::~dpGrid() {
if (!this->m_DeleteGrid) return; if (!this->m_DeleteGrid) return;
for (auto& x : m_Cells) { //x for (auto& x : m_Cells) { //x
for (auto& y : x) { //y for (auto& z : x) { //y
for (auto en : y) { for (auto en : z) {
if (!en) continue; if (!en) continue;
delete en; delete en;
en = nullptr; en = nullptr;
@ -39,13 +29,12 @@ void dpGrid::Add(dpEntity* entity) {
int cellX = (int)std::round(entity->m_Position.x) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int cellX = (int)std::round(entity->m_Position.x) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
int cellZ = (int)std::round(entity->m_Position.z) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int cellZ = (int)std::round(entity->m_Position.z) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
if (cellX < 0) cellX = 0; // Clamp values to the range [0, NUM_CELLS - 1]
if (cellZ < 0) cellZ = 0; std::clamp(cellX, 0, NUM_CELLS - 1);
if (cellX >= NUM_CELLS) cellX = NUM_CELLS - 1; std::clamp(cellZ, 0, NUM_CELLS - 1);
if (cellZ >= NUM_CELLS) cellZ = NUM_CELLS - 1;
//Add to cell: //Add to cell:
m_Cells[cellX][cellZ].push_front(entity); m_Cells[cellX][cellZ].push_back(entity);
//To verify that the object isn't gargantuan: //To verify that the object isn't gargantuan:
if (entity->GetScale() >= CELL_SIZE * 2 || entity->GetIsGargantuan()) if (entity->GetScale() >= CELL_SIZE * 2 || entity->GetIsGargantuan())
@ -59,23 +48,27 @@ void dpGrid::Move(dpEntity* entity, float x, float z) {
int cellX = (int)std::round(x) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int cellX = (int)std::round(x) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
int cellZ = (int)std::round(z) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int cellZ = (int)std::round(z) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
if (cellX < 0) cellX = 0; // Clamp values to the range [0, NUM_CELLS - 1]
if (cellZ < 0) cellZ = 0; std::clamp(cellX, 0, NUM_CELLS - 1);
if (cellX >= NUM_CELLS) cellX = NUM_CELLS - 1; std::clamp(cellZ, 0, NUM_CELLS - 1);
if (cellZ >= NUM_CELLS) cellZ = NUM_CELLS - 1;
if (oldCellX < 0) oldCellX = 0; std::clamp(oldCellX, 0, NUM_CELLS - 1);
if (oldCellZ < 0) oldCellZ = 0; std::clamp(oldCellZ, 0, NUM_CELLS - 1);
if (oldCellX >= NUM_CELLS) oldCellX = NUM_CELLS - 1;
if (oldCellZ >= NUM_CELLS) oldCellZ = NUM_CELLS - 1;
if (oldCellX == cellX && oldCellZ == cellZ) return; if (oldCellX == cellX && oldCellZ == cellZ) return;
//Remove from perv cell: //Remove from prev cell:
m_Cells[oldCellX][oldCellZ].remove(entity); auto& cell = m_Cells[oldCellX][oldCellZ];
// For speed, find the single match and swap it with the last element, then pop_back.
auto toRemove = std::find(cell.begin(), cell.end(), entity);
if (toRemove != cell.end()) {
*toRemove = cell.back();
cell.pop_back();
}
//Add to the new cell //Add to the new cell
m_Cells[cellX][cellZ].push_front(entity); m_Cells[cellX][cellZ].push_back(entity);
} }
void dpGrid::Delete(dpEntity* entity) { void dpGrid::Delete(dpEntity* entity) {
@ -83,15 +76,18 @@ void dpGrid::Delete(dpEntity* entity) {
int oldCellX = (int)std::round(entity->m_Position.x) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int oldCellX = (int)std::round(entity->m_Position.x) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
int oldCellZ = (int)std::round(entity->m_Position.z) / dpGrid::CELL_SIZE + NUM_CELLS / 2; int oldCellZ = (int)std::round(entity->m_Position.z) / dpGrid::CELL_SIZE + NUM_CELLS / 2;
if (oldCellX < 0) oldCellX = 0; // Clamp values to the range [0, NUM_CELLS - 1]
if (oldCellZ < 0) oldCellZ = 0; std::clamp(oldCellX, 0, NUM_CELLS - 1);
if (oldCellX >= NUM_CELLS) oldCellX = NUM_CELLS - 1; std::clamp(oldCellZ, 0, NUM_CELLS - 1);
if (oldCellZ >= NUM_CELLS) oldCellZ = NUM_CELLS - 1;
m_Cells[oldCellX][oldCellZ].remove(entity); auto& cell = m_Cells[oldCellX][oldCellZ];
auto toRemove = std::find(cell.begin(), cell.end(), entity);
if (toRemove != cell.end()) {
*toRemove = cell.back();
cell.pop_back();
}
if (m_GargantuanObjects.find(entity->m_ObjectID) != m_GargantuanObjects.end()) m_GargantuanObjects.erase(entity->m_ObjectID);
m_GargantuanObjects.erase(entity->m_ObjectID);
if (entity) delete entity; if (entity) delete entity;
entity = nullptr; entity = nullptr;
@ -100,8 +96,8 @@ void dpGrid::Delete(dpEntity* entity) {
void dpGrid::Update(float deltaTime) { void dpGrid::Update(float deltaTime) {
//Pre-update: //Pre-update:
for (auto& x : m_Cells) { //x for (auto& x : m_Cells) { //x
for (auto& y : x) { //y for (auto& z : x) { //y
for (auto en : y) { for (auto en : z) {
if (!en) continue; if (!en) continue;
en->PreUpdate(); en->PreUpdate();
} }
@ -110,8 +106,8 @@ void dpGrid::Update(float deltaTime) {
//Actual collision detection update: //Actual collision detection update:
for (int x = 0; x < NUM_CELLS; x++) { for (int x = 0; x < NUM_CELLS; x++) {
for (int y = 0; y < NUM_CELLS; y++) { for (int z = 0; z < NUM_CELLS; z++) {
HandleCell(x, y, deltaTime); HandleCell(x, z, deltaTime);
} }
} }
} }
@ -157,7 +153,7 @@ void dpGrid::HandleCell(int x, int z, float deltaTime) {
HandleEntity(en, other); HandleEntity(en, other);
} }
for (auto other : m_GargantuanObjects) for (auto& [id, entity] : m_GargantuanObjects)
HandleEntity(en, other.second); HandleEntity(en, entity);
} }
} }

10
dPhysics/dpGrid.h
View File

@ -1,8 +1,7 @@
#pragma once #pragma once
#include <vector>
#include <list>
#include <forward_list>
#include <map> #include <map>
#include <vector>
#include "dCommonVars.h" #include "dCommonVars.h"
class dpEntity; class dpEntity;
@ -30,7 +29,8 @@ public:
*/ */
void SetDeleteGrid(bool value) { this->m_DeleteGrid = value; }; void SetDeleteGrid(bool value) { this->m_DeleteGrid = value; };
std::vector<std::vector<std::forward_list<dpEntity*>>> GetCells() { return this->m_Cells; }; // Intentional copy since this is only used when we delete this class to re-create it.
std::vector<std::vector<std::vector<dpEntity*>>> GetCells() { return this->m_Cells; };
private: private:
void HandleEntity(dpEntity* entity, dpEntity* other); void HandleEntity(dpEntity* entity, dpEntity* other);
@ -38,7 +38,7 @@ private:
private: private:
//cells on X, cells on Y for that X, then another vector that contains the entities within that cell. //cells on X, cells on Y for that X, then another vector that contains the entities within that cell.
std::vector<std::vector<std::forward_list<dpEntity*>>> m_Cells; std::vector<std::vector<std::vector<dpEntity*>>> m_Cells;
std::map<LWOOBJID, dpEntity*> m_GargantuanObjects; std::map<LWOOBJID, dpEntity*> m_GargantuanObjects;
bool m_DeleteGrid = true; bool m_DeleteGrid = true;
}; };