Merge

include/openspace/scene/ephemeris.h

@@ -39,7 +39,6 @@ public:
     virtual ~Ephemeris();
     virtual bool initialize();
     virtual const glm::dvec3& position() const = 0;
-    virtual const glm::dmat3& worldRotationMatrix() const = 0;
     virtual void update(const UpdateData& data);
 
 protected:

include/openspace/scene/scenegraphnode.h

@@ -50,8 +50,7 @@ public:
         long long updateTimeEphemeris;  // time in ns
     };
 
-    static std::string RootNodeName;
-
+    static const std::string RootNodeName;
     static const std::string KeyName;
     static const std::string KeyParentName;
     static const std::string KeyDependencies;
@@ -105,11 +104,16 @@ private:
     bool sphereInsideFrustum(const psc& s_pos, const PowerScaledScalar& s_rad, const Camera* camera);
 
     glm::dvec3 calculateWorldPosition() const;
+    glm::dmat3 calculateWorldRotation() const;
 
     std::vector<SceneGraphNode*> _children;
     SceneGraphNode* _parent;
     Ephemeris* _ephemeris;
 
+    std::string _rotationSourceFrame;
+    std::string _rotationDestinationFrame;
+    glm::dmat3 _rotationMatrix;
+
     PerformanceRecord _performanceRecord;
 
     Renderable* _renderable;
@@ -120,6 +124,7 @@ private:
 
     //psc _worldPositionCached;
     glm::dvec3 _worldPositionCached;
+    glm::dmat3 _worldRotationCached;
 };
 
 } // namespace openspace

include/openspace/util/updatestructures.h

@@ -51,7 +51,7 @@ struct RenderData {
     psc position;
     bool doPerformanceMeasurement;
     glm::dvec3 positionVec3;
-
+    glm::dmat3 rotation;
 };
 
 struct RaycasterTask {