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

Use global memory block for the models

Browse Source
This commit is contained in:
Alexander Bock
2020-08-19 10:27:21 +02:00
parent 7603edf906
commit 89af15126b
5 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/base/rendering/modelgeometry.cpp
View File

@@ -25,8 +25,10 @@
#include <modules/base/rendering/modelgeometry.h>
#include <openspace/documentation/verifier.h>
#include <openspace/engine/globals.h>
#include <openspace/rendering/renderable.h>
#include <openspace/util/factorymanager.h>
#include <openspace/util/memorymanager.h>
#include <ghoul/filesystem/cachemanager.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/filesystem/filesystem.h>
@@ -80,7 +82,8 @@ documentation:: Documentation ModelGeometry::Documentation() {
};
}
std::unique_ptr<ModelGeometry> ModelGeometry::createFromDictionary(
// Create with ghoul::mm_unique_ptr
ghoul::mm_unique_ptr<ModelGeometry> ModelGeometry::createFromDictionary(
const ghoul::Dictionary& dictionary)
{
if (!dictionary.hasKeyAndValue<std::string>(KeyType)) {
@@ -90,8 +93,12 @@ std::unique_ptr<ModelGeometry> ModelGeometry::createFromDictionary(
const std::string& geometryType = dictionary.value<std::string>(KeyType);
auto factory = FactoryManager::ref().factory<ModelGeometry>();
ModelGeometry* geometry = factory->create(geometryType, dictionary);
return std::unique_ptr<ModelGeometry>(geometry);
ModelGeometry* geometry = factory->create(
geometryType,
dictionary,
&global::memoryManager.PersistentMemory
);
return ghoul::mm_unique_ptr<ModelGeometry>(geometry);
}
ModelGeometry::ModelGeometry(const ghoul::Dictionary& dictionary) {