mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-21 03:48:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/globals (#690)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/spacecraftinstruments/util/sequenceparser.cpp
+4 -4
View File
@@ -24,7 +24,7 @@
#include <modules/spacecraftinstruments/util/sequenceparser.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/globals.h>
#include <openspace/util/spicemanager.h>
#include <ghoul/logging/logmanager.h>
@@ -94,7 +94,7 @@ void writeToBuffer<std::string>(std::vector<char>& buffer, size_t& currentWriteL
void SequenceParser::sendPlaybookInformation(const std::string& name) {
std::string fullName = std::string(PlaybookIdentifierName) + "_" + name;
_messageIdentifier = OsEng.networkEngine().identifier(fullName);
_messageIdentifier = global::networkEngine.identifier(fullName);
std::vector<char> buffer(1024);
size_t currentWriteLocation = 0;
@@ -189,7 +189,7 @@ void SequenceParser::sendPlaybookInformation(const std::string& name) {
buffer.resize(currentWriteLocation);
//OsEng.networkEngine()->publishMessage(PlaybookIdentifier, buffer);
OsEng.networkEngine().setInitialConnectionMessage(_messageIdentifier, buffer);
global::networkEngine.setInitialConnectionMessage(_messageIdentifier, buffer);
}
}
} // namespace openspace