Changeset 848

Timestamp:

01/17/08 23:26:01

Author:

robert

Message:

Added computation of skirt heights for osgTerrain::Terrain code path

Files:

• trunk/src/vpb/Destination.cpp (modified) (5 diffs)

trunk/src/vpb/Destination.cpp

@@ -1223 +1223 @@
-    if (!shapeDrawable) return 0;
-
-0.01f
+_dataSet->getSkirtRatio()
-
-    osg::StateSet* stateset = createStateSet();
@@ -1356 +1356 @@
-    }
-
+
-    osg::HeightField* hf = _terrain->_heightField.get();
-
-
-
+
-       
-    // set up the locator place the data all in the correction position
-    osgTerrain::Locator* locator = new osgTerrain::Locator;
-_dataSet->getEllipsoidModel()
+em
-    
-    if (_dataSet->getDestinationCoordinateSystemNode())
@@ -1370 +1369 @@
-        locator->setCoordinateSystem(_dataSet->getDestinationCoordinateSystemNode()->getCoordinateSystem());
-    }
+    
+    
+    double radius = (_extents._max-_extents._min).length()*0.5;
-    
-    if (_dataSet->getConvertFromGeographicToGeocentric()) 
@@ -1378 +1380 @@
-                                       osg::DegreesToRadians(_extents.xMax()), 
-                                       osg::DegreesToRadians(_extents.yMax()));
+
+        if (em)
+        {
+            double midLong = hf->getOrigin().x() + hf->getXInterval()*((double)(hf->getNumColumns()-1))*0.5;
+            double midLat = hf->getOrigin().y() + hf->getYInterval()*((double)(hf->getNumRows()-1))*0.5;
+
+            double X,Y,Z = hf->getOrigin().z();
+            em->convertLatLongHeightToXYZ(osg::DegreesToRadians(midLat),osg::DegreesToRadians(midLong),Z, X,Y,Z);
+            osg::Vec3d center_position(X,Y,Z);
+
+            Z = hf->getOrigin().z();
+            em->convertLatLongHeightToXYZ(osg::DegreesToRadians(hf->getOrigin().y()),osg::DegreesToRadians(hf->getOrigin().x()),Z, X,Y,Z);
+            osg::Vec3d origin(X,Y,Z);
+            
+            radius = (origin-center_position).length();
+        }            
+
-    }
-    else
@@ -1389 +1408 @@
-        // locator->setCoordinateSystemType(osgTerrain::Locator::GEOGRAPHIC);
-    }
+
+    // need to work out what the skirt should be...
+    hf->setSkirtHeight(radius*_dataSet->getSkirtRatio());
-
-    // create the terrain node that we'll hang the height field off