Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 04:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use weak_ptr<EntityTree> for pointers back to parent

Browse source
This commit is contained in:
Simon Walton 2018-06-11 13:05:42 -07:00
parent e3c8895c89
commit 5ae79bcc5e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ EntityTreeElement::~EntityTreeElement() {
OctreeElementPointer EntityTreeElement::createNewElement(unsigned char* octalCode) { OctreeElementPointer EntityTreeElement::createNewElement(unsigned char* octalCode) {
auto newChild = EntityTreeElementPointer(new EntityTreeElement(octalCode)); auto newChild = EntityTreeElementPointer(new EntityTreeElement(octalCode));
newChild->setTree(_myTree); newChild->setTree(getTree());
return newChild; return newChild;
} }
@ -44,7 +44,7 @@ void EntityTreeElement::init(unsigned char* octalCode) {
OctreeElementPointer EntityTreeElement::addChildAtIndex(int index) { OctreeElementPointer EntityTreeElement::addChildAtIndex(int index) {
OctreeElementPointer newElement = OctreeElement::addChildAtIndex(index); OctreeElementPointer newElement = OctreeElement::addChildAtIndex(index);
std::static_pointer_cast<EntityTreeElement>(newElement)->setTree(_myTree); std::static_pointer_cast<EntityTreeElement>(newElement)->setTree(getTree());
return newElement; return newElement;
} }
@ -475,7 +475,7 @@ bool EntityTreeElement::removeEntityItem(EntityItemPointer entity, bool deletion
int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int bytesLeftToRead, int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
ReadBitstreamToTreeParams& args) { ReadBitstreamToTreeParams& args) {
return _myTree->readEntityDataFromBuffer(data, bytesLeftToRead, args); return getTree()->readEntityDataFromBuffer(data, bytesLeftToRead, args);
} }
void EntityTreeElement::addEntityItem(EntityItemPointer entity) { void EntityTreeElement::addEntityItem(EntityItemPointer entity) {

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

@ -161,8 +161,8 @@ public:
virtual uint16_t size() const; virtual uint16_t size() const;
bool hasEntities() const { return size() > 0; } bool hasEntities() const { return size() > 0; }
void setTree(EntityTreePointer tree) { _myTree = tree; } void setTree(EntityTreePointer tree) { _myTree.swap(std::weak_ptr<EntityTree>(tree)); }
EntityTreePointer getTree() const { return _myTree; } EntityTreePointer getTree() const { return _myTree.lock(); }
void addEntityItem(EntityItemPointer entity); void addEntityItem(EntityItemPointer entity);
@ -234,7 +234,7 @@ public:
protected: protected:
virtual void init(unsigned char * octalCode) override; virtual void init(unsigned char * octalCode) override;
EntityTreePointer _myTree; std::weak_ptr<EntityTree> _myTree;
EntityItems _entityItems; EntityItems _entityItems;
}; };