Changeset 863

Timestamp:

01/28/08 18:03:19

Author:

robert

Message:

From Jean-Christophe Lombardo, "I've added a -hf (or --HeightField?) and -shp command line options to
respectively specify the height field and shape files to load. Default
behavior is kept (ie loading files from David's computer :) ).
I've also added a polygon offset to force the mapped shapefiles to be
over the terrain."

Files:

• trunk/applications/vpbheightfieldmapping/vpbheightfieldmapping.cpp (modified) (5 diffs)

trunk/applications/vpbheightfieldmapping/vpbheightfieldmapping.cpp

@@ -14 +14 @@
-#include <osg/CoordinateSystemNode>
-#include <osg/Material>
+#include <osg/PolygonOffset>
-
-#include <osg/Vec4>
@@ -97 +98 @@
-    arguments.getApplicationUsage()->addCommandLineOption("--DrawThreadPerContext","Select DrawThreadPerContext threading model for viewer.");
-    arguments.getApplicationUsage()->addCommandLineOption("--CullThreadPerCameraDrawThreadPerContext","Select CullThreadPerCameraDrawThreadPerContext threading model for viewer.");
+    arguments.getApplicationUsage()->addCommandLineOption("-hf or --HeightField <height field>","Load the height field.");
+    arguments.getApplicationUsage()->addCommandLineOption("-shp <shape file>","The geometry to reproject.");
-
-    // if user request help write it out to cout.
@@ -171 +174 @@
-//    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
-    std::string modelFile("/home/ledocc/Work/VPB/data/lines.shp");
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
@@ -179 +194 @@
-    
-    std::string heightFieldFile("/home/ledocc/Work/VPB/data/dtm_200m.tif.gdal");
+    if (!arguments.read("-hf", heightFieldFile))
+       arguments.read("--HeightField", heightFieldFile);
+
-    osg::ref_ptr<osg::HeightField> hf = osgDB::readHeightFieldFile(heightFieldFile);
-
+
+
+
+
+
+
-    // ** map loaded model on HeightField
-    vpb::HeightFieldMapper hfm(*hf.get());
@@ -199 +222 @@
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-    geode->addDrawable(new osg::ShapeDrawable(hf.get()));
+    osg::StateSet *sset = geode->getOrCreateStateSet();
+    sset->setRenderBinDetails(sset->getBinNumber()-1, sset->getBinName());
+    sset->setAttributeAndModes(new osg::PolygonOffset(1.0, 2.0));
+
-    
-    osg::ref_ptr<osg::Group> group(new osg::Group);