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

fix indentation

Browse Source
This commit is contained in:
Max Lyon
2021-03-02 11:14:46 +01:00
parent f21bbed42a
commit ee53f78b65
2 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/OpenMesh/Core/Utils/typename.hh
View File

@@ -30,27 +30,27 @@ std::string get_type_name()
inline std::string get_string_for_type(OpenMesh::FaceHandle){ return "facehandle";} inline std::string get_string_for_type(OpenMesh::FaceHandle){ return "facehandle";}
inline std::string get_string_for_type(OpenMesh::EdgeHandle){ return "edgehandle";} inline std::string get_string_for_type(OpenMesh::EdgeHandle){ return "edgehandle";}
inline std::string get_string_for_type(OpenMesh::HalfedgeHandle){ return "halfedgehandle";} inline std::string get_string_for_type(OpenMesh::HalfedgeHandle){ return "halfedgehandle";}
inline std::string get_string_for_type(OpenMesh::VertexHandle){ return "vertexhandle";} inline std::string get_string_for_type(OpenMesh::VertexHandle){ return "vertexhandle";}
inline std::string get_string_for_type(OpenMesh::MeshHandle){ return "meshhandle";} inline std::string get_string_for_type(OpenMesh::MeshHandle){ return "meshhandle";}
inline std::string get_string_for_type(bool){ return "bool";} inline std::string get_string_for_type(bool){ return "bool";}
inline std::string get_string_for_type(char){ return "char";} inline std::string get_string_for_type(char){ return "char";}
inline std::string get_string_for_type(signed char){ return "signed char";} inline std::string get_string_for_type(signed char){ return "signed char";}
inline std::string get_string_for_type(double){ return "double";} inline std::string get_string_for_type(double){ return "double";}
inline std::string get_string_for_type(float){ return "float";} inline std::string get_string_for_type(float){ return "float";}
inline std::string get_string_for_type(int){ return "int";} inline std::string get_string_for_type(int){ return "int";}
inline std::string get_string_for_type(short){ return "short";} inline std::string get_string_for_type(short){ return "short";}
inline std::string get_string_for_type(unsigned char){ return "uchar";} inline std::string get_string_for_type(unsigned char){ return "uchar";}
inline std::string get_string_for_type(unsigned int){ return "uint";} inline std::string get_string_for_type(unsigned int){ return "uint";}
inline std::string get_string_for_type(unsigned short){ return "ushort";} inline std::string get_string_for_type(unsigned short){ return "ushort";}
inline std::string get_string_for_type(unsigned long){ return "ulong";} inline std::string get_string_for_type(unsigned long){ return "ulong";}
inline std::string get_string_for_type(std::string){ return "std::string";} inline std::string get_string_for_type(std::string){ return "std::string";}
template <typename T> std::string get_string_for_type(T){return "unknown";} template <typename T> std::string get_string_for_type(T){return "unknown";}
template <typename T> std::string get_string_for_type(std::vector<T>){ return "std::vector<" + get_string_for_type(T()) + ">";} template <typename T> std::string get_string_for_type(std::vector<T>){ return "std::vector<" + get_string_for_type(T()) + ">";}
template <typename T, int Dim> std::string get_string_for_type(OpenMesh::VectorT<T, Dim>) template <typename T, int Dim> std::string get_string_for_type(OpenMesh::VectorT<T, Dim>)
{ return "VectorT<" + get_string_for_type(T()) + ", " + std::to_string(Dim) + ">";} { return "VectorT<" + get_string_for_type(T()) + ", " + std::to_string(Dim) + ">";}

39
src/Unittests/unittests_read_write_OM.cc
View File

@@ -1640,25 +1640,24 @@ void do_all_property_types_vec_all_dim(MeshT& _mesh, PropertyAction action)
template <typename MeshT, typename HandleT> template <typename MeshT, typename HandleT>
void do_all_property_types(MeshT& _mesh, PropertyAction action, int version) void do_all_property_types(MeshT& _mesh, PropertyAction action, int version)
{ {
// TODO: add support for commented out types do_property<MeshT, HandleT, int> (_mesh, action);
do_property<MeshT, HandleT, int> (_mesh, action); do_property<MeshT, HandleT, double> (_mesh, action);
do_property<MeshT, HandleT, double> (_mesh, action); do_property<MeshT, HandleT, float> (_mesh, action);
do_property<MeshT, HandleT, float> (_mesh, action); do_property<MeshT, HandleT, char> (_mesh, action);
do_property<MeshT, HandleT, char> (_mesh, action); do_property<MeshT, HandleT, bool> (_mesh, action);
do_property<MeshT, HandleT, bool> (_mesh, action);
if(version >= 22) if(version >= 22)
{ {
do_property<MeshT, HandleT, std::vector<int>> (_mesh, action); do_property<MeshT, HandleT, std::vector<int>> (_mesh, action);
do_property<MeshT, HandleT, std::vector<double>> (_mesh, action); do_property<MeshT, HandleT, std::vector<double>> (_mesh, action);
do_property<MeshT, HandleT, std::vector<float>> (_mesh, action); do_property<MeshT, HandleT, std::vector<float>> (_mesh, action);
do_property<MeshT, HandleT, std::vector<char>> (_mesh, action); do_property<MeshT, HandleT, std::vector<char>> (_mesh, action);
do_property<MeshT, HandleT, std::vector<std::vector<int>>> (_mesh, action); do_property<MeshT, HandleT, std::vector<std::vector<int>>> (_mesh, action);
//do_property<MeshT, HandleT, std::vector<bool>> (_mesh, action); //do_property<MeshT, HandleT, std::vector<bool>> (_mesh, action);
} }
do_all_property_types_vec_all_dim<MeshT, HandleT>(_mesh, action); do_all_property_types_vec_all_dim<MeshT, HandleT>(_mesh, action);
} }
template <typename MeshT> template <typename MeshT>
@@ -1867,10 +1866,10 @@ TEST_F(OpenMeshReadWriteOM, WriteAndLoadBoolCheckSpaces) {
// Check if the property is still ok // Check if the property is still ok
for (unsigned int i = 0; i < 8; ++i) for (unsigned int i = 0; i < 8; ++i)
{ {
if ( i == 5) if ( i == 5)
EXPECT_TRUE( mesh.property(prop,mesh2.vertex_handle((i)) ) ); EXPECT_TRUE( mesh.property(prop,mesh2.vertex_handle((i)) ) );
else else
EXPECT_FALSE(mesh.property(prop,mesh2.vertex_handle((i)))); EXPECT_FALSE(mesh.property(prop,mesh2.vertex_handle((i))));
} }
} }