Changeset 5941 for geovis/trunk/Picker.cpp

Timestamp:

Dec 6, 2015, 11:05:57 PM (9 years ago)

Author:

ldelgass

Message:

Fix for feature highlight

File:

• geovis/trunk/Picker.cpp (modified) (5 diffs)

geovis/trunk/Picker.cpp

@@ -61 +61 @@
 
     // A uniform that will tell the shader which object to highlight:
-    s_highlightUniform = new osg::Uniform("objectid_to_highlight", 0u);
+    if (s_highlightUniform == NULL) {
+        s_highlightUniform = new osg::Uniform("objectid_to_highlight", 0u);
+    }
     stateSet->addUniform(s_highlightUniform);
 }
@@ -145 +147 @@
 #endif
     }
-    s_highlightUniform->set(id);
+    setHighlightByObjectID(id);
 }
 
@@ -163 +165 @@
         _renderer->eventuallyRender();
     }
-    s_highlightUniform->set(0U);
+    clearHighlight();
 }
 
@@ -254 +256 @@
         }
     }
-    s_highlightUniform->set(id);
+    setHighlightByObjectID(id);
     _renderer->eventuallyRender();
 }
@@ -262 +264 @@
     INFO("Select miss");
     clearSelection();
-    s_highlightUniform->set(0U);
+    clearHighlight();
 
     static const char *mesg = "nv>select clear\n";