mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-03 10:58:34 -06:00
Merge pull request #1146 from OpenSpace/feature/sgct
Merging the changes to make the new SGCT version the default one
This commit is contained in:
@@ -84,8 +84,8 @@ public:
|
||||
void touchDetectionCallback(TouchInput input);
|
||||
void touchUpdateCallback(TouchInput input);
|
||||
void touchExitCallback(TouchInput input);
|
||||
std::vector<char> encode();
|
||||
void decode(std::vector<char> data);
|
||||
std::vector<std::byte> encode();
|
||||
void decode(std::vector<std::byte> data);
|
||||
|
||||
void scheduleLoadSingleAsset(std::string assetPath);
|
||||
void toggleShutdownMode();
|
||||
|
||||
@@ -53,13 +53,13 @@ public:
|
||||
* Encodes all added Syncables in the injected <code>SyncBuffer</code>.
|
||||
* This method is only called on the SGCT master node
|
||||
*/
|
||||
std::vector<char> encodeSyncables();
|
||||
std::vector<std::byte> encodeSyncables();
|
||||
|
||||
/**
|
||||
* Decodes the <code>SyncBuffer</code> into the added Syncables.
|
||||
* This method is only called on the SGCT slave nodes
|
||||
*/
|
||||
void decodeSyncables(std::vector<char> data);
|
||||
void decodeSyncables(std::vector<std::byte> data);
|
||||
|
||||
/**
|
||||
* Invokes the presync method of all added Syncables
|
||||
|
||||
@@ -94,11 +94,6 @@ struct WindowDelegate {
|
||||
|
||||
void (*setEyeSeparationDistance)(float distance) = [](float) {};
|
||||
|
||||
glm::ivec4 (*viewportPixelCoordinates)() = []() { return glm::ivec4(0, 0, 0, 0); };
|
||||
|
||||
void (*sendMessageToExternalControl)(const std::vector<char>& message) =
|
||||
[](const std::vector<char>&) {};
|
||||
|
||||
bool (*isFisheyeRendering)() = []() { return false; };
|
||||
|
||||
unsigned int(*takeScreenshot)(bool applyWarping) = [](bool) { return 0u; };
|
||||
|
||||
Reference in New Issue
Block a user