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

Add a clone to the c3t3 and fix an error in the cutting plane orientation

This commit is contained in:
Maxime Gimeno 2020-06-03 11:24:18 +02:00
parent 8adf6511ff
commit ee4f996043
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ public :
const EPICK::Plane_3& plane = qobject_cast<Scene_c3t3_item*>(this->parent())->plane(); const EPICK::Plane_3& plane = qobject_cast<Scene_c3t3_item*>(this->parent())->plane();
float shrink_factor = qobject_cast<Scene_c3t3_item*>(this->parent())->getShrinkFactor(); float shrink_factor = qobject_cast<Scene_c3t3_item*>(this->parent())->getShrinkFactor();
QVector4D cp = cgal_plane_to_vector4d(plane); QVector4D cp = cgal_plane_to_vector4d(plane);
getTriangleContainer(0)->setPlane(cp); getTriangleContainer(0)->setPlane(-cp);
getTriangleContainer(0)->setShrinkFactor(shrink_factor); getTriangleContainer(0)->setShrinkFactor(shrink_factor);
// positions_poly is also used for the faces in the cut plane // positions_poly is also used for the faces in the cut plane
// and changes when the cut plane is moved // and changes when the cut plane is moved
@ -569,8 +569,10 @@ Scene_c3t3_item::Scene_c3t3_item(const C3t3& c3t3, bool is_surface)
: Scene_group_item("unnamed") : Scene_group_item("unnamed")
, d(new Scene_c3t3_item_priv(c3t3, this)) , d(new Scene_c3t3_item_priv(c3t3, this))
{ {
d->reset_cut_plane();
common_constructor(is_surface); common_constructor(is_surface);
d->reset_cut_plane();
c3t3_changed();
changed();
} }
Scene_c3t3_item::~Scene_c3t3_item() Scene_c3t3_item::~Scene_c3t3_item()
@ -2097,5 +2099,11 @@ void Scene_c3t3_item::newViewer(Viewer_interface *viewer)
d->computeIntersections(viewer); d->computeIntersections(viewer);
} }
} }
Scene_c3t3_item* Scene_c3t3_item::clone() const
{
return new Scene_c3t3_item(d->c3t3, d->is_surface);
}
#include "Scene_c3t3_item.moc" #include "Scene_c3t3_item.moc"

5
Polyhedron/demo/Polyhedron/Scene_c3t3_item.h
View File

@ -101,9 +101,8 @@ public:
{ {
return Scene_item::bbox(); return Scene_item::bbox();
} }
Scene_c3t3_item* clone() const Q_DECL_OVERRIDE{
return 0; Scene_c3t3_item* clone() const Q_DECL_OVERRIDE;
}
bool load_binary(std::istream& is); bool load_binary(std::istream& is);