Moving over more allocations to the memory pool

include/openspace/scene/rotation.h

@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <memory>
 
 namespace ghoul { class Dictionary; }
@@ -40,7 +41,7 @@ namespace documentation { struct Documentation; }
 
 class Rotation : public properties::PropertyOwner {
 public:
-    static std::unique_ptr<Rotation> createFromDictionary(
+    static ghoul::mm_unique_ptr<Rotation> createFromDictionary(
         const ghoul::Dictionary& dictionary);
 
     Rotation(const ghoul::Dictionary& dictionary);

include/openspace/scene/scale.h

@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <memory>
 
 namespace ghoul { class Dictionary; }
@@ -40,7 +41,7 @@ namespace documentation { struct Documentation; }
 
 class Scale : public properties::PropertyOwner {
 public:
-    static std::unique_ptr<Scale> createFromDictionary(
+    static ghoul::mm_unique_ptr<Scale> createFromDictionary(
         const ghoul::Dictionary& dictionary);
 
     Scale();

include/openspace/scene/scenegraphnode.h

@@ -141,7 +141,6 @@ public:
 
     const PerformanceRecord& performanceRecord() const;
 
-    void setRenderable(std::unique_ptr<Renderable> renderable);
     const Renderable* renderable() const;
     Renderable* renderable();
 
@@ -169,19 +168,19 @@ private:
 
     PerformanceRecord _performanceRecord = { 0, 0, 0, 0, 0 };
 
-    std::unique_ptr<Renderable> _renderable;
+    ghoul::mm_unique_ptr<Renderable> _renderable;
 
     properties::StringProperty _guiPath;
     properties::StringProperty _guiDisplayName;
 
     // Transformation defined by ephemeris, rotation and scale
     struct {
-        std::unique_ptr<Translation> translation;
-        std::unique_ptr<Rotation> rotation;
-        std::unique_ptr<Scale> scale;
+        ghoul::mm_unique_ptr<Translation> translation;
+        ghoul::mm_unique_ptr<Rotation> rotation;
+        ghoul::mm_unique_ptr<Scale> scale;
     } _transform;
 
-    std::unique_ptr<TimeFrame> _timeFrame;
+    ghoul::mm_unique_ptr<TimeFrame> _timeFrame;
 
     // Cached transform data
     glm::dvec3 _worldPositionCached = glm::dvec3(0.0);

include/openspace/scene/timeframe.h

@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <memory>
 
 namespace ghoul { class Dictionary; }
@@ -40,7 +41,7 @@ namespace documentation { struct Documentation; }
 
 class TimeFrame : public properties::PropertyOwner {
 public:
-    static std::unique_ptr<TimeFrame> createFromDictionary(
+    static ghoul::mm_unique_ptr<TimeFrame> createFromDictionary(
         const ghoul::Dictionary& dictionary);
 
     TimeFrame();

include/openspace/scene/translation.h

@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/misc/managedmemoryuniqueptr.h>
 
 #include <functional>
 #include <memory>
@@ -42,7 +43,7 @@ namespace documentation {  struct Documentation; }
 
 class Translation : public properties::PropertyOwner {
 public:
-    static std::unique_ptr<Translation> createFromDictionary(
+    static ghoul::mm_unique_ptr<Translation> createFromDictionary(
         const ghoul::Dictionary& dictionary);
 
     Translation();