mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-04 23:26:54 +00:00
refactor: remove heap-allocated AABBs
This commit is contained in:
@@ -1691,7 +1691,7 @@ void LevelChunk::getEntities(std::shared_ptr<Entity> except, AABB* bb,
|
||||
AUTO_VAR(itEnd, entities->end());
|
||||
for (AUTO_VAR(it, entities->begin()); it != itEnd; it++) {
|
||||
std::shared_ptr<Entity> e = *it; // entities->at(i);
|
||||
if (e != except && e->bb->intersects(*bb) &&
|
||||
if (e != except && e->bb.intersects(*bb) &&
|
||||
(selector == NULL || selector->matches(e))) {
|
||||
es.push_back(e);
|
||||
std::vector<std::shared_ptr<Entity> >* subs =
|
||||
@@ -1699,7 +1699,7 @@ void LevelChunk::getEntities(std::shared_ptr<Entity> except, AABB* bb,
|
||||
if (subs != NULL) {
|
||||
for (int j = 0; j < subs->size(); j++) {
|
||||
e = subs->at(j);
|
||||
if (e != except && e->bb->intersects(*bb) &&
|
||||
if (e != except && e->bb.intersects(*bb) &&
|
||||
(selector == NULL || selector->matches(e))) {
|
||||
es.push_back(e);
|
||||
}
|
||||
@@ -1765,7 +1765,7 @@ void LevelChunk::getEntitiesOfClass(const std::type_info& ec, AABB* bb,
|
||||
else if (Entity* entity = e.get();
|
||||
entity != NULL && ec == typeid(*entity))
|
||||
isAssignableFrom = true;
|
||||
if (isAssignableFrom && e->bb->intersects(*bb)) {
|
||||
if (isAssignableFrom && e->bb.intersects(*bb)) {
|
||||
if (selector == NULL || selector->matches(e)) {
|
||||
es.push_back(e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user