mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update updatestructures to have transform with translation, rotation and scale.

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-18 16:59:51 -04:00
parent ae1f8e457b
commit 628f8b479f
10 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/util/updatestructures.h
+9 -7
View File
@@ -36,10 +36,14 @@ struct InitializeData {
};
struct UpdateData {
glm::dvec3 position;
struct TransformData {
glm::dvec3 translation;
glm::dmat3 rotation;
double scale;
};
struct UpdateData {
TransformData modelTransform;
double time;
bool isTimeJump;
double delta;
@@ -48,13 +52,11 @@ struct UpdateData {
struct RenderData {
const Camera& camera;
// psc position to be removed in favor of the double precision position
// Now both are here due to dependencies of the psc position
// psc position to be removed in favor of the double precision position defined in
// the translation in transform.
psc position;
bool doPerformanceMeasurement;
glm::dvec3 positionVec3;
glm::dmat3 rotation;
double scale;
TransformData modelTransform;
};
struct RaycasterTask {