Move the rendertime into a property and remove the toggleFrametimeType

Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
This commit is contained in:
Alexander Bock
2016-11-06 22:15:52 +01:00
parent c469be26c3
commit 572257d3b0
9 changed files with 45 additions and 77 deletions

View File

@@ -27,6 +27,7 @@
#include <openspace/scripting/scriptengine.h>
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/properties/scalarproperty.h>
@@ -112,7 +113,6 @@ public:
void takeScreenshot(bool applyWarping = false);
void toggleInfoText(bool b);
void toggleFrametimeType(int t);
// Performance measurements
bool doesPerformanceMeasurements() const;
@@ -213,7 +213,9 @@ private:
ghoul::Dictionary _resolveData;
ScreenLog* _log;
FrametimeType _frametimeType;
properties::OptionProperty _frametimeType;
//FrametimeType _frametimeType;
bool _showInfo;
bool _showLog;