Feature/globals (#690)

* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
This commit is contained in:
Alexander Bock
2018-08-30 11:38:47 -04:00
committed by GitHub
parent c287c03fe8
commit 9f1c4e847d
177 changed files with 3103 additions and 3952 deletions

View File

@@ -25,7 +25,7 @@
#include <openspace/scripting/scriptengine.h>
#include <openspace/engine/configuration.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/globals.h>
#include <openspace/network/parallelpeer.h>
#include <openspace/util/syncbuffer.h>
#include <ghoul/filesystem/filesystem.h>
@@ -582,8 +582,8 @@ bool ScriptEngine::writeLog(const std::string& script) {
// Check that logging is enabled and initialize if necessary
if (!_logFileExists) {
// If a ScriptLogFile was specified, generate it now
if (!OsEng.configuration().scriptLog.empty()) {
_logFilename = absPath(OsEng.configuration().scriptLog);
if (!global::configuration.scriptLog.empty()) {
_logFilename = absPath(global::configuration.scriptLog);
_logFileExists = true;
LDEBUG(fmt::format(
@@ -633,8 +633,8 @@ void ScriptEngine::preSync(bool isMaster) {
_receivedScripts.push_back(_currentSyncedScript);
_queuedScripts.pop_back();
if (OsEng.parallelPeer().isHost() && remoteScripting) {
OsEng.parallelPeer().sendScript(_currentSyncedScript);
if (global::parallelPeer.isHost() && remoteScripting) {
global::parallelPeer.sendScript(_currentSyncedScript);
}
}
_mutex.unlock();