Commit bdf4a63d authored by Christopher Tenter's avatar Christopher Tenter

get rid of unused name picking closes #2501

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@20930 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ba1d69bf
...@@ -831,13 +831,6 @@ private: ...@@ -831,13 +831,6 @@ private:
unsigned int& _targetIdx, unsigned int& _targetIdx,
ACG::Vec3d* _hitPointPtr=0 ); ACG::Vec3d* _hitPointPtr=0 );
/// pick using selection buffer
bool pickGL( ACG::SceneGraph::PickTarget _pickTarget,
const QPoint& _mousePos,
unsigned int& _nodeIdx,
unsigned int& _targetIdx,
ACG::Vec3d* _hitPointPtr=0 );
/// pick from cache /// pick from cache
int pickFromCache( ACG::SceneGraph::PickTarget _pickTarget, int pickFromCache( ACG::SceneGraph::PickTarget _pickTarget,
const QPoint& _mousePos, const QPoint& _mousePos,
......
...@@ -85,12 +85,6 @@ bool glViewer::pick( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -85,12 +85,6 @@ bool glViewer::pick( ACG::SceneGraph::PickTarget _pickTarget,
rv = pickColor (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr); rv = pickColor (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr);
// printf ("ColorPicking took %d msec\n",time.restart ()); // printf ("ColorPicking took %d msec\n",time.restart ());
// rv = -1;
// node = _nodeIdx;
// target = _targetIdx;
if (rv < 0)
rv = pickGL (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr);
// printf ("GLPicking took %d msec\n",time.restart ());
// if (rv > 0 && (node != _nodeIdx || target != _targetIdx)) // if (rv > 0 && (node != _nodeIdx || target != _targetIdx))
// printf ("***** Picking difference Color %d/%d GL %d/%d\n",node, target, _nodeIdx, _targetIdx); // printf ("***** Picking difference Color %d/%d GL %d/%d\n",node, target, _nodeIdx, _targetIdx);
...@@ -198,6 +192,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -198,6 +192,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
{ {
if (pickCache_ && pickCache_->isBound ()) if (pickCache_ && pickCache_->isBound ())
pickCache_->release (); pickCache_->release ();
std::cerr << "error - picking color stack invalid" << std::endl;
return -1; return -1;
} }
...@@ -271,7 +267,10 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -271,7 +267,10 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
// something wrong with the color stack ? // something wrong with the color stack ?
if (rv.size () < 2) if (rv.size () < 2)
{
std::cerr << "error - picking color not found in stack" << std::endl;
return -1; return -1;
}
_nodeIdx = rv[1]; _nodeIdx = rv[1];
_targetIdx = rv[0]; _targetIdx = rv[0];
...@@ -408,21 +407,6 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -408,21 +407,6 @@ int glViewer::pickFromCache( ACG::SceneGraph::PickTarget _pickTarget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool glViewer::pickGL( ACG::SceneGraph::PickTarget _pickTarget,
const QPoint& _mousePos,
unsigned int& _nodeIdx,
unsigned int& _targetIdx,
ACG::Vec3d* _hitPointPtr )
{
///@TODO: Remove that function alltogether.
std::cerr << "Error! OpenGL Picking via OpenGL Name stack is not supported anymore." << std::endl;
return false;
}
//-----------------------------------------------------------------------------
bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarget, bool glViewer::pick_region( ACG::SceneGraph::PickTarget _pickTarget,
const QRegion& _region, const QRegion& _region,
QList<QPair<unsigned int, unsigned int> >& _list, QList<QPair<unsigned int, unsigned int> >& _list,
......
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