Commit b41f5a1b authored by Jan Möbius's avatar Jan Möbius

Disable multipass as it braks the source/target selection rendering

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@7773 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1e6f4b53
...@@ -605,12 +605,12 @@ void glViewer::drawScene_mono() ...@@ -605,12 +605,12 @@ void glViewer::drawScene_mono()
} }
ACG::SceneGraph::DrawAction action( properties_.drawMode() , false); ACG::SceneGraph::DrawAction action( properties_.drawMode() , false);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode() ); ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_, properties_.drawMode() );
if( blending_ ) if( blending_ )
{ {
ACG::SceneGraph::DrawAction action(properties_.drawMode(), true); ACG::SceneGraph::DrawAction action(properties_.drawMode(), true);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode()); ACG::SceneGraph::traverse(sceneGraphRoot_, action, *glstate_, properties_.drawMode());
} }
if (oM) if (oM)
...@@ -698,7 +698,7 @@ void glViewer::drawScene_mono() ...@@ -698,7 +698,7 @@ void glViewer::drawScene_mono()
// do the picking // do the picking
glstate_->pick_init (true); glstate_->pick_init (true);
ACG::SceneGraph::PickAction action(*glstate_, properties_.renderPickingMode(), properties_.drawMode()); ACG::SceneGraph::PickAction action(*glstate_, properties_.renderPickingMode(), properties_.drawMode());
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,*glstate_); ACG::SceneGraph::traverse(sceneGraphRoot_, action,*glstate_);
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glEnable(GL_BLEND); glEnable(GL_BLEND);
......
...@@ -184,7 +184,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -184,7 +184,7 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
// do the picking // do the picking
ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,properties_.glState() ); ACG::SceneGraph::traverse(sceneGraphRoot_, action,properties_.glState() );
// restore GL state // restore GL state
glMatrixMode( GL_PROJECTION ); glMatrixMode( GL_PROJECTION );
...@@ -446,7 +446,7 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -446,7 +446,7 @@ bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget,
// do the picking // do the picking
ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, properties_.glState()); ACG::SceneGraph::traverse(sceneGraphRoot_, action, properties_.glState());
int hits = glRenderMode(GL_RENDER); int hits = glRenderMode(GL_RENDER);
// restore GL state // restore GL state
...@@ -579,7 +579,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg ...@@ -579,7 +579,7 @@ bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarg
// do the picking // do the picking
ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode()); ACG::SceneGraph::PickAction action(properties_.glState(), _pickTarget, properties_.drawMode());
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action,properties_.glState()); ACG::SceneGraph::traverse(sceneGraphRoot_, action,properties_.glState());
// 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