Merge branch 'maint2' into next

[flightgear.git] / src / Instrumentation / agradar.hxx

diff --git a/src/Instrumentation/agradar.hxx b/src/Instrumentation/agradar.hxx
index abdf18e9ee4a16e34490f8c35b4a5e10bb94d03f..f5ad02d73ae79a477c29aded63cdfccd43688c0f 100644 (file)
--- a/src/Instrumentation/agradar.hxx
+++ b/src/Instrumentation/agradar.hxx
@@ -41,7 +41,7 @@ public:
     virtual void update (double dt);
 
     void setUserPos();
-    void setUserVec(int az, double el);
+    void setUserVec(double az, double el);
     void update_terrain();
     void setAntennaPos();
 
@@ -67,6 +67,27 @@ public:
     SGPropertyNode_ptr _user_pitch_deg_node;
     SGPropertyNode_ptr _terrain_warning_node;
 
+    SGPropertyNode_ptr _xOffsetMNode;
+    SGPropertyNode_ptr _yOffsetMNode;
+    SGPropertyNode_ptr _zOffsetMNode;
+
+    SGPropertyNode_ptr _elevLimitDegNode;
+    SGPropertyNode_ptr _elevStepDegNode;
+    SGPropertyNode_ptr _azLimitDegNode;
+    SGPropertyNode_ptr _azStepDegNode;
+    SGPropertyNode_ptr _maxRangeMNode;
+    SGPropertyNode_ptr _minRangeMNode;
+    SGPropertyNode_ptr _tiltNode;
+
+    SGPropertyNode_ptr _brgDegNode;
+    SGPropertyNode_ptr _rangeMNode;
+    SGPropertyNode_ptr _elevationMNode;
+    SGPropertyNode_ptr _materialNode;
+    SGPropertyNode_ptr _bumpinessNode;
+
+    SGPropertyNode_ptr _rollStabNode;
+    SGPropertyNode_ptr _pitchStabNode;
+
     SGGeod userpos;
     SGGeod hitpos;
     SGGeod antennapos;