mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/osirisrex

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-29 13:01:28 -04:00
parent a82ad66374 67f1a389d2
commit 84834f230d
33 changed files with 439 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/interactionhandler.h
-1
View File
@@ -36,7 +36,6 @@
#include <list>
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <mutex>
include/openspace/interaction/interactionmode.h
+4 -5
View File
@@ -31,15 +31,14 @@
#include <openspace/util/mouse.h>
#include <openspace/util/keys.h>
#include <modules/globebrowsing/globes/renderableglobe.h>
#include <list>
namespace openspace {
class Camera;
class SceneGraphNode;
class RenderableGlobe;
namespace interaction {
@@ -117,11 +116,11 @@ protected:
void set(T value, double dt) {
_targetValue = value;
_currentValue = _currentValue + (_targetValue - _currentValue) *
min(_scaleFactor * dt, 1.0); // less or equal to 1.0 keeps it stable
std::min(_scaleFactor * dt, 1.0); // less or equal to 1.0 keeps it stable
}
void decelerate(double dt) {
_currentValue = _currentValue + (- _currentValue) *
min(_scaleFactor * _friction * dt, 1.0); // less or equal to 1.0 keeps it stable
std::min(_scaleFactor * _friction * dt, 1.0); // less or equal to 1.0 keeps it stable
}
void setHard(T value) {
_targetValue = value;