Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Break simulation/entity-tree cycle

Browse source
This commit is contained in:
Simon Walton 2018-06-11 13:52:44 -07:00
parent 5ae79bcc5e
commit 99a8ecc6db
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/entities/EntityTreeHeadlessViewer.cpp
View file

@ -17,6 +17,9 @@ EntityTreeHeadlessViewer::EntityTreeHeadlessViewer()
} }
EntityTreeHeadlessViewer::~EntityTreeHeadlessViewer() { EntityTreeHeadlessViewer::~EntityTreeHeadlessViewer() {
if (_simulation) {
_simulation->setEntityTree(nullptr); // Break shared_ptr cycle.
}
} }
void EntityTreeHeadlessViewer::init() { void EntityTreeHeadlessViewer::init() {

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

@ -161,7 +161,7 @@ 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.swap(std::weak_ptr<EntityTree>(tree)); } void setTree(EntityTreePointer tree) { _myTree = std::weak_ptr<EntityTree>(tree); }
EntityTreePointer getTree() const { return _myTree.lock(); } EntityTreePointer getTree() const { return _myTree.lock(); }
void addEntityItem(EntityItemPointer entity); void addEntityItem(EntityItemPointer entity);