Boris Koenig:

[flightgear.git] / src / Systems / submodel.hxx

diff --git a/src/Systems/submodel.hxx b/src/Systems/submodel.hxx
index 499eb00494eae3c90b8d242abaa2c5b2746e6ae6..a0c4dd6398e51e3f78b9626bf767c5b800b70a3d 100644 (file)
--- a/src/Systems/submodel.hxx
+++ b/src/Systems/submodel.hxx
@@ -29,6 +29,8 @@ public:
  typedef struct {
   SGPropertyNode* trigger;
   SGPropertyNode* prop;
+  SGPropertyNode* contents_node;
+  
   string             name;
   string             model;
   double             speed;
@@ -47,6 +49,9 @@ public:
   double             buoyancy;
   bool               wind;
   bool               first_time;
+  double             cd;
+  double             weight;
+  double             contents;
  } submodel; 
 
  typedef struct {
@@ -59,6 +64,13 @@ public:
   double     speed;
   double     wind_from_east;
   double     wind_from_north;
+  double     speed_down_fps;
+  double     speed_east_fps;
+  double     speed_north_fps;
+  double     total_speed_down;
+  double     total_speed_east;
+  double     total_speed_north;
+  double     mass;
  } IC_struct;  
 
     SubmodelSystem ();
@@ -99,6 +111,8 @@ private:
     double x_offset, y_offset, z_offset;
     double pitch_offset, yaw_offset;
 
+    static const double lbs_to_slugs; //conversion factor
+
     SGPropertyNode* _serviceable_node;
     SGPropertyNode* _user_lat_node;
     SGPropertyNode* _user_lon_node;
@@ -111,9 +125,16 @@ private:
     SGPropertyNode* _user_speed_node;
     SGPropertyNode* _user_wind_from_east_node;
     SGPropertyNode* _user_wind_from_north_node;
+    SGPropertyNode* _user_speed_down_fps_node;
+    SGPropertyNode* _user_speed_east_fps_node;
+    SGPropertyNode* _user_speed_north_fps_node;
+
     FGAIManager* ai;
     IC_struct  IC;
 
 };
 
 #endif // __SYSTEMS_SUBMODEL_HXX
+
+
+