mirror of https://github.com/CGAL/cgal
Add link to scene_edit_box_item
+ small fix of triangulation_3 cut plane
This commit is contained in:
parent
c803f0f8d8
commit
c8545e8f06
|
|
@ -236,7 +236,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
|
||||||
add_item(scene_c3t3_item Scene_c3t3_item.cpp)
|
add_item(scene_c3t3_item Scene_c3t3_item.cpp)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
scene_c3t3_item PUBLIC scene_triangulation_3_item
|
scene_c3t3_item PUBLIC scene_triangulation_3_item
|
||||||
scene_surface_mesh_item scene_polygon_soup_item
|
scene_surface_mesh_item scene_polygon_soup_item scene_edit_box_item
|
||||||
scene_basic_objects ${TBB_LIBRARIES})
|
scene_basic_objects ${TBB_LIBRARIES})
|
||||||
|
|
||||||
if(TARGET CGAL::TBB_support)
|
if(TARGET CGAL::TBB_support)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
#include "Scene_triangulation_3_item.h"
|
#include "Scene_triangulation_3_item.h"
|
||||||
#include "Scene_surface_mesh_item.h"
|
#include "Scene_surface_mesh_item.h"
|
||||||
#include "Scene_spheres_item.h"
|
#include "Scene_spheres_item.h"
|
||||||
|
#include "Plugins/PCA/Scene_edit_box_item.h"
|
||||||
|
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
|
|
@ -456,13 +457,11 @@ struct Scene_triangulation_3_item_priv {
|
||||||
{
|
{
|
||||||
if (intersection)
|
if (intersection)
|
||||||
intersection->setVisible(b);
|
intersection->setVisible(b);
|
||||||
|
cut_plane_enabled = b;
|
||||||
}
|
}
|
||||||
bool is_intersection_enabled()
|
bool is_intersection_enabled()
|
||||||
{
|
{
|
||||||
if (intersection)
|
return cut_plane_enabled;
|
||||||
return intersection->visible();
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
bool is_item_clip_box(int id)
|
bool is_item_clip_box(int id)
|
||||||
{
|
{
|
||||||
|
|
@ -530,6 +529,7 @@ struct Scene_triangulation_3_item_priv {
|
||||||
boost::dynamic_bitset<> visible_subdomain;
|
boost::dynamic_bitset<> visible_subdomain;
|
||||||
std::bitset<24> bs[4] = {16777215, 16777215, 16777215, 16777215};
|
std::bitset<24> bs[4] = {16777215, 16777215, 16777215, 16777215};
|
||||||
bool show_tetrahedra;
|
bool show_tetrahedra;
|
||||||
|
bool cut_plane_enabled;
|
||||||
bool is_aabb_tree_built;
|
bool is_aabb_tree_built;
|
||||||
bool last_intersection;
|
bool last_intersection;
|
||||||
bool cut_edges;
|
bool cut_edges;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
#define SCENE_TRIANGULATION_3_ITEM_H
|
#define SCENE_TRIANGULATION_3_ITEM_H
|
||||||
|
|
||||||
#include "Scene_triangulation_3_item_config.h"
|
#include "Scene_triangulation_3_item_config.h"
|
||||||
#include "Plugins/PCA/Scene_edit_box_item.h"
|
|
||||||
#include "T3_type.h"
|
#include "T3_type.h"
|
||||||
|
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue