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:
Alexander Bock
2020-05-04 10:48:48 +02:00
committed by GitHub
24 changed files with 680 additions and 776 deletions

View File

@@ -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();

View File

@@ -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

View File

@@ -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; };