Have ~OctreeProcessor break cycle instead of using weak pointers

libraries/entities/src/EntityTreeElement.cpp

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

libraries/entities/src/EntityTreeElement.h

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

libraries/octree/src/OctreeProcessor.cpp

@@ -20,12 +20,6 @@
 
 #include "OctreeLogging.h"
 
-OctreeProcessor::OctreeProcessor() :
-    _tree(NULL),
-    _managedTree(false)
-{
-}
-
 void OctreeProcessor::init() {
     if (!_tree) {
         _tree = createTree();
@@ -34,6 +28,9 @@ void OctreeProcessor::init() {
 }
 
 OctreeProcessor::~OctreeProcessor() {
+    if (_tree) {
+        _tree->eraseAllOctreeElements(false);
+    }
 }
 
 void OctreeProcessor::setTree(OctreePointer newTree) {

libraries/octree/src/OctreeProcessor.h

@@ -28,7 +28,6 @@
 class OctreeProcessor : public QObject, public QEnableSharedFromThis<OctreeProcessor> {
     Q_OBJECT
 public:
-    OctreeProcessor();
     virtual ~OctreeProcessor();
 
     virtual char getMyNodeType() const = 0;
@@ -61,7 +60,7 @@ protected:
     virtual OctreePointer createTree() = 0;
 
     OctreePointer _tree;
-    bool _managedTree;
+    bool _managedTree { false };
 
     SimpleMovingAverage _elementsPerPacket;
     SimpleMovingAverage _entitiesPerPacket;