mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-03 01:59:35 -06:00
2e4f31ded8
* Interaction speed is not dependent on framerate * Split up interaction code in files and perform smooth interpolation when changing focus * Abstract interaction code in to functions. * Interpolation time is dependent on angle to focus node. * Use correct delta time when interpolating * Fix bug regarding decomposition of camera rotation. * Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid. * Do not always rotate with object. Depending on distance * Remove interaction depth below ellipsoid. Now able to interact without renderable * Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight * Remove GlobeBrowsingInteractionMode * Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode. * Move properties from interaction handler to orbital navigator * Use smooth step for follow rotation interpolator * Rename KeyframeInteractionMode to KeyframeNavigator * Rename files * Clean up. * Separate mousestate from orbitalnavigator * Clean up * Split keybindingmanager from interactionhandler interactionhandler * Rename interactionhandler to navigationhandler * Rename files * Clean up * Take back usage of gotochunk and gotogeo * Rename lua library navigation * Move functionality from navigationhandler to keyframenavigator * Update scripts for navigation * Comment code * Clean up * Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe. * Update jenkins file to remove build folder before building. * Fix error in jenkins script * Update jenkins file * Update jenkins file * Revert jenkins file * I hope this makes Jenkins happy. * Line endings God damnit * Line endings * Clean up * Fix compilation issue * Take back default scene. * Fix indentation * Move functions goToGeo and goToChunk to GlobeBrowsingModule. * Include algorithm for std::find * Remove auto and other clean up
77 lines
3.6 KiB
C++
77 lines
3.6 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#include <ghoul/misc/assert.h>
|
|
#include <ghoul/glm.h>
|
|
|
|
namespace openspace {
|
|
namespace interaction {
|
|
|
|
template <typename T, typename ScaleType>
|
|
DelayedVariable<T, ScaleType>::DelayedVariable(ScaleType scaleFactor, ScaleType friction)
|
|
: _scaleFactor(std::move(scaleFactor))
|
|
, _friction(friction)
|
|
{
|
|
ghoul_assert(_friction >= ScaleType(0.0), "Friction must be positive");
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
void DelayedVariable<T, ScaleType>::set(T value, double dt) {
|
|
_targetValue = value;
|
|
_currentValue = _currentValue + (_targetValue - _currentValue) *
|
|
glm::min(_scaleFactor * dt, 1.0); // less or equal to 1.0 keeps it stable
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
void DelayedVariable<T, ScaleType>::decelerate(double dt) {
|
|
_currentValue = _currentValue + (- _currentValue) *
|
|
glm::min(_scaleFactor * _friction * dt, 1.0);
|
|
// less or equal to 1.0 keeps it stable
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
void DelayedVariable<T, ScaleType>::setHard(T value) {
|
|
_targetValue = value;
|
|
_currentValue = value;
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
void DelayedVariable<T, ScaleType>::setFriction(ScaleType friction) {
|
|
_friction = friction;
|
|
ghoul_assert(_friction >= ScaleType(0.0), "Friction must be positive");
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
void DelayedVariable<T, ScaleType>::setScaleFactor(ScaleType scaleFactor) {
|
|
_scaleFactor = scaleFactor;
|
|
}
|
|
|
|
template <typename T, typename ScaleType>
|
|
T DelayedVariable<T, ScaleType>::get() const {
|
|
return _currentValue;
|
|
}
|
|
|
|
} // namespace interaction
|
|
} // namespace openspace
|