Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

respond to code review

Browse source
This commit is contained in:
Seth Alves 2015-09-11 09:29:52 -07:00
parent 7b656d5ead
commit b1c5a04531
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -986,8 +986,8 @@ bool EntityItem::isMoving() const {
} }
EntityTreePointer EntityItem::getTree() const { EntityTreePointer EntityItem::getTree() const {
EntityTreeElementPointer elt = getElement(); EntityTreeElementPointer containingElement = getElement();
EntityTreePointer tree = elt ? elt->getTree() : nullptr; EntityTreePointer tree = containingElement ? containingElement->getTree() : nullptr;
return tree; return tree;
} }

4
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -47,14 +47,14 @@ bool EntityScriptingInterface::canRez() {
return nodeList->getThisNodeCanRez(); return nodeList->getThisNodeCanRez();
} }
void EntityScriptingInterface::setEntityTree(EntityTreePointer modelTree) { void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
if (_entityTree) { if (_entityTree) {
disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity); disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);
disconnect(_entityTree.get(), &EntityTree::deletingEntity, this, &EntityScriptingInterface::deletingEntity); disconnect(_entityTree.get(), &EntityTree::deletingEntity, this, &EntityScriptingInterface::deletingEntity);
disconnect(_entityTree.get(), &EntityTree::clearingEntities, this, &EntityScriptingInterface::clearingEntities); disconnect(_entityTree.get(), &EntityTree::clearingEntities, this, &EntityScriptingInterface::clearingEntities);
} }
_entityTree = modelTree; _entityTree = elementTree;
if (_entityTree) { if (_entityTree) {
connect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity); connect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);

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

@ -45,9 +45,9 @@ void EntityTree::createRootElement() {
OctreeElementPointer EntityTree::createNewElement(unsigned char* octalCode) { OctreeElementPointer EntityTree::createNewElement(unsigned char* octalCode) {
EntityTreeElementPointer newElement = EntityTreeElementPointer(new EntityTreeElement(octalCode), EntityTreeElementPointer newElement = EntityTreeElementPointer(new EntityTreeElement(octalCode),
// see comment int EntityTreeElement::createNewElement // see comment int EntityTreeElement::createNewElement
[=](EntityTreeElement* elt) { [=](EntityTreeElement* dyingElement) {
EntityTreeElementPointer tmpSharedPointer(elt); EntityTreeElementPointer tmpSharedPointer(dyingElement);
elt->notifyDeleteHooks(); dyingElement->notifyDeleteHooks();
}); });
newElement->setTree(std::static_pointer_cast<EntityTree>(shared_from_this())); newElement->setTree(std::static_pointer_cast<EntityTree>(shared_from_this()));
return std::static_pointer_cast<OctreeElement>(newElement); return std::static_pointer_cast<OctreeElement>(newElement);

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

@ -42,12 +42,12 @@ OctreeElementPointer EntityTreeElement::createNewElement(unsigned char* octalCod
// or the destructor wouldn't have been called). The destructor also can't // or the destructor wouldn't have been called). The destructor also can't
// make a new shared pointer -- shared_from_this() is forbidden in a destructor, and // make a new shared pointer -- shared_from_this() is forbidden in a destructor, and
// using OctreeElementPointer(this) also fails. So, I've installed a custom deleter: // using OctreeElementPointer(this) also fails. So, I've installed a custom deleter:
[=](EntityTreeElement* elt) { [=](EntityTreeElement* dyingElement) {
// make a new shared pointer with a reference count of 1 (and no custom deleter) // make a new shared pointer with a reference count of 1 (and no custom deleter)
EntityTreeElementPointer tmpSharedPointer(elt); EntityTreeElementPointer tmpSharedPointer(dyingElement);
// call notifyDeleteHooks which will use shared_from_this() to get this same // call notifyDeleteHooks which will use shared_from_this() to get this same
// shared pointer, for use with the elementDeleted calls. // shared pointer, for use with the elementDeleted calls.
elt->notifyDeleteHooks(); dyingElement->notifyDeleteHooks();
// And now tmpSharedPointer's reference count drops to zero and the // And now tmpSharedPointer's reference count drops to zero and the
// normal destructors are called. // normal destructors are called.
}); });