songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes the Splatting draw code which fixes the picking problem.

This commit is contained in:
Maxime Gimeno 2016-05-24 11:38:45 +02:00
parent 9fb5702610
commit 56caa543f0
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Polyhedron/demo/Polyhedron/Scene.cpp
View File

@ -338,6 +338,8 @@ void
Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
{
QMap<float, int> picked_item_IDs;
if(with_names)
glEnable(GL_DEPTH_TEST);
if(!ms_splatting->viewer_is_set)
ms_splatting->setViewer(viewer);
if(!gl_init)
@ -500,48 +502,48 @@ Scene::draw_aux(bool with_names, CGAL::Three::Viewer_interface* viewer)
picked_item_IDs[depth] = index;
}
}
}
}
if(!with_names)
{
glDepthFunc(GL_LESS);
// Splatting
if(!with_names && ms_splatting->isSupported())
{
ms_splatting->beginVisibilityPass();
for(int index = 0; index < m_entries.size(); ++index)
if(!with_names)
{
CGAL::Three::Scene_item& item = *m_entries[index];
if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
if(item.visible() && item.renderingMode() == Splatting)
glDepthFunc(GL_LESS);
// Splatting
if(!with_names && ms_splatting->isSupported())
{
if(viewer)
ms_splatting->beginVisibilityPass();
for(int index = 0; index < m_entries.size(); ++index)
{
item.draw_splats(viewer);
CGAL::Three::Scene_item& item = *m_entries[index];
if(!with_names && item_should_be_skipped_in_draw(&item)) continue;
if(item.visible() && item.renderingMode() == Splatting)
{
if(viewer)
{
item.draw_splats(viewer);
}
else
item.draw_splats();
}
}
else
item.draw_splats();
}
}
ms_splatting->beginAttributePass();
for(int index = 0; index < m_entries.size(); ++index)
{ CGAL::Three::Scene_item& item = *m_entries[index];
if(item.visible() && item.renderingMode() == Splatting)
{
viewer->glColor4d(item.color().redF(), item.color().greenF(), item.color().blueF(), item.color().alphaF());
if(viewer)
item.draw_splats(viewer);
else
item.draw_splats();
ms_splatting->beginAttributePass();
for(int index = 0; index < m_entries.size(); ++index)
{ CGAL::Three::Scene_item& item = *m_entries[index];
if(item.visible() && item.renderingMode() == Splatting)
{
viewer->glColor4d(item.color().redF(), item.color().greenF(), item.color().blueF(), item.color().alphaF());
if(viewer)
item.draw_splats(viewer);
else
item.draw_splats();
}
}
ms_splatting->finalize();
}
}
ms_splatting->finalize();
}
}
else
if(with_names)
{
QList<float> depths = picked_item_IDs.keys();
if(!depths.isEmpty())

1
Polyhedron/demo/Polyhedron/Viewer.cpp
View File

@ -256,7 +256,6 @@ void Viewer::mousePressEvent(QMouseEvent* event)
if(event->button() == Qt::RightButton &&
event->modifiers().testFlag(Qt::ShiftModifier))
{
select(event->pos());
requestContextMenu(event->globalPos());
event->accept();