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

Replace some flot by BufferType

This commit is contained in:
Guillaume Damiand 2023-10-18 16:23:09 +02:00
parent 1369628244
commit eea01ce5fe
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Basic_viewer/include/CGAL/Buffer_for_vao.h
View File

@ -459,31 +459,31 @@ public:
/// adds `kp` coordinates to `buffer`
template<typename KPoint>
static void add_point_in_buffer(const KPoint& kp, std::vector<float>& buffer)
static void add_point_in_buffer(const KPoint& kp, std::vector<BufferType>& buffer)
{
Local_point p=get_local_point(kp);
buffer.push_back(static_cast<float>(p.x()));
buffer.push_back(static_cast<float>(p.y()));
buffer.push_back(static_cast<float>(p.z()));
buffer.push_back(static_cast<BufferType>(p.x()));
buffer.push_back(static_cast<BufferType>(p.y()));
buffer.push_back(static_cast<BufferType>(p.z()));
}
/// adds `kv` coordinates to `buffer`
template<typename KVector>
static void add_normal_in_buffer(const KVector& kv, std::vector<float>& buffer,
static void add_normal_in_buffer(const KVector& kv, std::vector<BufferType>& buffer,
bool inverse_normal=false)
{
Local_vector n=(inverse_normal?-get_local_vector(kv):get_local_vector(kv));
buffer.push_back(static_cast<float>(n.x()));
buffer.push_back(static_cast<float>(n.y()));
buffer.push_back(static_cast<float>(n.z()));
buffer.push_back(static_cast<BufferType>(n.x()));
buffer.push_back(static_cast<BufferType>(n.y()));
buffer.push_back(static_cast<BufferType>(n.z()));
}
///adds `acolor` RGB components to `buffer`
static void add_color_in_buffer(const CGAL::IO::Color& acolor, std::vector<float>& buffer)
static void add_color_in_buffer(const CGAL::IO::Color& acolor, std::vector<BufferType>& buffer)
{
buffer.push_back((float)acolor.red()/(float)255);
buffer.push_back((float)acolor.green()/(float)255);
buffer.push_back((float)acolor.blue()/(float)255);
buffer.push_back((BufferType)acolor.red()/(BufferType)255);
buffer.push_back((BufferType)acolor.green()/(BufferType)255);
buffer.push_back((BufferType)acolor.blue()/(BufferType)255);
}
/// @return true iff the points of 'facet' form a convex face

4
Basic_viewer/include/CGAL/Graphics_scene.h
View File

@ -128,7 +128,7 @@ public:
const CGAL::Bbox_3 &get_bounding_box() const { return m_bounding_box; }
std::vector<float> &get_array_of_index(int index) { return arrays[index]; }
std::vector<BufferType> &get_array_of_index(int index) { return arrays[index]; }
int get_size_of_index(int index) const
{ return static_cast<int>(arrays[index].size()*sizeof(BufferType)); }
@ -410,7 +410,7 @@ protected:
std::vector<std::tuple<Local_point, QString>> m_texts;
std::vector<float> arrays[LAST_INDEX];
std::vector<BufferType> arrays[LAST_INDEX];
CGAL::Bbox_3 m_bounding_box;
};