mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
Define a Cache path on default
Cleanup OpenSpaceEngine Cleanup RenderEngine * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr Cleanup LogFactory
This commit is contained in:
@@ -76,12 +76,12 @@ namespace scripting {
|
||||
struct ShutdownInformation {
|
||||
// Whether the application is currently in shutdown mode (i.e. counting down the
|
||||
// timer and closing it at '0'
|
||||
bool inShutdown;
|
||||
bool inShutdown = false;
|
||||
// Total amount of time the application will wait before actually shutting down
|
||||
float waitTime;
|
||||
float waitTime = 0.f;
|
||||
// Current state of the countdown; if it reaches '0', the application will
|
||||
// close
|
||||
float timer;
|
||||
float timer = 0.f;
|
||||
};
|
||||
|
||||
class OpenSpaceEngine {
|
||||
@@ -95,7 +95,7 @@ public:
|
||||
static OpenSpaceEngine& ref();
|
||||
static bool isCreated();
|
||||
|
||||
~OpenSpaceEngine();
|
||||
~OpenSpaceEngine() = default;
|
||||
|
||||
// callbacks
|
||||
void initialize();
|
||||
@@ -196,7 +196,6 @@ private:
|
||||
OpenSpaceEngine(std::string programName,
|
||||
std::unique_ptr<WindowWrapper> windowWrapper);
|
||||
|
||||
std::unique_ptr<LoadingScreen> createLoadingScreen();
|
||||
void loadSingleAsset(const std::string& assetPath);
|
||||
void gatherCommandlineArguments();
|
||||
void loadFonts();
|
||||
@@ -241,7 +240,7 @@ private:
|
||||
properties::StringProperty sourceControlInformation;
|
||||
} _versionInformation;
|
||||
|
||||
bool _hasScheduledAssetLoading;
|
||||
bool _hasScheduledAssetLoading = false;
|
||||
std::string _scheduledAssetPathToLoad;
|
||||
|
||||
struct {
|
||||
@@ -269,7 +268,7 @@ private:
|
||||
|
||||
// The first frame might take some more time in the update loop, so we need to know to
|
||||
// disable the synchronization; otherwise a hardware sync will kill us after 1 minute
|
||||
bool _isFirstRenderingFirstFrame;
|
||||
bool _isFirstRenderingFirstFrame = true;
|
||||
|
||||
static OpenSpaceEngine* _engine;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user