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

rename min and max to avoid trigger maccro in windows.

This commit is contained in:
Maxime Gimeno 2020-07-30 10:15:13 +02:00
parent 261eb678b0
commit 3083341e48
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/Viewer.cpp
View File

@ -2025,10 +2025,10 @@ void Viewer::scaleScene()
else
d->scaler = QVector3D(1,1,1);
CGAL::qglviewer::Vec min(((float)bbox.xmin()+offset().x)*d->scaler.x(), ((float)bbox.ymin()+offset().y)*d->scaler.y(), ((float)bbox.zmin()+offset().z)*d->scaler.z()),
max(((float)bbox.xmax()+offset().x)*d->scaler.x(), ((float)bbox.ymax()+offset().y)*d->scaler.y(), ((float)bbox.zmax()+offset().z)*d->scaler.z());
camera()->setPivotPoint((min+max)*0.5);
camera()->fitBoundingBox(min, max);
CGAL::qglviewer::Vec vmin(((float)bbox.xmin()+offset().x)*d->scaler.x(), ((float)bbox.ymin()+offset().y)*d->scaler.y(), ((float)bbox.zmin()+offset().z)*d->scaler.z()),
vmax(((float)bbox.xmax()+offset().x)*d->scaler.x(), ((float)bbox.ymax()+offset().y)*d->scaler.y(), ((float)bbox.zmax()+offset().z)*d->scaler.z());
camera()->setPivotPoint((vmin+vmax)*0.5);
camera()->fitBoundingBox(vmin, vmax);
d->scene_scaling = !d->scene_scaling;
}
#ifdef CGAL_USE_WEBSOCKETS