mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 08:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

resurrecting consolidated documentation (#897)

Browse Source 
* Resurrecting consolidated documentation, lots to improve still but better then before
This commit is contained in:
Micah Acinapura
2019-06-03 08:19:45 -04:00
committed by Alexander Bock
parent 1308317b87
commit 1149a61dce
46 changed files with 490 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/configuration.h
+4 -10
View File
@@ -52,16 +52,10 @@ struct Configuration {
};
Logging logging;
std::string scriptLog = "";
std::string scriptLog;
struct DocumentationInfo {
std::string lua = "";
std::string property = "";
std::string sceneProperty = "";
std::string keyboard = "";
std::string documentation = "";
std::string factory = "";
std::string license = "";
std::string path;
};
DocumentationInfo documentation;
@@ -99,8 +93,8 @@ struct Configuration {
bool isActive = false;
bool isSynchronous = true;
struct IdentifierFilter {
std::string type = "";
std::string source = "";
std::string type;
std::string source;
unsigned int identifier = 0;
};
std::vector<IdentifierFilter> identifierFilters;
include/openspace/engine/openspaceengine.h
+3
View File
@@ -115,6 +115,9 @@ private:
bool _hasScheduledAssetLoading = false;
std::string _scheduledAssetPathToLoad;
//grabs json from each module to pass to the documentation engine.
std::string _documentationJson;
ShutdownInformation _shutdown;
// The first frame might take some more time in the update loop, so we need to know to