Reduce default sensitivity of Orbital Navigator

Rename internal macros to reduce compiler warnings
This commit is contained in:
Alexander Bock
2018-02-19 16:29:38 -05:00
parent a112ebcec7
commit 9ad1d7e3ed
3 changed files with 5 additions and 5 deletions
@@ -48,12 +48,12 @@ private:
std::chrono::high_resolution_clock::time_point _startTime;
};
#define __MERGE(a,b) a##b
#define __LABEL(a) __MERGE(unique_name_, a)
#define __MERGE_PerfMeasure(a,b) a##b
#define __LABEL_PerfMeasure(a) __MERGE_PerfMeasure(unique_name_, a)
/// Declare a new variable for measuring the performance of the current block
#define PerfMeasure(name) \
auto __LABEL(__LINE__) = \
auto __LABEL_PerfMeasure(__LINE__) = \
openspace::performance::PerformanceMeasurement(\
(name), \
OsEng.renderEngine().performanceManager() \
+1 -1
View File
@@ -105,7 +105,7 @@ OrbitalNavigator::OrbitalNavigator()
: properties::PropertyOwner({ "OrbitalNavigator" })
, _followFocusNodeRotationDistance(FollowFocusNodeInfo, 5.0f, 0.0f, 20.f)
, _minimumAllowedDistance(MinimumDistanceInfo, 10.0f, 0.0f, 10000.f)
, _sensitivity(SensitivityInfo, 20.0f, 1.0f, 50.f)
, _sensitivity(SensitivityInfo, 15.0f, 1.0f, 50.f)
, _mouseStates(_sensitivity * pow(10.0, -4), 1 / (_friction.friction + 0.0000001))
{
auto smoothStep =