mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-23 20:49:00 -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.
81 lines
3.1 KiB
C++
81 lines
3.1 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. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|
|
#define __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|
|
|
|
#include <openspace/util/camera.h>
|
|
#include <openspace/util/powerscaledcoordinate.h>
|
|
#include <openspace/util/time.h>
|
|
|
|
namespace openspace {
|
|
|
|
class VolumeRaycaster;
|
|
|
|
struct InitializeData {
|
|
|
|
};
|
|
|
|
struct TransformData {
|
|
glm::dvec3 translation;
|
|
glm::dmat3 rotation;
|
|
double scale;
|
|
};
|
|
|
|
struct UpdateData {
|
|
TransformData modelTransform;
|
|
const Time time;
|
|
const bool doPerformanceMeasurement;
|
|
};
|
|
|
|
|
|
struct RenderData {
|
|
const Camera& camera;
|
|
// psc position to be removed in favor of the double precision position defined in
|
|
// the translation in transform.
|
|
psc position;
|
|
const Time time;
|
|
bool doPerformanceMeasurement;
|
|
int renderBinMask;
|
|
TransformData modelTransform;
|
|
};
|
|
|
|
struct RaycasterTask {
|
|
VolumeRaycaster* raycaster;
|
|
RenderData renderData;
|
|
};
|
|
|
|
struct RendererTasks {
|
|
std::vector<RaycasterTask> raycasterTasks;
|
|
};
|
|
|
|
struct RaycastData {
|
|
int id;
|
|
std::string namespaceName;
|
|
};
|
|
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_CORE___UPDATESTRUCTURES___H__
|