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

Merge pull request #4383 from gdamiand/Basic_viewer_bugfix-gdamiand 

Basic viewer bugfix
This commit is contained in:
Laurent Rineau 2020-01-17 16:28:25 +01:00
parent 3cfd79dc7b 1e93ad3579
commit 3b1f11dd0d
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
GraphicsView/include/CGAL/Buffer_for_vao.h
View File

@ -71,7 +71,7 @@ namespace internal
static typename Local_kernel::Point_3 get_local_point(const typename K::Point_2& p) static typename Local_kernel::Point_3 get_local_point(const typename K::Point_2& p)
{ {
CGAL::Cartesian_converter<K, Local_kernel> converter; CGAL::Cartesian_converter<K, Local_kernel> converter;
return Local_point(converter(p.x()), 0, converter(p.y())); return typename Local_kernel::Point_3(converter(p.x()), converter(p.y()), 0);
} }
static typename Local_kernel::Point_3 get_local_point(const typename K::Weighted_point_2& p) static typename Local_kernel::Point_3 get_local_point(const typename K::Weighted_point_2& p)
{ {
@ -91,7 +91,7 @@ namespace internal
static typename Local_kernel::Vector_3 get_local_vector(const typename K::Vector_2& v) static typename Local_kernel::Vector_3 get_local_vector(const typename K::Vector_2& v)
{ {
CGAL::Cartesian_converter<K, Local_kernel> converter; CGAL::Cartesian_converter<K, Local_kernel> converter;
return Local_vector(converter(v.x()), 0, converter(v.y())); return typename Local_kernel::Vector_3(converter(v.x()), converter(v.y()), 0);
} }
static typename Local_kernel::Vector_3 get_local_vector(const typename K::Vector_3& v) static typename Local_kernel::Vector_3 get_local_vector(const typename K::Vector_3& v)
{ {
@ -105,15 +105,15 @@ namespace internal
struct Geom_utils<Local_kernel, Local_kernel> struct Geom_utils<Local_kernel, Local_kernel>
{ {
static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Point_2& p) static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Point_2& p)
{ return typename Local_kernel::Point_3(p.x(), 0, p.y()); } { return typename Local_kernel::Point_3(p.x(), p.y(), 0); }
static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Weighted_point_2& p) static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Weighted_point_2& p)
{ return typename Local_kernel::Point_3(p.point().x(), 0, p.point().y());} { return typename Local_kernel::Point_3(p.point().x(), p.point().y(), 0);}
static const typename Local_kernel::Point_3 & get_local_point(const typename Local_kernel::Point_3& p) static const typename Local_kernel::Point_3 & get_local_point(const typename Local_kernel::Point_3& p)
{ return p; } { return p; }
static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Weighted_point_3& p) static typename Local_kernel::Point_3 get_local_point(const typename Local_kernel::Weighted_point_3& p)
{ return typename Local_kernel::Point_3(p);} { return typename Local_kernel::Point_3(p);}
static typename Local_kernel::Vector_3 get_local_vector(const typename Local_kernel::Vector_2& v) static typename Local_kernel::Vector_3 get_local_vector(const typename Local_kernel::Vector_2& v)
{ return typename Local_kernel::Vector_3(v.x(), 0, v.y()); } { return typename Local_kernel::Vector_3(v.x(), v.y(), 0); }
static const typename Local_kernel::Vector_3& get_local_vector(const typename Local_kernel::Vector_3& v) static const typename Local_kernel::Vector_3& get_local_vector(const typename Local_kernel::Vector_3& v)
{ return v; } { return v; }
}; };
@ -484,23 +484,23 @@ protected:
if (m_indices_of_points_of_face.size()>0) if (m_indices_of_points_of_face.size()>0)
{ {
add_indexed_point(m_indices_of_points_of_face[i]); add_indexed_point(m_indices_of_points_of_face[i]);
} }
else else
{ {
add_point(m_points_of_face[i]); // Add the position of the point add_point(m_points_of_face[i]); // Add the position of the point
if (m_started_face_is_colored) if (m_started_face_is_colored)
{ add_color(m_color_of_face); } // Add the color { add_color(m_color_of_face); } // Add the color
add_flat_normal(normal); // Add the flat normal add_flat_normal(normal); // Add the flat normal
// Its smooth normal (if given by the user) // Its smooth normal (if given by the user)
if (m_vertex_normals_for_face.size()>0) if (m_vertex_normals_for_face.size()>0)
{ // Here we have 3 vertex normals; we can use Gouraud { // Here we have 3 vertex normals; we can use Gouraud
add_gouraud_normal(m_vertex_normals_for_face[i]); add_gouraud_normal(m_vertex_normals_for_face[i]);
} }
else else
{ // Here user does not provide all vertex normals: we use face normal istead { // Here user does not provide all vertex normals: we use face normal istead
// and thus we will not be able to use Gouraud // and thus we will not be able to use Gouraud
add_gouraud_normal(normal); add_gouraud_normal(normal);
} }
} }
} }
} }

2
Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
View File

@ -168,7 +168,7 @@ public:
bool anofaces=false, bool anofaces=false,
const DrawingFunctorLCC& drawing_functor=DrawingFunctorLCC()) : const DrawingFunctorLCC& drawing_functor=DrawingFunctorLCC()) :
// First draw: vertices; edges, faces; multi-color; inverse normal // First draw: vertices; edges, faces; multi-color; inverse normal
Base(parent, title, true, true, true, false, true), Base(parent, title, true, true, true, false, false),
lcc(alcc), lcc(alcc),
m_nofaces(anofaces), m_nofaces(anofaces),
m_random_face_color(false), m_random_face_color(false),