From 384e7fad3865710adbc8af4ecc9910fab86d7799 Mon Sep 17 00:00:00 2001 From: ange-clement Date: Tue, 26 Sep 2023 10:16:17 +0200 Subject: [PATCH] Added epsilon on clipping + try fix test undefined reference to Scene_edit_box_item --- .../demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp | 9 +++++---- .../demo/Polyhedron/Scene_triangulation_3_item.cpp | 1 - Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp index cca910c3776..91bcde149ba 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp @@ -99,9 +99,10 @@ struct Scene_edit_box_item_priv{ constraint.setRotationConstraintDirection(CGAL::qglviewer::Vec(.0,.0,.1)); frame->setConstraint(&constraint); //create the sphere model - pool[0] = bb.xmin(); pool[3] = bb.xmax(); - pool[1] = bb.ymin(); pool[4] = bb.ymax(); - pool[2] = bb.zmin(); pool[5] = bb.zmax(); + float eps = 1.e-3; + pool[0] = bb.xmin()-eps; pool[3] = bb.xmax()+eps; + pool[1] = bb.ymin()-eps; pool[4] = bb.ymax()+eps; + pool[2] = bb.zmin()-eps; pool[5] = bb.zmax()+eps; vertex_spheres.resize(0); normal_spheres.resize(0); @@ -254,7 +255,7 @@ struct Scene_edit_box_item_priv{ void reset_vertices() { Scene_item::Bbox bb = scene->bbox(); - float eps = 1.e-6; + float eps = 1.e-3; pool[0] = bb.xmin()-eps; pool[3] = bb.xmax()+eps; pool[1] = bb.ymin()-eps; pool[4] = bb.ymax()+eps; pool[2] = bb.zmin()-eps; pool[5] = bb.zmax()+eps; diff --git a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp index 84f6daae430..7eee6f9c094 100644 --- a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp @@ -3,7 +3,6 @@ #include "Scene_triangulation_3_item.h" #include "Scene_surface_mesh_item.h" #include "Scene_spheres_item.h" -#include "Plugins/PCA/Scene_edit_box_item.h" #include #include diff --git a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h b/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h index 33a2cd8f124..89f0e38d3d9 100644 --- a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h +++ b/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h @@ -2,6 +2,7 @@ #define SCENE_TRIANGULATION_3_ITEM_H #include "Scene_triangulation_3_item_config.h" +#include "Plugins/PCA/Scene_edit_box_item.h" #include "T3_type.h" #include