mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 11:29:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add InteractionHandler to global property gui

Browse Source 
Add property to interactionhandler to enable/disable rotational and zoom friction
This commit is contained in:
Alexander Bock
2016-06-29 22:42:12 +02:00
parent 2f9b873f1c
commit 5a5ffd76bb
6 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/onscreengui/include/gui.h
View File

@@ -67,9 +67,9 @@ public:
GuiHelpComponent _help;
GuiOriginComponent _origin;
GuiPerformanceComponent _performance;
GuiPropertyComponent _globalProperty;
GuiPropertyComponent _property;
GuiPropertyComponent _screenSpaceProperty;
GuiPropertyComponent _globalProperty;
GuiTimeComponent _time;
GuiIswaComponent _iswa;
};

6
modules/onscreengui/src/gui.cpp
View File

@@ -164,9 +164,9 @@ namespace gui {
GUI::GUI()
: GuiComponent()
, _globalProperty("Global")
, _property("Properties")
, _screenSpaceProperty("ScreenSpace Properties")
, _globalProperty("Global")
{}
GUI::~GUI() {
@@ -369,12 +369,12 @@ void GUI::startFrame(float deltaTime, const glm::vec2& windowSize,
void GUI::endFrame() {
render();
if (_globalProperty.isEnabled())
_globalProperty.render();
if (_property.isEnabled())
_property.render();
if (_screenSpaceProperty.isEnabled())
_screenSpaceProperty.render();
if (_globalProperty.isEnabled())
_globalProperty.render();
if (_performance.isEnabled())
_performance.render();
if (_help.isEnabled())