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

Make the 300 000 a const std::size_t define in the beginning of Scene_point_with_normal_item.cpp

This commit is contained in:
Maxime Gimeno 2016-09-21 14:55:50 +02:00
parent 3bd7e95d87
commit b51f064a55
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
View File

@ -28,6 +28,8 @@
#include <algorithm> #include <algorithm>
#include <boost/array.hpp> #include <boost/array.hpp>
const std::size_t limit_fast_drawing = 300000; //arbitraty large valu
struct Scene_points_with_normal_item_priv struct Scene_points_with_normal_item_priv
{ {
Scene_points_with_normal_item_priv(Scene_points_with_normal_item* parent) Scene_points_with_normal_item_priv(Scene_points_with_normal_item* parent)
@ -580,8 +582,8 @@ void Scene_points_with_normal_item::drawEdges(CGAL::Three::Viewer_interface* vie
{ {
double ratio_displayed = 1.0; double ratio_displayed = 1.0;
if (viewer->inFastDrawing () && if (viewer->inFastDrawing () &&
(d->nb_lines/6 > 300000)) // arbitrary large value (d->nb_lines/6 > limit_fast_drawing)) // arbitrary large value
ratio_displayed = 6 * 300000. / (double)(d->nb_lines); ratio_displayed = 6 * limit_fast_drawing / (double)(d->nb_lines);
if(!are_buffers_filled) if(!are_buffers_filled)
d->initializeBuffers(viewer); d->initializeBuffers(viewer);
@ -605,8 +607,8 @@ void Scene_points_with_normal_item::drawPoints(CGAL::Three::Viewer_interface* vi
viewer->glPointSize(d->point_Slider->value()); viewer->glPointSize(d->point_Slider->value());
double ratio_displayed = 1.0; double ratio_displayed = 1.0;
if ((viewer->inFastDrawing () || d->isPointSliderMoving()) if ((viewer->inFastDrawing () || d->isPointSliderMoving())
&&((d->nb_points + d->nb_selected_points)/3 > 300000)) // arbitrary large value &&((d->nb_points + d->nb_selected_points)/3 > limit_fast_drawing)) // arbitrary large value
ratio_displayed = 3 * 300000. / (double)(d->nb_points + d->nb_selected_points); ratio_displayed = 3 * limit_fast_drawing / (double)(d->nb_points + d->nb_selected_points);
vaos[Scene_points_with_normal_item_priv::ThePoints]->bind(); vaos[Scene_points_with_normal_item_priv::ThePoints]->bind();
if(has_normals()) if(has_normals())
@ -716,7 +718,7 @@ QMenu* Scene_points_with_normal_item::contextMenu()
{ {
QMenu *container = new QMenu(tr("Normals Length")); QMenu *container = new QMenu(tr("Normals Length"));
QWidgetAction *sliderAction = new QWidgetAction(0); QWidgetAction *sliderAction = new QWidgetAction(0);
if((d->nb_points + d->nb_selected_points)/3 <= 300000) if((d->nb_points + d->nb_selected_points)/3 <= limit_fast_drawing)
{ {
connect(d->normal_Slider, &QSlider::valueChanged, this, &Scene_points_with_normal_item::invalidateOpenGLBuffers); connect(d->normal_Slider, &QSlider::valueChanged, this, &Scene_points_with_normal_item::invalidateOpenGLBuffers);
connect(d->normal_Slider, &QSlider::valueChanged, this, &Scene_points_with_normal_item::itemChanged); connect(d->normal_Slider, &QSlider::valueChanged, this, &Scene_points_with_normal_item::itemChanged);