From bef14a46ac6bbb23546e067cc9d552cd5c0060e5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 29 Dec 2014 10:41:19 -0800 Subject: [PATCH] remove commented out cruft --- libraries/entities/src/EntityTreeElement.cpp | 17 ----------------- libraries/entities/src/EntityTreeElement.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp index 2f20ce8cee..3753aae963 100644 --- a/libraries/entities/src/EntityTreeElement.cpp +++ b/libraries/entities/src/EntityTreeElement.cpp @@ -679,23 +679,6 @@ EntityItem* EntityTreeElement::getEntityWithEntityItemID(const EntityItemID& id) return foundEntity; } -/* TODO: probably move the cleanupEntities() stuff into EntityTree -void EntityTreeElement::cleanupEntities(PhysicsEngine* physicsEngine) { - uint16_t numberOfEntities = _entityItems->size(); - for (uint16_t i = 0; i < numberOfEntities; i++) { - EntityItem* entity = (*_entityItems)[i]; - EntityMotionState* motionState = entity->getMotionState(); - if (motionState) { - assert(physicsEngine); - physicsEngine->removeObject(static_cast(motionState)); - entity->destroyMotionState(); - } - delete entity; - } - _entityItems->clear(); -} -*/ - bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) { bool foundEntity = false; uint16_t numberOfEntities = _entityItems->size(); diff --git a/libraries/entities/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h index 076fec1d66..a0b6921c71 100644 --- a/libraries/entities/src/EntityTreeElement.h +++ b/libraries/entities/src/EntityTreeElement.h @@ -175,8 +175,6 @@ public: EntityItem* getEntityWithEntityItemID(const EntityItemID& id); - // TODO: probably move the cleanupEntities() stuff into EntityTree - //void cleanupEntities(PhysicsEngine* physicsEngine); bool removeEntityWithEntityItemID(const EntityItemID& id); bool removeEntityItem(EntityItem* entity);