Changeset 5938

Timestamp:

Dec 3, 2015, 12:30:50 PM (9 years ago)

Author:

ldelgass

Message:

Try finding FeatureSourceIndexNodes? in scene graph to lookup global ID for a
feature ID.

Location:

geovis/trunk

Files:

• Makefile.in (modified) (1 diff)
• Picker.cpp (modified) (4 diffs)
• Picker.h (modified) (2 diffs)
• Renderer.cpp (modified) (5 diffs)
• Util.h (modified) (1 diff)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/Makefile.in

@@ -206 +206 @@
 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h
 ReadBuffer.o: ReadBuffer.h Trace.h
-Renderer.o: Renderer.h Trace.h Picker.h MouseCoordsTool.h ScaleBar.h FileUtil.h
+Renderer.o: Renderer.h Trace.h Picker.h MouseCoordsTool.h ScaleBar.h FileUtil.h Util.h
 RendererCmd.o: Renderer.h ReadBuffer.h ResponseQueue.h Trace.h CmdProc.h PPMWriter.h TGAWriter.h
 RenderServer.o: RenderServer.h RendererCmd.h Renderer.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h Stats.h

geovis/trunk/Picker.cpp

@@ -29 +29 @@
 
 static const char *highlightVert =
-    "#version 130\n"
+    "#version " GLSL_VERSION_STR "\n"
     "uniform uint objectid_to_highlight; \n"
     "uint oe_index_objectid;      // Stage global containing object id \n"
@@ -39 +39 @@
 
 static const char *highlightFrag =
-    "#version 130\n"
+    "#version " GLSL_VERSION_STR "\n"
     "flat in int selected; \n"
     "void highlightFragment(inout vec4 color) \n"
@@ -51 +51 @@
 static void installHighlighter(osg::StateSet *stateSet, int attrLocation)
 {
+    TRACE("GLSL Version: %s", GLSL_VERSION_STR);
     // This shader program will highlight the selected object.
     osgEarth::VirtualProgram *vp = osgEarth::VirtualProgram::getOrCreate(stateSet);
@@ -62 +63 @@
     s_highlightUniform = new osg::Uniform("objectid_to_highlight", 0u);
     stateSet->addUniform(s_highlightUniform);
+}
+
+void GeoVis::setHighlightByObjectID(osgEarth::ObjectID id)
+{
+    if (s_highlightUniform != NULL) {
+        s_highlightUniform->set(id);
+    }
+}
+
+void GeoVis::clearHighlight()
+{
+    if (s_highlightUniform != NULL) {
+        s_highlightUniform->set(0U);
+    }
 }
 

geovis/trunk/Picker.h

@@ -9 +9 @@
 
 #include <osgEarth/Picker>
+#include <osgEarth/ObjectIndex>
 
 namespace GeoVis {
@@ -53 +54 @@
 };
 
+extern void setHighlightByObjectID(osgEarth::ObjectID id);
+extern void clearHighlight();
+
 }
 

geovis/trunk/Renderer.cpp

@@ -41 +41 @@
 #include <osgEarthDrivers/cache_filesystem/FileSystemCache>
 #include <osgEarth/MapNode>
+#include <osgEarth/TerrainEngineNode>
 #include <osgEarth/Bounds>
 #include <osgEarth/Profile>
@@ -62 +63 @@
 #include <osgEarth/Pickers>
 #endif
+#include <osgEarthFeatures/FeatureModelSource>
 #include <osgEarthFeatures/Feature>
 #include <osgEarthSymbology/Color>
@@ -101 +103 @@
 #include "ScaleBar.h"
 #include "FileUtil.h"
+#include "Util.h"
 #include "Trace.h"
 
@@ -1533 +1536 @@
 {
     TRACE("Select layer '%s', num features: %u", layerName, featureIDs.size());
+    if (featureIDs.size() == 0) {
+        // clear selection
+        return;
+    }
     osgEarth::ModelLayer *layer = _map->getModelLayerByName(layerName);
     if (layer == NULL) {
@@ -1538 +1545 @@
         return;
     }
+#ifdef WANT_TRACE
     for (unsigned int i = 0; i < featureIDs.size(); i++) {
         TRACE("feature ID: %u", featureIDs.at(i));
+    }
+#endif
+    unsigned long fid = featureIDs.at(0);
+
+    osgEarth::ModelSource *modelSource = layer->getModelSource();
+    osgEarth::Features::FeatureModelSource *fms = dynamic_cast<osgEarth::Features::FeatureModelSource *>(modelSource);
+    if (fms != NULL) {
+        osgEarth::Features::FeatureSource *fs = fms->getFeatureSource();
+        FindFeatureSourceIndexNodeVisitor visitor;
+        visitor.source = fs;
+        _sceneRoot->accept(visitor);
+        TRACE("Num FeatureSourceIndexNodes found: %lu", visitor.nodes.size());
+        for (size_t i = 0; i < visitor.nodes.size(); i++) {
+            osgEarth::Features::FeatureIndex *index = visitor.nodes[i]->getIndex();
+#if OSGEARTH_MIN_VERSION_REQUIRED(3, 0, 0)
+            osgEarth::ObjectID id = index->getObjectID(fid);
+            setHighlightByObjectID(id);
+            TRACE("FID %lu = OID %d", fid, id);
+#endif
+        }
     }
 }

geovis/trunk/Util.h

@@ -8 +8 @@
 #define GEOVIS_UTIL_H
 
+#include <cstring>
 #include <string>
 
+#include <osg/NodeVisitor>
+#include <osgEarthFeatures/FeatureIndex>
+#include <osgEarthFeatures/FeatureSourceIndexNode>
+
 namespace GeoVis {
+
+class FindFeatureSourceIndexNodeVisitor : public osg::NodeVisitor {
+public:
+    FindFeatureSourceIndexNodeVisitor() :
+        osg::NodeVisitor(TRAVERSE_ALL_CHILDREN),
+        source(NULL)
+    {
+    }
+
+    virtual ~FindFeatureSourceIndexNodeVisitor() {}
+
+    virtual void apply(osg::Node& node)
+    {
+        if (strcmp(node.className(), "FeatureSourceIndexNode") == 0) {
+            osgEarth::Features::FeatureSourceIndexNode *fsin = dynamic_cast<osgEarth::Features::FeatureSourceIndexNode *>(&node);
+            osgEarth::Features::FeatureSourceIndex *index = fsin->getIndex();
+            if (source == NULL || index->getFeatureSource() == source) {
+                nodes.push_back(fsin);
+            }
+        }
+        traverse(node);
+    }
+
+    osgEarth::Features::FeatureSource *source;
+    std::vector<osgEarth::Features::FeatureSourceIndexNode *> nodes;
+};
 
 extern std::string loadCSVLayer(const char *filename, const char *longitudeColName = "longitude", const char *latitudeColName = "latitude");

geovis/trunk/geovis_protocol.txt

@@ -215 +215 @@
 <clamptechnique> = drape|gpu|scene|map
 
+map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <style> <?scripts?> <?selectors?> <?visibilityRangeMin?> <?visibilityRangeMax?>
+    <style> = CSS styles
+    <scripts> = JavaScript
+    <selectors> = List of name/value pairs
 map layer add <layerName> icon <driver> <format> <typeName> <url> <cache> <icon> <scale> <heading> <declutter> <placement> <alignment> <?visibilityRangeMin?> <?visibilityRangeMax?>
     Add an icon feature layer from a file or URL