Solve for the elevator control input during approach. It turns out that

[flightgear.git] / src / Model / model.hxx

diff --git a/src/Model/model.hxx b/src/Model/model.hxx
index ce4112ba959732e0357406f379bee8a658218365..bc48663acd0a16c467ac508496482d5949882ece 100644 (file)
--- a/src/Model/model.hxx
+++ b/src/Model/model.hxx
@@ -11,12 +11,25 @@
 #endif
 
 #include <vector>
-#include <plib/ssg.h>
 
 SG_USING_STD(vector);
 
-#include <Main/fg_props.hxx>
-#include <Main/location.hxx>
+#include <plib/sg.h>
+
+
+// Don't pull in the headers, since we don't need them here.
+class ssgBranch;
+class ssgCutout;
+class ssgEntity;
+class ssgRangeSelector;
+class ssgSelector;
+class ssgTransform;
+
+class SGPropertyNode;
+class SGInterpTable;
+class FGCondition;
+class FGLocation;
+
 
 // Has anyone done anything *really* stupid, like making min and max macros?
 #ifdef min
@@ -34,7 +47,7 @@ public:
   virtual ~FG3DModel ();
 
   virtual void init (const string &path);
-  virtual void update (int dt);
+  virtual void update (double dt);
 
   virtual bool getVisible () const;
   virtual void setVisible (bool visible);
@@ -58,7 +71,7 @@ public:
   virtual void setOrientation (double roll_deg, double pitch_deg,
                               double heading_deg);
 
-  virtual ssgEntity * getSceneGraph () const { return _selector; }
+  virtual ssgEntity * getSceneGraph () const { return (ssgEntity *)_selector; }
 
   virtual FGLocation * getFGLocation () const { return _location; }
 
@@ -78,18 +91,17 @@ private:
   double _heading_deg;
 
                                // Animations
-
   vector <Animation *> _animations;
 
-
                                // Scene graph
-  ssgEntity * _model;
+  ssgBranch * _model;
   ssgSelector * _selector;
   ssgTransform * _position;
 
                                // Location
   FGLocation * _location;
 
+
   \f
   //////////////////////////////////////////////////////////////////////
   // Internal classes for individual animations.
@@ -118,9 +130,9 @@ private:
     /**
      * Update the animation.
      *
-     * @param dt The elapsed time in milliseconds since the last call.
+     * @param dt The elapsed time in seconds since the last call.
      */
-    virtual void update (int dt) = 0;
+    virtual void update (double dt) = 0;
 
   };
 
@@ -134,7 +146,7 @@ private:
     NullAnimation ();
     virtual ~NullAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     ssgBranch * _branch;
   };
@@ -149,12 +161,27 @@ private:
     RangeAnimation ();
     virtual ~RangeAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     ssgRangeSelector * _branch;
   };
 
 
+  /**
+   * Animation to turn and face the screen.
+   */
+  class BillboardAnimation : public Animation
+  {
+  public:
+    BillboardAnimation ();
+    virtual ~BillboardAnimation ();
+    virtual void init (ssgEntity * object, SGPropertyNode * props);
+    virtual void update (double dt);
+  private:
+    ssgCutout * _branch;
+  };
+
+
   /**
    * Animation to select alternative versions of the same object.
    */
@@ -164,7 +191,7 @@ private:
     SelectAnimation ();
     virtual ~SelectAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     FGCondition * _condition;
     ssgSelector * _selector;
@@ -182,7 +209,7 @@ private:
     SpinAnimation ();
     virtual ~SpinAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     SGPropertyNode * _prop;
     double _factor;
@@ -205,11 +232,12 @@ private:
     RotateAnimation ();
     virtual ~RotateAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     SGPropertyNode * _prop;
     double _offset_deg;
     double _factor;
+    SGInterpTable * _table;
     bool _has_min;
     double _min_deg;
     bool _has_max;
@@ -231,11 +259,12 @@ private:
     TranslateAnimation ();
     virtual ~TranslateAnimation ();
     virtual void init (ssgEntity * object, SGPropertyNode * props);
-    virtual void update (int dt);
+    virtual void update (double dt);
   private:
     SGPropertyNode * _prop;
     double _offset_m;
     double _factor;
+    SGInterpTable * _table;
     bool _has_min;
     double _min_m;
     bool _has_max;
@@ -246,6 +275,7 @@ private:
     ssgTransform * _transform;
   };
 
+
 };
 
 #endif // __MODEL_HXX