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

Bug-fix for Windows min/max issue 

Trivial bug-fix for master
This commit is contained in:
Laurent Rineau 2014-05-21 12:50:49 +02:00
parent 2463459ce6
commit af005e81dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -589,12 +589,12 @@ void MainWindow::viewerShow(float xmin,
float zmax) float zmax)
{ {
qglviewer::Vec qglviewer::Vec
min(xmin, ymin, zmin), min_(xmin, ymin, zmin),
max(xmax, ymax, zmax); max_(xmax, ymax, zmax);
viewer->camera()->setRevolveAroundPoint((min+max)*0.5); viewer->camera()->setRevolveAroundPoint((min_+max_)*0.5);
qglviewer::ManipulatedCameraFrame backup_frame(*viewer->camera()->frame()); qglviewer::ManipulatedCameraFrame backup_frame(*viewer->camera()->frame());
viewer->camera()->fitBoundingBox(min, max); viewer->camera()->fitBoundingBox(min_, max_);
qglviewer::ManipulatedCameraFrame new_frame(*viewer->camera()->frame()); qglviewer::ManipulatedCameraFrame new_frame(*viewer->camera()->frame());
*viewer->camera()->frame() = backup_frame; *viewer->camera()->frame() = backup_frame;
viewer->camera()->interpolateTo(new_frame, 1.f); viewer->camera()->interpolateTo(new_frame, 1.f);