Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 10:31:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

andrews CR feedback

Browse source
This commit is contained in:
ZappoMan 2015-05-26 09:23:27 -07:00
parent 76c5bd1ab7
commit c92e7bed87
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -11,8 +11,6 @@
#include <GlowEffect.h> #include <GlowEffect.h>
#include "../../Menu.h"
#include "ModelOverlay.h" #include "ModelOverlay.h"
ModelOverlay::ModelOverlay() ModelOverlay::ModelOverlay()

3
libraries/entities/src/EntityItem.cpp
View file

@ -87,6 +87,9 @@ EntityItem::~EntityItem() {
assert(!_simulated); assert(!_simulated);
assert(!_element); assert(!_element);
assert(!_physicsInfo); assert(!_physicsInfo);
qDebug() << "EntityItem::~EntityItem()";
debugDump();
} }
EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& params) const { EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& params) const {

6
libraries/entities/src/EntityTree.cpp
View file

@ -375,9 +375,6 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
if (_simulation) { if (_simulation) {
_simulation->removeEntity(theEntity); _simulation->removeEntity(theEntity);
} }
// FIX ME!!!
//delete theEntity; // we can delete the entity immediately
} }
if (_simulation) { if (_simulation) {
_simulation->unlock(); _simulation->unlock();
@ -675,11 +672,11 @@ void EntityTree::update() {
// translate into list of ID's // translate into list of ID's
QSet<EntityItemID> idsToDelete; QSet<EntityItemID> idsToDelete;
// NOTE: TEST ME!!
for (auto entity : pendingDeletes) { for (auto entity : pendingDeletes) {
assert(!entity->getPhysicsInfo()); // TODO: Andrew to remove this after testing assert(!entity->getPhysicsInfo()); // TODO: Andrew to remove this after testing
idsToDelete.insert(entity->getEntityItemID()); idsToDelete.insert(entity->getEntityItemID());
} }
// delete these things the roundabout way // delete these things the roundabout way
deleteEntities(idsToDelete, true); deleteEntities(idsToDelete, true);
} }
@ -1007,7 +1004,6 @@ bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData)
SendEntitiesOperationArgs* args = static_cast<SendEntitiesOperationArgs*>(extraData); SendEntitiesOperationArgs* args = static_cast<SendEntitiesOperationArgs*>(extraData);
EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element); EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
//const QList<EntityItemPointer>& entities = entityTreeElement->getEntities();
const EntityItems& entities = entityTreeElement->getEntities(); const EntityItems& entities = entityTreeElement->getEntities();
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
EntityItemID newID(QUuid::createUuid()); EntityItemID newID(QUuid::createUuid());

2
tests/octree/src/ModelTests.cpp
View file

@ -390,7 +390,6 @@ void EntityTests::entityTreeTests(bool verbose) {
} else { } else {
if (extraVerbose) { if (extraVerbose) {
qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i
//<< "foundEntityByID=" << foundEntityByID
<< "containingElement=" << containingElement; << "containingElement=" << containingElement;
} }
} }
@ -470,7 +469,6 @@ void EntityTests::entityTreeTests(bool verbose) {
} else { } else {
if (extraVerbose) { if (extraVerbose) {
qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i
//<< "foundEntityByID=" << foundEntityByID
<< "containingElement=" << containingElement; << "containingElement=" << containingElement;
} }
} }