mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
committed by
Alexander Bock
parent
d335ec0622
commit
c08805745b
@@ -65,6 +65,7 @@ struct Configuration {
|
||||
};
|
||||
DocumentationInfo documentation;
|
||||
|
||||
std::string versionCheckUrl;
|
||||
bool useMultithreadedInitialization = false;
|
||||
|
||||
struct LoadingScreen {
|
||||
|
||||
@@ -46,6 +46,7 @@ class RenderEngine;
|
||||
class ScreenSpaceRenderable;
|
||||
class SyncEngine;
|
||||
class TimeManager;
|
||||
class VersionChecker;
|
||||
class VirtualPropertyManager;
|
||||
struct WindowDelegate;
|
||||
namespace configuration { struct Configuration; }
|
||||
@@ -81,6 +82,7 @@ RenderEngine& gRenderEngine();
|
||||
std::vector<std::unique_ptr<ScreenSpaceRenderable>>& gScreenspaceRenderables();
|
||||
SyncEngine& gSyncEngine();
|
||||
TimeManager& gTimeManager();
|
||||
VersionChecker& gVersionChecker();
|
||||
VirtualPropertyManager& gVirtualPropertyManager();
|
||||
WindowDelegate& gWindowDelegate();
|
||||
configuration::Configuration& gConfiguration();
|
||||
@@ -112,6 +114,7 @@ static std::vector<std::unique_ptr<ScreenSpaceRenderable>>& screenSpaceRenderabl
|
||||
detail::gScreenspaceRenderables();
|
||||
static SyncEngine& syncEngine = detail::gSyncEngine();
|
||||
static TimeManager& timeManager = detail::gTimeManager();
|
||||
static VersionChecker& versionChecker = detail::gVersionChecker();
|
||||
static VirtualPropertyManager& virtualPropertyManager = detail::gVirtualPropertyManager();
|
||||
static WindowDelegate& windowDelegate = detail::gWindowDelegate();
|
||||
static configuration::Configuration& configuration = detail::gConfiguration();
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <openspace/properties/stringproperty.h>
|
||||
#include <openspace/util/keys.h>
|
||||
#include <openspace/util/mouse.h>
|
||||
#include <openspace/util/versionchecker.h>
|
||||
#include <ghoul/glm.h>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -109,6 +110,7 @@ private:
|
||||
std::unique_ptr<Scene> _scene;
|
||||
std::unique_ptr<AssetManager> _assetManager;
|
||||
std::unique_ptr<LoadingScreen> _loadingScreen;
|
||||
std::unique_ptr<VersionChecker> _versionChecker;
|
||||
|
||||
bool _hasScheduledAssetLoading = false;
|
||||
std::string _scheduledAssetPathToLoad;
|
||||
|
||||
Reference in New Issue
Block a user