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

Dennis:

Removed Debug Code

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5212 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 8c2c5af8
...@@ -63,20 +63,20 @@ bool glViewer::pick( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -63,20 +63,20 @@ bool glViewer::pick( ACG::SceneGraph::PickTarget _pickTarget,
{ {
if (sceneGraphRoot_) if (sceneGraphRoot_)
{ {
unsigned int node, target; // unsigned int node, target;
QTime time; // QTime time;
time.start (); // time.start ();
int rv = pickColor (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr); int 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; // rv = -1;
node = _nodeIdx; // node = _nodeIdx;
target = _targetIdx; // target = _targetIdx;
if (rv < 0) if (rv < 0)
rv = pickGL (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr); rv = pickGL (_pickTarget, _mousePos, _nodeIdx, _targetIdx, _hitPointPtr);
printf ("GLPicking took %d msec\n",time.restart ()); // 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);
if (rv > 0) if (rv > 0)
return rv; return rv;
} }
...@@ -93,13 +93,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget, ...@@ -93,13 +93,8 @@ int glViewer::pickColor( ACG::SceneGraph::PickTarget _pickTarget,
ACG::Vec3d* _hitPointPtr ) ACG::Vec3d* _hitPointPtr )
{ {
GLint w = glWidth(), GLint x = _mousePos.x(),
h = glHeight(),
l = scenePos().x(),
b = scene()->height () - scenePos().y() - h,
x = _mousePos.x(),
y = scene()->height () - _mousePos.y(); y = scene()->height () - _mousePos.y();
GLint viewport[4] = {l,b,w,h};
GLubyte pixels[9][3]; GLubyte pixels[9][3];
GLfloat depths[9]; GLfloat depths[9];
int hit = -1; int hit = -1;
......
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