mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 11:39:49 -06:00
752081d31b
- Change Time class to become a non-singleton - Move ownership of the current time to TimeManager(instead of singleton access). - Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables. - Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped. - Introduce Timeline and Keyframe classes - Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager - Added basic unit tests for Timelineand Keyframe Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
122 lines
5.2 KiB
C++
122 lines
5.2 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. *
|
|
****************************************************************************************/
|
|
|
|
namespace openspace {
|
|
|
|
template <typename T>
|
|
Timeline<T>::Timeline()
|
|
: _nextKeyframeId(1)
|
|
{}
|
|
|
|
template <typename T>
|
|
Timeline<T>::~Timeline() {}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::addKeyframe(double timestamp, T data) {
|
|
Keyframe<T> keyframe(++_nextKeyframeId, timestamp, data);
|
|
auto iter = std::upper_bound(_keyframes.begin(), _keyframes.end(), keyframe, &compareKeyframeTimes);
|
|
_keyframes.insert(iter, keyframe);
|
|
}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::removeKeyframesAfter(double timestamp, bool inclusive) {
|
|
auto iter = inclusive
|
|
? std::lower_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareKeyframeTimeWithTime)
|
|
: std::upper_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareTimeWithKeyframeTime);
|
|
|
|
_keyframes.erase(iter, _keyframes.end());
|
|
}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::removeKeyframesBefore(double timestamp, bool inclusive) {
|
|
auto iter = inclusive
|
|
? std::upper_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareTimeWithKeyframeTime)
|
|
: std::lower_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareKeyframeTimeWithTime);
|
|
|
|
_keyframes.erase(_keyframes.begin(), iter);
|
|
}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::removeKeyframesBetween(double begin, double end, bool inclusiveBegin, bool inclusiveEnd) {
|
|
auto beginIter = inclusiveBegin
|
|
? std::lower_bound(_keyframes.begin(), _keyframes.end(), begin, &compareKeyframeTimeWithTime)
|
|
: std::upper_bound(_keyframes.begin(), _keyframes.end(), begin, &compareTimeWithKeyframeTime);
|
|
|
|
auto endIter = inclusiveEnd
|
|
? std::upper_bound(beginIter, _keyframes.end(), end, &compareTimeWithKeyframeTime)
|
|
: std::lower_bound(beginIter, _keyframes.end(), end, &compareKeyframeTimeWithTime);
|
|
|
|
_keyframes.erase(beginIter, endIter);
|
|
}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::clearKeyframes() {
|
|
_keyframes.clear();
|
|
}
|
|
|
|
template <typename T>
|
|
void Timeline<T>::removeKeyframe(size_t id) {
|
|
_keyframes.erase(std::remove_if(_keyframes.begin(), _keyframes.end(), [id] (Keyframe<T> keyframe) {
|
|
return keyframe.id == id;
|
|
}), _keyframes.end());
|
|
}
|
|
|
|
template <typename T>
|
|
size_t Timeline<T>::nKeyframes() const {
|
|
return _keyframes.size();
|
|
}
|
|
|
|
template <typename T>
|
|
const Keyframe<T>* Timeline<T>::firstKeyframeAfter(double timestamp, bool inclusive) const {
|
|
auto it = inclusive
|
|
? std::lower_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareKeyframeTimeWithTime)
|
|
: std::upper_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareTimeWithKeyframeTime);
|
|
if (it == _keyframes.end()) {
|
|
return nullptr;
|
|
}
|
|
return &(*it);
|
|
}
|
|
|
|
template <typename T>
|
|
const Keyframe<T>* Timeline<T>::lastKeyframeBefore(double timestamp, bool inclusive) const {
|
|
auto it = inclusive
|
|
? std::upper_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareTimeWithKeyframeTime)
|
|
: std::lower_bound(_keyframes.begin(), _keyframes.end(), timestamp, &compareKeyframeTimeWithTime);
|
|
if (it == _keyframes.begin()) {
|
|
return nullptr;
|
|
}
|
|
it--;
|
|
return &(*it);
|
|
}
|
|
|
|
|
|
template<typename T>
|
|
const std::deque<Keyframe<T>>& Timeline<T>::keyframes() const {
|
|
return _keyframes;
|
|
}
|
|
|
|
|
|
}
|
|
|