Added ScreenLog

- Added first version of a ScreenLog mechanism
- Moved the info box to the upper left corner
- Added Ubuntu fonts
- Made RenderEngine a PropertyOwner with _showInfo and _showScreenLog as
  bool properties that can be edited through Lua.
This commit is contained in:
Jonas Strandstedt
2014-10-17 12:20:23 +02:00
parent 13bdd33f7e
commit 18a87ef99e
9 changed files with 248 additions and 61 deletions

View File

@@ -33,12 +33,15 @@
#include <string>
#include <openspace/abuffer/abuffer.h>
#include <openspace/util/screenlog.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalarproperty.h>
namespace openspace {
class Camera;
class RenderEngine {
class RenderEngine: public properties::PropertyOwner {
public:
RenderEngine();
~RenderEngine();
@@ -74,6 +77,11 @@ private:
Camera* _mainCamera;
SceneGraph* _sceneGraph;
ABuffer* _abuffer;
ScreenLog* _log;
properties::BoolProperty _showInfo;
properties::BoolProperty _showScreenLog;
void generateGlslConfig();
};