mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/profiles

Browse Source
This commit is contained in:
GPayne
2020-05-14 19:31:19 -06:00
parent dfb61097b2 7c24a96b9e
commit 0f06f9d233
146 changed files with 2966 additions and 2511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/engine/openspaceengine.h
View File

@@ -88,8 +88,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();
@@ -125,6 +125,8 @@ private:
bool _hasScheduledAssetLoading = false;
std::string _scheduledAssetPathToLoad;
glm::vec2 _mousePosition;
//grabs json from each module to pass to the documentation engine.
std::string _documentationJson;