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

Merge pull request #3670 from afabri/Periodic_T3-initialize_Point_3-GF 

Periodic_3_triangulation_3 demo: Initialize Point_3
This commit is contained in:
Laurent Rineau 2019-02-13 15:38:22 +01:00
parent 346e5e3b66 98246c9497
commit b367aabffd
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
View File

@ -1410,11 +1410,10 @@ void Scene::gl_draw_location() {
ch, off0, off1, off2, off3, offs); ch, off0, off1, off2, off3, offs);
for(int i=0; i < 4; i++){ for(int i=0; i < 4; i++){
Point p = tet_to_draw.vertex((i+1)&3); const Point& p = tet_to_draw.vertex((i+1)&3);
Point q = tet_to_draw.vertex((i+2)&3); const Point& q = tet_to_draw.vertex((i+2)&3);
Point r = tet_to_draw.vertex((i+3)&3); const Point& r = tet_to_draw.vertex((i+3)&3);
Vector c= (Vector(Point(),p)+Vector(Point(),q)+Vector(Point(),r))/3.; Point cp = CGAL::centroid(p,q,r);
Point cp = Point(c.x(),c.y(),c.z());
// project facet center // project facet center
double px,py,pz; double px,py,pz;
project(cp.x(),cp.y(),cp.z(), project(cp.x(),cp.y(),cp.z(),
@ -1521,11 +1520,10 @@ void Scene::gl_draw_conflict() {
for (int offs=0 ; offs<=diff_off ; offs++) { for (int offs=0 ; offs<=diff_off ; offs++) {
if ((((~offs)|diff_off)&7)!=7) continue; if ((((~offs)|diff_off)&7)!=7) continue;
Triangle tri_to_draw = construct_triangle(ch,j,off0,off1,off2,offs); Triangle tri_to_draw = construct_triangle(ch,j,off0,off1,off2,offs);
Point p = tri_to_draw.vertex(0); const Point& p = tri_to_draw.vertex(0);
Point q = tri_to_draw.vertex(1); const Point& q = tri_to_draw.vertex(1);
Point r = tri_to_draw.vertex(2); const Point& r = tri_to_draw.vertex(2);
Vector c= (Vector(Point(),p)+Vector(Point(),q)+Vector(Point(),r))/3.; Point cp = CGAL::centroid(p,q,r);
Point cp = Point(c.x(),c.y(),c.z());
// project facet center // project facet center
double px,py,pz; double px,py,pz;
project(cp.x(),cp.y(),cp.z(), project(cp.x(),cp.y(),cp.z(),