Port over remaining Point3D usage to the more type and unit safe SG* classes.

[flightgear.git] / src / FDM / YASim / Model.hpp

diff --git a/src/FDM/YASim/Model.hpp b/src/FDM/YASim/Model.hpp
index fb5a998811d849501c2b81e44d2da03d61be5287..7c31b8ac8edc414ee24bae3426e1cf4e28e1cbd1 100644 (file)
--- a/src/FDM/YASim/Model.hpp
+++ b/src/FDM/YASim/Model.hpp
@@ -6,6 +6,7 @@
 #include "BodyEnvironment.hpp"
 #include "Vector.hpp"
 #include "Turbulence.hpp"
+#include "Rotor.hpp"
 
 namespace yasim {
 
@@ -14,9 +15,11 @@ class Integrator;
 class Thruster;
 class Surface;
 class Rotorpart;
-class Rotorblade;
-class Rotor;
 class Gear;
+class Ground;
+class Hook;
+class Launchbar;
+class Hitch;
 
 class Model : public BodyEnvironment {
 public:
@@ -40,15 +43,15 @@ public:
     // Externally-managed subcomponents
     int addThruster(Thruster* t);
     int addSurface(Surface* surf);
-    int addRotorpart(Rotorpart* rpart);
-    int addRotorblade(Rotorblade* rblade);
-    int addRotor(Rotor* rotor);
     int addGear(Gear* gear);
+    void addHook(Hook* hook);
+    void addLaunchbar(Launchbar* launchbar);
     Surface* getSurface(int handle);
-    Rotorpart* getRotorpart(int handle);
-    Rotorblade* getRotorblade(int handle);
-    Rotor* getRotor(int handle);
+    Rotorgear* getRotorgear(void);
     Gear* getGear(int handle);
+    Hook* getHook(void);
+    int addHitch(Hitch* hitch);
+    Launchbar* getLaunchbar(void);
 
     // Semi-private methods for use by the Airplane solver.
     int numThrusters();
@@ -57,14 +60,18 @@ public:
     void initIteration();
     void getThrust(float* out);
 
+    void setGroundCallback(Ground* ground_cb);
+    Ground* getGroundCallback(void);
+
     //
     // Per-iteration settables
     //
-    void setGroundPlane(double* planeNormal, double fromOrigin);
     void setGroundEffect(float* pos, float span, float mul);
     void setWind(float* wind);
     void setAir(float pressure, float temp, float density);
 
+    void updateGround(State* s);
+
     // BodyEnvironment callbacks
     virtual void calcForces(State* s);
     virtual void newState(State* s);
@@ -73,8 +80,8 @@ private:
     void initRotorIteration();
     void calcGearForce(Gear* g, float* v, float* rot, float* ground);
     float gearFriction(float wgt, float v, Gear* g);
-    float localGround(State* s, float* out);
-    void localWind(float* pos, State* s, float* out);
+    void localWind(float* pos, State* s, float* out, float alt,
+        bool is_rotor = false);
 
     Integrator _integrator;
     RigidBody _body;
@@ -83,16 +90,18 @@ private:
 
     Vector _thrusters;
     Vector _surfaces;
-    Vector _rotorparts;
-    Vector _rotorblades;
-    Vector _rotors;
+    Rotorgear _rotorgear;
     Vector _gears;
+    Hook* _hook;
+    Launchbar* _launchbar;
+    Vector _hitches;
 
     float _groundEffectSpan;
     float _groundEffect;
     float _wingCenter[3];
 
-    double _ground[4];
+    Ground* _ground_cb;
+    double _global_ground[4];
     float _pressure;
     float _temp;
     float _rho;