Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for signed char

Browse Source
This commit is contained in:
Alexandra Heuschling
2020-12-01 16:34:40 +01:00
parent bc6f7b75d9
commit 3b6424c1a7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/IO/reader/OMReader.cc
View File

@@ -873,6 +873,10 @@ void _OMReader_::check_all_std_vector_types_aux(OMFormat::Chunk::PropertyName& _
{ {
add_generic_property_aux<std::vector<char>>(_bi); add_generic_property_aux<std::vector<char>>(_bi);
} }
else if(_property_type == get_string_for_type(std::vector<signed char>()))
{
add_generic_property_aux<std::vector<signed char>>(_bi);
}
else if(_property_type == get_string_for_type(std::vector<double>())) else if(_property_type == get_string_for_type(std::vector<double>()))
{ {
add_generic_property_aux<std::vector<double>>(_bi); add_generic_property_aux<std::vector<double>>(_bi);
@@ -922,6 +926,10 @@ void _OMReader_::check_all_vector_types_aux(OMFormat::Chunk::PropertyName& _prop
{ {
add_generic_property_aux<OpenMesh::VectorT<char, Dim>>(_bi); add_generic_property_aux<OpenMesh::VectorT<char, Dim>>(_bi);
} }
else if(_property_type == get_string_for_type(OpenMesh::VectorT<signed char, Dim>()))
{
add_generic_property_aux<OpenMesh::VectorT<signed char, Dim>>(_bi);
}
else if(_property_type == get_string_for_type(OpenMesh::VectorT<double, Dim>())) else if(_property_type == get_string_for_type(OpenMesh::VectorT<double, Dim>()))
{ {
add_generic_property_aux<OpenMesh::VectorT<double, Dim>>(_bi); add_generic_property_aux<OpenMesh::VectorT<double, Dim>>(_bi);

6
src/Unittests/unittests_read_write_OM.cc
View File

@@ -1467,7 +1467,7 @@ std::string get_type_string(OpenMesh::HalfedgeHandle) { return "Halfedge"; }
std::string get_type_string(OpenMesh::VertexHandle) { return "Vertex"; } std::string get_type_string(OpenMesh::VertexHandle) { return "Vertex"; }
std::string get_type_string(char) { return "char"; } std::string get_type_string(char) { return "char"; }
std::string get_type_string(signed char) { return "signed char"; } std::string get_type_string(signed char) { return "signed char"; }
std::string get_type_string(double) { return "double"; } std::string get_type_string(double) { return "double"; }
std::string get_type_string(float) { return "float"; } std::string get_type_string(float) { return "float"; }
std::string get_type_string(int) { return "int"; } std::string get_type_string(int) { return "int"; }
@@ -1568,10 +1568,10 @@ void do_property(MeshT& _mesh, PropertyAction action)
template <typename MeshT, typename HandleT, int Dim> template <typename MeshT, typename HandleT, int Dim>
void do_all_property_types_vec(MeshT& _mesh, PropertyAction action) void do_all_property_types_vec(MeshT& _mesh, PropertyAction action)
{ {
//do_property<MeshT, HandleT, OpenMesh::VectorT<signed char , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<signed char , Dim>>(_mesh, action);
do_property<MeshT, HandleT, OpenMesh::VectorT<double , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<double , Dim>>(_mesh, action);
do_property<MeshT, HandleT, OpenMesh::VectorT<float , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<float , Dim>>(_mesh, action);
//do_property<MeshT, HandleT, OpenMesh::VectorT<int , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<int , Dim>>(_mesh, action);
do_property<MeshT, HandleT, OpenMesh::VectorT<short , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<short , Dim>>(_mesh, action);
do_property<MeshT, HandleT, OpenMesh::VectorT<unsigned char , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<unsigned char , Dim>>(_mesh, action);
do_property<MeshT, HandleT, OpenMesh::VectorT<unsigned int , Dim>>(_mesh, action); do_property<MeshT, HandleT, OpenMesh::VectorT<unsigned int , Dim>>(_mesh, action);