mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 15:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Ghoul repository to have the factory return unique_ptrs

Browse Source 
Adjust accordingly
This commit is contained in:
Alexander Bock
2017-03-01 22:03:48 -05:00
parent 2b07cf8c05
commit 2f2fa3b031
26 changed files with 69 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rendering/screenspacerenderable.cpp
View File

@@ -73,8 +73,8 @@ documentation::Documentation ScreenSpaceRenderable::Documentation() {
};
}
ScreenSpaceRenderable* ScreenSpaceRenderable::createFromDictionary(
const ghoul::Dictionary& dictionary)
std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictionary(
const ghoul::Dictionary& dictionary)
{
documentation::testSpecificationAndThrow(
Documentation(),
@@ -85,7 +85,7 @@ ScreenSpaceRenderable* ScreenSpaceRenderable::createFromDictionary(
std::string renderableType = dictionary.value<std::string>(KeyType);
auto factory = FactoryManager::ref().factory<ScreenSpaceRenderable>();
ScreenSpaceRenderable* result = factory->create(renderableType, dictionary);
std::unique_ptr<ScreenSpaceRenderable> result = factory->create(renderableType, dictionary);
if (result == nullptr) {
LERROR("Failed to create a ScreenSpaceRenderable object of type '" <<
renderableType << "'"
@@ -96,7 +96,6 @@ ScreenSpaceRenderable* ScreenSpaceRenderable::createFromDictionary(
return result;
}
ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary)
: _enabled("enabled", "Is Enabled", true)
, _useFlatScreen("flatScreen", "Flat Screen", true)