Added a new 'delimiter' property to allow an alternative delimiter to

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

diff --git a/src/Main/model.hxx b/src/Main/model.hxx
index c68bcc75d56fa151e091173b8ea8c2401ecf8184..ac23895c516ea2368399caa9b147337066914b61 100644 (file)
--- a/src/Main/model.hxx
+++ b/src/Main/model.hxx
@@ -38,26 +38,30 @@ private:
   {
     enum Type {
       None,
-      Spin
+      Spin,
+      Rotate
     };
     string name;
     Type type;
     ssgTransform * transform;
     sgMat4 matrix;
     SGPropertyNode * prop;
+    float factor;
+    float offset;
     float position;
-    float center_x;
-    float center_y;
-    float center_z;
-    float axis_x;
-    float axis_y;
-    float axis_z;
+    bool has_min;
+    float min;
+    bool has_max;
+    float max;
+    sgVec3 center;
+    sgVec3 axis;
+    void setRotation ();
   };
 
-  Animation read_animation (const SGPropertyNode * node);
+  Animation read_animation (const string &object_name,
+                           const SGPropertyNode * node);
   void do_animation (Animation &animation, long elapsed_ms);
 
-  SGPropertyNode * _props;
   ssgEntity * _model;
   ssgSelector * _selector;
   ssgTransform * _position;