mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 22:50:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals handling (#1352)

Browse Source 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
This commit is contained in:
Alexander Bock
2020-10-21 22:30:05 +02:00
committed by GitHub
parent 1525a0490d
commit efffc25ce0
164 changed files with 1484 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripting/scriptengine.cpp
View File

@@ -54,7 +54,7 @@ ScriptEngine::ScriptEngine()
}
)
{
tracy::LuaRegister(_state);
//tracy::LuaRegister(_state);
}
void ScriptEngine::initialize() {
@@ -634,8 +634,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 (!global::configuration.scriptLog.empty()) {
_logFilename = absPath(global::configuration.scriptLog);
if (!global::configuration->scriptLog.empty()) {
_logFilename = absPath(global::configuration->scriptLog);
_logFileExists = true;
LDEBUG(fmt::format(
@@ -690,11 +690,11 @@ void ScriptEngine::preSync(bool isMaster) {
// Not really a received script but the master also needs to run the script...
_masterScriptQueue.push(item);
if (global::parallelPeer.isHost() && remoteScripting) {
global::parallelPeer.sendScript(item.script);
if (global::parallelPeer->isHost() && remoteScripting) {
global::parallelPeer->sendScript(item.script);
}
if (global::sessionRecording.isRecording()) {
global::sessionRecording.saveScriptKeyframe(item.script);
if (global::sessionRecording->isRecording()) {
global::sessionRecording->saveScriptKeyframe(item.script);
}
}
}