Changeset 7840

Timestamp:

01/28/08 17:13:42

Author:

robert

Message:

From Cedric Pinson, "default white behaviour : osgviewerd -e ogr yourFile
randomize color by feature: osgviewerd -e ogr -O UseRandomColorByFeature?
yourFile"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ogr/ReaderWriterOGR.cpp

@@ -37 +37 @@
-#include <ogrsf_frmts.h>
-
-
-
-
+
-
-static osg::Material* createDefaultMaterial()
@@ -82 +80 @@
-class ReaderWriterOGR : public osgDB::ReaderWriter
-{
+
-public:
+    ReaderWriterOGR() {}
-    virtual const char* className() const { return "OGR file reader"; }
-    virtual bool acceptsExtension(const std::string& extension) const
@@ -114 +114 @@
-            return 0;
-
+        bool useRandomColorByFeature = false;
+        if (options) 
+        {
+            if (options->getOptionString() == "UseRandomColorByFeature")
+                useRandomColorByFeature = true;
+        }
+
-        osg::Group* group = new osg::Group;
-
-        for (int i = 0; i < file->GetLayerCount(); i++) 
-        {
-
+, useRandomColorByFeature
-            if (node)
-                group->addChild( node );
@@ -126 +133 @@
-    }
-
-
+, bool useRandomColorByFeature
-    {
-        if (!ogrLayer)
@@ -138 +145 @@
-        while ((ogrFeature = ogrLayer->GetNextFeature()) != NULL) 
-        {
-
+, useRandomColorByFeature
-            if (feature)
-                layer->addChild(feature);
@@ -321 +328 @@
-    }
-
-
+, bool useRandomColorByFeature
-    {
-
@@ -388 +395 @@
-            geode->setCullingActive(false); // because culling on one points geode is always true, so i disable it
-        geode->addDrawable(drawable);
-
+
+
-        for(int i = 0; i < ogrFeature->GetFieldCount(); i++) {
-            geode->addDescription(std::string(ogrFeature->GetFieldDefnRef(i)->GetNameRef()) + " : " + std::string(ogrFeature->GetFieldAsString(i)));