Changeset 6083 for geovis

Timestamp:

Feb 29, 2016 1:34:43 PM (8 years ago)

Author:

ldelgass

Message:

Prevent renderer from waiting in select() if a pick is pending.

Location:

geovis/trunk

Files:

• Picker.cpp (modified) (3 diffs)
• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (2 diffs)

geovis/trunk/Picker.cpp

@@ -221 +221 @@
     }
     setHighlightByObjectID(id);
+    _renderer->pickPending(false);
     _renderer->eventuallyRender();
 }
@@ -233 +234 @@
     queueResponse(mesg, length, Response::STATIC, Response::DATA);
 
+    _renderer->pickPending(false);
     _renderer->eventuallyRender();
 }
@@ -248 +250 @@
         } else {
             _renderer->mapMouseCoords(ea.getX(), ea.getY(), _pickPoint, false);
+            _renderer->pickPending(true);
+            TRACE("Pending pick at %g %g", ea.getX(), ea.getY());
             return true;
         }

geovis/trunk/Renderer.cpp

@@ -122 +122 @@
     _windowWidth(500),
     _windowHeight(500),
+    _pickPending(false),
     _scaleBarUnits(UNITS_METERS)
 {
@@ -2741 +2742 @@
 bool Renderer::checkNeedToDoFrame()
 {
-    return (_needsRedraw ||
+    return (_needsRedraw || _pickPending ||
             (_viewer.valid() && _viewer->checkNeedToDoFrame()));
 }

geovis/trunk/Renderer.h

@@ -431 +431 @@
     void mouseScroll(int direction);
 
+    void pickPending(bool value)
+    { _pickPending = value; }
+
     // Rendering an image
 
@@ -640 +643 @@
     osg::ref_ptr<osgEarth::Util::RTTPicker> _picker;
 #endif
+    bool _pickPending;
     osg::ref_ptr<osg::Group> _placeNodes;
     std::set<osgEarth::Annotation::AnnotationNode *> _hovered;