Commit 67165aee authored by Jan Möbius's avatar Jan Möbius

Use-enter-leavePick-for-picking

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5398 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2f58a5d0
...@@ -507,8 +507,8 @@ void glViewer::drawScene_mono() ...@@ -507,8 +507,8 @@ void glViewer::drawScene_mono()
// do the picking // do the picking
glstate_->pick_init (true); glstate_->pick_init (true);
ACG::SceneGraph::PickAction action(properties_.renderPickingMode()); ACG::SceneGraph::PickAction action(*glstate_, properties_.renderPickingMode(), properties_.drawMode());
ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_); ACG::SceneGraph::traverse(sceneGraphRoot_, action);
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
} }
......
...@@ -126,8 +126,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -126,8 +126,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
properties_.glState().pick_init (true); properties_.glState().pick_init (true);
// do the picking // do the picking
ACG::SceneGraph::PickAction action(_pickTarget); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); ACG::SceneGraph::traverse(sceneGraphRoot_, action);
// restore GL state // restore GL state
glMatrixMode( GL_PROJECTION ); glMatrixMode( GL_PROJECTION );
...@@ -219,8 +219,8 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -219,8 +219,8 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget,
properties_.glState().pick_init (false); properties_.glState().pick_init (false);
// do the picking // do the picking
ACG::SceneGraph::PickAction action(_pickTarget); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); ACG::SceneGraph::traverse(sceneGraphRoot_, action);
int hits = glRenderMode(GL_RENDER); int hits = glRenderMode(GL_RENDER);
// restore GL state // restore GL state
...@@ -314,8 +314,8 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg ...@@ -314,8 +314,8 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg
properties_.glState().pick_init (true); properties_.glState().pick_init (true);
// do the picking // do the picking
ACG::SceneGraph::PickAction action(_pickTarget); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); ACG::SceneGraph::traverse(sceneGraphRoot_, action);
// restore GL state // restore GL state
glMatrixMode( GL_PROJECTION ); glMatrixMode( GL_PROJECTION );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment