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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-11-11 19:10:42 +01:00
parent a73f2e0d00 758e26789c
commit 19812af629
185 changed files with 9894 additions and 4521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/engine/openspaceengine.cpp
View File

@@ -87,6 +87,11 @@
#include <Windows.h>
#endif
#ifdef __APPLE__
#include <openspace/interaction/touchbar.h>
#endif // __APPLE__
#include <numeric>
#include "openspaceengine_lua.inl"
@@ -327,16 +332,15 @@ void OpenSpaceEngine::create(int argc, char** argv,
}
const bool hasCacheCommandline = !commandlineArgumentPlaceholders.cacheFolder.empty();
const bool hasCacheConfiguration = _engine->configurationManager().hasKeyAndValue<bool>(
const bool hasCacheConfig = _engine->configurationManager().hasKeyAndValue<bool>(
ConfigurationManager::KeyPerSceneCache
);
std::string cacheFolder = absPath("${CACHE}");
if (hasCacheCommandline || hasCacheConfiguration) {
if (hasCacheCommandline || hasCacheConfig) {
if (hasCacheCommandline) {
cacheFolder = commandlineArgumentPlaceholders.cacheFolder;
}
if (hasCacheConfiguration) {
if (hasCacheConfig) {
std::string scene = _engine->configurationManager().value<std::string>(
ConfigurationManager::KeyConfigAsset
);
@@ -414,8 +418,9 @@ void OpenSpaceEngine::create(int argc, char** argv,
}
void OpenSpaceEngine::destroy() {
LTRACE("OpenSpaceEngine::destroy(begin)");
if (_engine->parallelConnection().status() != ParallelConnection::Status::Disconnected) {
if (_engine->parallelConnection().status() !=
ParallelConnection::Status::Disconnected)
{
_engine->parallelConnection().signalDisconnect();
}
@@ -601,6 +606,10 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
_syncEngine->addSyncables(_timeManager->getSyncables());
_syncEngine->addSyncables(_renderEngine->getSyncables());
#ifdef __APPLE__
showTouchbar();
#endif // APPLE
LTRACE("OpenSpaceEngine::loadScene(end)");
}
@@ -1292,8 +1301,8 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
&luascriptfunctions::toggleShutdown,
{},
"",
"Toggles the shutdown mode that will close the application after the count"
"down timer is reached"
"Toggles the shutdown mode that will close the application after the "
"count down timer is reached"
},
{
"writeDocumentation",