mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-07 12:00:05 -05:00
Emil Axelsson
902e3e6dac
* Initial implementation * Better approximation of target time * Correctly use double precision for time passing * Cleanup * Adding proportional adjustment of delta time at end of interpolation * Keyframe based time interpolation * Add property for time interpolation duration. Move time interpolation methods to TimeManager. * Fix bugs with time gui * Make several clicks on delta time buttons work as expected * Clean up * Improve time interpolation for parallel connection * Improve time API. Fix time interpolation bugs. * Fix mac compile issue * Add hour button * Add missing + sign * Remove newer images from projection buffer when going back in time * Add comment about clearing projection buffer * Fix bug with jumping time in parallel connection * Rename integrateFromTime to previousFrameTime * Compile fix for iswa module * Address code review comments * Code cleanup * Fix bug causig unsmooth behaviour when pausing while interpolating in time
65 lines
3.1 KiB
C++
65 lines
3.1 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2018 *
|
|
* *
|
|
* 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. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__
|
|
#define __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__
|
|
|
|
#include <openspace/util/timeline.h>
|
|
#include <openspace/network/messagestructures.h>
|
|
#include <ghoul/glm.h>
|
|
#include <ghoul/misc/boolean.h>
|
|
#include <glm/gtx/quaternion.hpp>
|
|
|
|
namespace openspace { class Camera; }
|
|
|
|
namespace openspace::interaction {
|
|
|
|
class KeyframeNavigator {
|
|
public:
|
|
BooleanType(Inclusive);
|
|
|
|
struct CameraPose {
|
|
glm::dvec3 position;
|
|
glm::quat rotation;
|
|
std::string focusNode;
|
|
float scale;
|
|
bool followFocusNodeRotation;
|
|
};
|
|
|
|
void updateCamera(Camera& camera);
|
|
Timeline<CameraPose>& timeline();
|
|
|
|
void addKeyframe(double timestamp, KeyframeNavigator::CameraPose pose);
|
|
void removeKeyframesAfter(double timestamp, Inclusive inclusive = Inclusive::No);
|
|
void clearKeyframes();
|
|
size_t nKeyframes() const;
|
|
|
|
private:
|
|
Timeline<CameraPose> _cameraPoseTimeline;
|
|
};
|
|
|
|
} // namespace openspace::interaction
|
|
|
|
#endif // __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__
|