Merge branch 'jmt/waypt' into next

[simgear.git] / simgear / scene / model / placement.hxx

diff --git a/simgear/scene/model/placement.hxx b/simgear/scene/model/placement.hxx
index 59fe525eec7aa2ece15d834b08b6ed2bb9af86b6..97d5cda5e46305e47dc835e1980069d5bb7d2475 100644 (file)
--- a/simgear/scene/model/placement.hxx
+++ b/simgear/scene/model/placement.hxx
@@ -14,14 +14,9 @@
 #include <osg/ref_ptr>
 #include <osg/Node>
 #include <osg/Switch>
+#include <osg/PositionAttitudeTransform>
 
-#include <simgear/props/props.hxx>
-
-#include "placementtrans.hxx"
-
-// Don't pull in the headers, since we don't need them here.
-class SGLocation;
-
+#include <simgear/math/SGMath.hxx>
 
 // Has anyone done anything *really* stupid, like making min and max macros?
 #ifdef min
@@ -52,8 +47,6 @@ public:
 
   virtual osg::Node* getSceneGraph () { return _selector.get(); }
 
-  virtual SGLocation * getSGLocation () { return _location; }
-
   virtual bool getVisible () const;
   virtual void setVisible (bool visible);
 
@@ -79,11 +72,11 @@ public:
                                double heading_deg);
   void setOrientation(const SGQuatd& orientation);
 
+  void setReferenceTime(const double& referenceTime);
   void setBodyLinearVelocity(const SGVec3d& velocity);
   void setBodyAngularVelocity(const SGVec3d& velocity);
   
 private:
-
                                 // Geodetic position
   SGGeod _position;
 
@@ -93,10 +86,7 @@ private:
   double _heading_deg;
 
   osg::ref_ptr<osg::Switch> _selector;
-  osg::ref_ptr<SGPlacementTransform> _transform;
-
-                                // Location
-  SGLocation * _location;
+  osg::ref_ptr<osg::PositionAttitudeTransform> _transform;
 };
 
 #endif // _SG_PLACEMENT_HXX