Move viewer-related sources to separate folder.

[flightgear.git] / src / Instrumentation / groundradar.cxx

diff --git a/src/Instrumentation/groundradar.cxx b/src/Instrumentation/groundradar.cxx
index 937fa2614b4858758c068307b31055a4185c5d81..b7d2834136d5f8b370b75ce8d11388aa2457426c 100644 (file)
--- a/src/Instrumentation/groundradar.cxx
+++ b/src/Instrumentation/groundradar.cxx
@@ -20,6 +20,8 @@
 #  include "config.h"
 #endif
 
+#include <cassert>
+
 #include <osg/Node>
 #include <osg/Geode>
 #include <osg/Geometry>
@@ -34,7 +36,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Cockpit/panel.hxx>
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
@@ -45,7 +47,7 @@
 #include "groundradar.hxx"
 
 static const char* airport_source_node_name = "airport-id-source";
-static const char* default_airport_node_name = "/sim/tower/airport-id";
+static const char* default_airport_node_name = "/sim/airport/closest-airport-id";
 static const char* texture_node_name = "texture-name";
 static const char* default_texture_name = "Aircraft/Instruments/Textures/od_groundradar.rgb";
 static const char* range_source_node_name = "range-source";
@@ -75,6 +77,11 @@ GroundRadar::~GroundRadar()
     _range_node->removeChangeListener(this);
 }
 
+void GroundRadar::update (double /* dt */)
+{
+  
+}
+
 void GroundRadar::valueChanged(SGPropertyNode*)
 {
     updateTexture();
@@ -197,7 +204,7 @@ osg::Geometry *GroundRadar::addPavementGeometry(const FGPavement* aPavement, dou
   geo_inverse_wgs_84(aTowerLat, aTowerLon, (*loopBegin)->mPos.getLatitudeDeg(), (*loopBegin)->mPos.getLongitudeDeg(), &az1, &az2, &dist_m);
   osg::Vec3 p1 = fromPolar(az1, dist_m * aScale) + osg::Vec3(TextureHalfSize, TextureHalfSize, 0);
   pts->push_back( p1 );
-  polygon->setVertexArray( pts );
+  polygon->setVertexArray( pts.get() );
 
   polygon->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::POLYGON, 0, pts->size() ) );