mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Windows compile fix

Browse Source
This commit is contained in:
Alexander Bock
2017-12-28 14:15:06 -05:00
parent 8c7d220335
commit b337c3aa1e
6 changed files with 66 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -185,7 +185,9 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
_globalPropertyNamespace->addPropertySubOwner(_navigationHandler.get());
_globalPropertyNamespace->addPropertySubOwner(_settingsEngine.get());
_globalPropertyNamespace->addPropertySubOwner(_renderEngine.get());
_globalPropertyNamespace->addPropertySubOwner(_windowWrapper.get());
if (_windowWrapper) {
_globalPropertyNamespace->addPropertySubOwner(_windowWrapper.get());
}
_globalPropertyNamespace->addPropertySubOwner(_parallelConnection.get());
_globalPropertyNamespace->addPropertySubOwner(_console.get());
_globalPropertyNamespace->addPropertySubOwner(_dashboard.get());
@@ -237,6 +239,8 @@ OpenSpaceEngine& OpenSpaceEngine::ref() {
return *_engine;
}
OpenSpaceEngine::~OpenSpaceEngine() {}
bool OpenSpaceEngine::isCreated() {
return _engine != nullptr;
}
@@ -247,7 +251,7 @@ void OpenSpaceEngine::create(int argc, char** argv,
bool& requestClose, bool consoleLog)
{
ghoul_assert(!_engine, "OpenSpaceEngine was already created");
ghoul_assert(windowWrapper != nullptr, "No Window Wrapper was provided");
//ghoul_assert(windowWrapper != nullptr, "No Window Wrapper was provided");
requestClose = false;