--- a/src/glRenderer.h Mon Jun 30 05:53:14 2014 +0300 +++ b/src/glRenderer.h Thu Jul 03 21:08:32 2014 +0300 @@ -32,12 +32,14 @@ class QSpinBox; class QLineEdit; class QTimer; +class MagicWand; enum EditMode { ESelectMode, EDrawMode, ECircleMode, + EMagicWandMode, }; // @@ -230,6 +232,7 @@ bool m_rectdraw; Vertex m_rectverts[4]; QColor m_bgcolor; + MagicWand* m_wand; void addDrawnVertex (Vertex m_hoverpos); void calcCameraIcons(); @@ -247,6 +250,7 @@ inline double& pan (Axis ax); inline const double& pan (Axis ax) const; void pick (int mouseX, int mouseY); + LDObjectPtr pickOneObject (int mouseX, int mouseY); inline double& rot (Axis ax); void updateRectVerts(); inline double& zoom();