mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moving over more allocations to the memory pool

Browse Source
This commit is contained in:
Alexander Bock
2020-08-05 11:19:09 +02:00
parent 25247c7a37
commit 696bc31861
20 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/openspace/scene/scenegraphnode.h
View File

@@ -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);