mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-24 04:58:59 -05:00
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole
This commit is contained in:
@@ -73,7 +73,7 @@ public:
|
||||
};
|
||||
|
||||
RenderEngine();
|
||||
~RenderEngine() = default;
|
||||
~RenderEngine();
|
||||
|
||||
void initialize();
|
||||
void initializeGL();
|
||||
|
||||
@@ -63,6 +63,7 @@ public:
|
||||
|
||||
// constructors & destructor
|
||||
Scene();
|
||||
~Scene();
|
||||
|
||||
/**
|
||||
* Initalizes the SceneGraph
|
||||
|
||||
@@ -75,7 +75,12 @@ public:
|
||||
* have in order to be stored in the ScreenLog
|
||||
*/
|
||||
ScreenLog(std::chrono::seconds timeToLive, LogLevel logLevel = LogLevel::Info);
|
||||
|
||||
|
||||
/**
|
||||
* Destructor
|
||||
*/
|
||||
~ScreenLog();
|
||||
|
||||
/**
|
||||
* Overwritten ghoul::loggling::Log method that is called whenever a new log message
|
||||
* shall be stored.
|
||||
|
||||
Reference in New Issue
Block a user