Merge branch 'curt/replay' into next

[flightgear.git] / src / Main / viewmgr.hxx

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 30f81bec9d864f677419d8f12d467856a5e9e843..c296b71559b50e2018d585e3272c58d52f1ebcb3 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -119,10 +119,20 @@ private:
     void setViewAxisLat (double axis);
     int getView () const;
     void setView (int newview);
-// quaternion accessors:
-    const char* getCurrentViewOrientation() const;
-    const char* getCurrentViewOrOffset() const;
-    const char* getCurrentViewFrame() const;
+
+// quaternion accessors, for debugging:
+    double getCurrentViewOrientation_w() const;
+    double getCurrentViewOrientation_x() const;
+    double getCurrentViewOrientation_y() const;
+    double getCurrentViewOrientation_z() const;
+    double getCurrentViewOrOffset_w() const;
+    double getCurrentViewOrOffset_x() const;
+    double getCurrentViewOrOffset_y() const;
+    double getCurrentViewOrOffset_z() const;
+    double getCurrentViewFrame_w() const;
+    double getCurrentViewFrame_x() const;
+    double getCurrentViewFrame_y() const;
+    double getCurrentViewFrame_z() const;
 
     bool stationary () const;
 
@@ -144,6 +154,9 @@ private:
 // which is widely used in FGFS
 // and rotates it into the OpenGL camera system 
 // i.e. Xprime=starboard, Yprime=top, Zprime=aft.
-const SGQuatd fsb2sta(-0.5, -0.5, 0.5, 0.5);
+inline const SGQuatd fsb2sta()
+{
+    return SGQuatd(-0.5, -0.5, 0.5, 0.5);
+}
 
 #endif // _VIEWMGR_HXX