From 67165aee2543ad8881f0f18bafc8990d0e2d2a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 23 Mar 2009 06:46:59 +0000 Subject: [PATCH] Use-enter-leavePick-for-picking git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5398 383ad7c9-94d9-4d36-a494-682f7c89f535 --- widgets/glWidget/QtBaseViewer.cc | 4 ++-- widgets/glWidget/QtBaseViewerPicking.cc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/widgets/glWidget/QtBaseViewer.cc b/widgets/glWidget/QtBaseViewer.cc index 882c70cd..385ceab5 100644 --- a/widgets/glWidget/QtBaseViewer.cc +++ b/widgets/glWidget/QtBaseViewer.cc @@ -507,8 +507,8 @@ void glViewer::drawScene_mono() // do the picking glstate_->pick_init (true); - ACG::SceneGraph::PickAction action(properties_.renderPickingMode()); - ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_); + ACG::SceneGraph::PickAction action(*glstate_, properties_.renderPickingMode(), properties_.drawMode()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action); glEnable(GL_LIGHTING); } diff --git a/widgets/glWidget/QtBaseViewerPicking.cc b/widgets/glWidget/QtBaseViewerPicking.cc index a62cd023..ee2bb4ea 100644 --- a/widgets/glWidget/QtBaseViewerPicking.cc +++ b/widgets/glWidget/QtBaseViewerPicking.cc @@ -126,8 +126,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, properties_.glState().pick_init (true); // do the picking - ACG::SceneGraph::PickAction action(_pickTarget); - ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); + ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action); // restore GL state glMatrixMode( GL_PROJECTION ); @@ -219,8 +219,8 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget, properties_.glState().pick_init (false); // do the picking - ACG::SceneGraph::PickAction action(_pickTarget); - ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); + ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action); int hits = glRenderMode(GL_RENDER); // restore GL state @@ -314,8 +314,8 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg properties_.glState().pick_init (true); // do the picking - ACG::SceneGraph::PickAction action(_pickTarget); - ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState()); + ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); + ACG::SceneGraph::traverse(sceneGraphRoot_, action); // restore GL state glMatrixMode( GL_PROJECTION ); -- GitLab