Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole

This commit is contained in:
Emil Axelsson
2017-05-18 10:17:37 +02:00
7 changed files with 21 additions and 3 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ public:
};
RenderEngine();
~RenderEngine() = default;
~RenderEngine();
void initialize();
void initializeGL();
+1
View File
@@ -63,6 +63,7 @@ public:
// constructors & destructor
Scene();
~Scene();
/**
* Initalizes the SceneGraph
+6 -1
View File
@@ -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.