mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set interaction to properly depend on delta time.

Browse Source
This commit is contained in:
kalbl
2016-10-20 18:37:18 +02:00
parent 7e0e913131
commit 2f32e67b87
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/interactionhandler.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
void unlockControls();
//void update(double deltaTime);
void updateCamera();
void updateCamera(double deltaTime);
void updateInputStates(double timeSinceLastUpdate);
// Accessors
include/openspace/interaction/interactionmode.h
+6 -6
View File
@@ -120,7 +120,7 @@ public:
Interpolator<double>& rotateToFocusNodeInterpolator();
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime) = 0;
virtual void updateCameraStateFromMouseStates(Camera& camera) = 0;
virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime) = 0;
protected:
/**
@@ -193,7 +193,7 @@ public:
~KeyframeInteractionMode();
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
virtual void updateCameraStateFromMouseStates(Camera& camera);
virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
private:
std::vector<datamessagestructures::CameraKeyframe> _keyframes;
@@ -243,10 +243,10 @@ public:
//virtual void update(Camera& camera, const InputState& inputState, double deltaTime);
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
virtual void updateCameraStateFromMouseStates(Camera& camera);
virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
protected:
//void updateCameraStateFromMouseStates(Camera& camera);
//void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
std::shared_ptr<MouseStates> _mouseStates;
};
@@ -258,10 +258,10 @@ public:
virtual void setFocusNode(SceneGraphNode* focusNode);
//virtual void update(Camera& camera, const InputState& inputState, double deltaTime);
virtual void updateCameraStateFromMouseStates(Camera& camera);
virtual void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
private:
//void updateCameraStateFromMouseStates(Camera& camera);
//void updateCameraStateFromMouseStates(Camera& camera, double deltaTime);
globebrowsing::RenderableGlobe* _globe;
};