Changeset 4282 for trunk/packages

Timestamp:

Mar 27, 2014, 7:17:47 PM (11 years ago)

Author:

ldelgass

Message:

Add some tests for NULL pointers, fix argument indices in map terain linecolor
(still not implemented)

Location:

trunk/packages/vizservers/geovis

Files:

• Renderer.cpp (modified) (9 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (1 diff)
• geovis_protocol.txt (modified) (1 diff)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -29 +29 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarthUtil/EarthManipulator>
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
+#include <osgEarthUtil/Sky>
+#else
+#include <osgEarthUtil/SkyNode>
+#endif
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/MouseCoordsTool>
@@ -63 +68 @@
     _captureCallback = new ScreenCaptureCallback();
     _viewer->getCamera()->setPostDrawCallback(_captureCallback.get());
+#if 1
     osgEarth::MapOptions mapOpts;
     mapOpts.coordSysType() = osgEarth::MapOptions::CSTYPE_PROJECTED;
@@ -89 +95 @@
     _mouseCoordsTool->addCallback(_coordsCallback);
     _viewer->addEventHandler(_mouseCoordsTool);
+#else
+    _sceneRoot = new osg::Group;
+    _viewer->setSceneData(_sceneRoot.get());
+#endif
     _viewer->getCamera()->setNearFarRatio(0.00002);
     _viewer->getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
@@ -234 +244 @@
         _viewer->removeEventHandler(_mouseCoordsTool.get());
     _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
+    if (!_coordsCallback.valid()) {
+        _coordsCallback = new MouseCoordsCallback();
+    }
     _mouseCoordsTool->addCallback(_coordsCallback.get());
+    _viewer->addEventHandler(_mouseCoordsTool.get());
+
     if (_clipPlaneCullCallback.valid()) {
         _viewer->getCamera()->removeCullCallback(_clipPlaneCullCallback.get());
@@ -243 +258 @@
         _viewer->getCamera()->addCullCallback(_clipPlaneCullCallback.get());
     }
-    _viewer->addEventHandler(_mouseCoordsTool.get());
     _viewer->setSceneData(_sceneRoot.get());
     _manipulator = new osgEarth::Util::EarthManipulator;
@@ -302 +316 @@
     osgEarth::MapNode *mapNode = new osgEarth::MapNode(map, mapNodeOpts);
     _mapNode = mapNode;
-    _sceneRoot = mapNode;
+    if (_map->isGeocentric()) {
+#if OSGEARTH_MIN_VERSION_REQUIRED(2, 5, 1)
+        osgEarth::Util::SkyNode *sky = new osgEarth::Util::SkyNode::create(mapNode);
+        sky->addChild(mapNode);
+        _sceneRoot = sky;
+#else
+        _sceneRoot = mapNode;
+#endif
+    } else {
+        _sceneRoot = mapNode;
+    }
     if (_mouseCoordsTool.valid())
         _viewer->removeEventHandler(_mouseCoordsTool.get());
     _mouseCoordsTool = new osgEarth::Util::MouseCoordsTool(mapNode);
+    if (!_coordsCallback.valid()) {
+        _coordsCallback = new MouseCoordsCallback();
+    }
     _mouseCoordsTool->addCallback(_coordsCallback.get());
     _viewer->addEventHandler(_mouseCoordsTool.get());
@@ -534 +561 @@
     // XXX: GDAL does not report vertical datum, it should be specified here
     osgEarth::ElevationLayerOptions layerOpts(name, opts);
-    //layerOpts.verticalDatum() = "";
+    // Common options: geodetic (default), egm96, egm84, egm2008
+    //layerOpts.verticalDatum() = "egm96";
     _map->addElevationLayer(new osgEarth::ElevationLayer(layerOpts));
     _needsRedraw = true;
@@ -747 +775 @@
 void Renderer::setThrowingEnabled(bool state)
 {
-    _manipulator->getSettings()->setThrowingEnabled(state);
+    if (_manipulator.valid()) {
+        _manipulator->getSettings()->setThrowingEnabled(state);
+    }
 }
 
@@ -776 +806 @@
 void Renderer::mouseMotion(double x, double y)
 {
-    //getEventQueue()->mouseMotion((float)x, (float)y);
-    //return;
-    osgEarth::GeoPoint map;
-    if (mapMouseCoords(x, y, map)) {
-        _coordsCallback->set(map, _viewer.get(), _mapNode);
-    } else {
-        _coordsCallback->reset(_viewer.get(), _mapNode);
+    if (_coordsCallback.valid()) {
+        //getEventQueue()->mouseMotion((float)x, (float)y);
+        //return;
+        osgEarth::GeoPoint map;
+        if (mapMouseCoords(x, y, map)) {
+            _coordsCallback->set(map, _viewer.get(), _mapNode);
+        } else {
+            _coordsCallback->reset(_viewer.get(), _mapNode);
+        }
     }
 }

trunk/packages/vizservers/geovis/Renderer.h

@@ -282 +282 @@
     bool getMousePoint(double *x, double *y, double *z)
     {
-        return _coordsCallback->report(x, y, z);
+        return (_coordsCallback.valid() && _coordsCallback->report(x, y, z));
     }
 

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -918 +918 @@
 {
     float color[3];
-    if (GetFloatFromObj(interp, objv[2], &color[0]) != TCL_OK ||
-        GetFloatFromObj(interp, objv[3], &color[1]) != TCL_OK ||
-        GetFloatFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+    if (GetFloatFromObj(interp, objv[3], &color[0]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[4], &color[1]) != TCL_OK ||
+        GetFloatFromObj(interp, objv[5], &color[2]) != TCL_OK) {
         return TCL_ERROR;
     }

trunk/packages/vizservers/geovis/geovis_protocol.txt

@@ -62 +62 @@
 map layer add <type> <url> ... <layerName>
     <type> = image|wms|tms|elevation|point|polygon|line|text
+
+Specific layer types:
 map layer add image <url> <layerName>
     Add a GDAL image layer from a file or URL