Modified Files:

	Makefile.am SGPickCallback.hxx: add proirities for pick callbacks.

diff --git a/simgear/scene/util/Makefile.am b/simgear/scene/util/Makefile.am
index 0bdba87f30867cbb44a39d045af2afc413a86893..48218f079349de3abbb1feeb4bfccc925487553f 100644 (file)
--- a/simgear/scene/util/Makefile.am
+++ b/simgear/scene/util/Makefile.am
@@ -5,15 +5,15 @@ lib_LIBRARIES = libsgutil.a
 noinst_HEADERS =
 
 include_HEADERS = \
-       SGNodeMasks.hxx \
-       SGUpdateVisitor.hxx \
-       SGEnlargeBoundingBox.hxx \
        SGDebugDrawCallback.hxx \
+       SGEnlargeBoundingBox.hxx \
+       SGNodeMasks.hxx \
        SGPickCallback.hxx \
        SGSceneFeatures.hxx \
        SGSceneUserData.hxx \
        SGStateAttributeVisitor.hxx \
        SGTextureStateAttributeVisitor.hxx \
+       SGUpdateVisitor.hxx \
        RenderConstants.hxx \
        StateAttributeFactory.hxx \
        VectorArrayAdapter.hxx

diff --git a/simgear/scene/util/SGPickCallback.hxx b/simgear/scene/util/SGPickCallback.hxx
index a8bf82cbe80de676371f2d9b403f0c3b299f9c23..90b720f847396d245a4979e144b25b42b1b55942 100644 (file)
--- a/simgear/scene/util/SGPickCallback.hxx
+++ b/simgear/scene/util/SGPickCallback.hxx
@@ -30,11 +30,21 @@
 // The interface is still under development
 class SGPickCallback : public SGReferenced {
 public:
+  enum Priority {
+    PriorityGUI = 0,
+    PriorityPanel = 1,
+    PriorityOther = 2
+  };
+
   struct Info {
     SGVec3d wgs84;
     SGVec3d local;
   };
 
+  SGPickCallback(Priority priority = PriorityOther) :
+    _priority(priority)
+  { }
+
   virtual ~SGPickCallback() {}
   virtual bool buttonPressed(int button, const Info& info)
   { return false; }
@@ -42,6 +52,12 @@ public:
   { }
   virtual void buttonReleased(void)
   { }
+
+  Priority getPriority() const
+  { return _priority; }
+
+private:
+  Priority _priority;
 };
 
 struct SGSceneryPick {