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

- added color float support for the OM OFF reader/writer

Browse Source 
- added corresponding unittests
- small fix for the PLY writer

Note that for reading binary OFF files with color floats, the user has to set the flag, that floats are expected

closes #1410

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@818 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2013-03-04 16:36:20 +00:00
parent 57b3908771
commit 837c866abb
8 changed files with 394 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/Unittests/unittests_read_write_OFF.hh
View File

@@ -95,5 +95,113 @@ TEST_F(OpenMeshReadWriteOFF, WriteAndReadVertexColorsToAndFromOFFFile) {
mesh_.release_vertex_colors();
}
TEST_F(OpenMeshReadWriteOFF, WriteAndReadFloatVertexColorsToAndFromOFFFile) {
mesh_.clear();
mesh_.request_vertex_colors();
OpenMesh::IO::Options opt(OpenMesh::IO::Options::VertexColor);
bool ok = OpenMesh::IO::read_mesh(mesh_, "meshlab.ply", opt);
EXPECT_TRUE(ok) << "meshlab.ply could not be read!";
opt.clear();
opt += OpenMesh::IO::Options::VertexColor;
opt += OpenMesh::IO::Options::ColorFloat;
// write the mesh_
ok = OpenMesh::IO::write_mesh(mesh_, "cube_floating.off", opt);
EXPECT_TRUE(ok) << "cube_floating.off could not be written!";
mesh_.clear();
ok = OpenMesh::IO::read_mesh(mesh_, "cube_floating.off", opt);
EXPECT_TRUE(ok) << "cube_floating.off could not be read!";
EXPECT_EQ(8u , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(0))[0] ) << "Wrong vertex color at vertex 0 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(0))[1] ) << "Wrong vertex color at vertex 0 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(0))[2] ) << "Wrong vertex color at vertex 0 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(3))[0] ) << "Wrong vertex color at vertex 3 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(3))[1] ) << "Wrong vertex color at vertex 3 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(3))[2] ) << "Wrong vertex color at vertex 3 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(4))[0] ) << "Wrong vertex color at vertex 4 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(4))[1] ) << "Wrong vertex color at vertex 4 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(4))[2] ) << "Wrong vertex color at vertex 4 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(7))[0] ) << "Wrong vertex color at vertex 7 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(7))[1] ) << "Wrong vertex color at vertex 7 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(7))[2] ) << "Wrong vertex color at vertex 7 component 2";
EXPECT_FALSE(opt.vertex_has_normal()) << "Wrong user opt are returned!";
EXPECT_FALSE(opt.vertex_has_texcoord()) << "Wrong user opt are returned!";
EXPECT_TRUE(opt.vertex_has_color()) << "Wrong user opt are returned!";
EXPECT_TRUE(opt.color_is_float()) << "Wrong user opt are returned!";
mesh_.release_vertex_colors();
}
TEST_F(OpenMeshReadWriteOFF, WriteAndReadBinaryFloatVertexColorsToAndFromOFFFile) {
mesh_.clear();
mesh_.request_vertex_colors();
OpenMesh::IO::Options opt(OpenMesh::IO::Options::VertexColor);
bool ok = OpenMesh::IO::read_mesh(mesh_, "meshlab.ply", opt);
EXPECT_TRUE(ok) << "meshlab.ply could not be read!";
opt.clear();
opt += OpenMesh::IO::Options::VertexColor;
opt += OpenMesh::IO::Options::Binary;
opt += OpenMesh::IO::Options::ColorFloat;
// write the mesh_
ok = OpenMesh::IO::write_mesh(mesh_, "cube_floating_binary.off", opt);
EXPECT_TRUE(ok) << "cube_floating_binary.off could not be written!";
mesh_.clear();
opt.clear();
opt += OpenMesh::IO::Options::VertexColor;
opt += OpenMesh::IO::Options::Binary;
opt += OpenMesh::IO::Options::ColorFloat;
ok = OpenMesh::IO::read_mesh(mesh_, "cube_floating_binary.off", opt);
EXPECT_TRUE(ok) << "cube_floating_binary.off could not be read!";
EXPECT_EQ(8u , mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
EXPECT_EQ(18u , mesh_.n_edges()) << "The number of loaded edges is not correct!";
EXPECT_EQ(12u , mesh_.n_faces()) << "The number of loaded faces is not correct!";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(0))[0] ) << "Wrong vertex color at vertex 0 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(0))[1] ) << "Wrong vertex color at vertex 0 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(0))[2] ) << "Wrong vertex color at vertex 0 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(3))[0] ) << "Wrong vertex color at vertex 3 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(3))[1] ) << "Wrong vertex color at vertex 3 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(3))[2] ) << "Wrong vertex color at vertex 3 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(4))[0] ) << "Wrong vertex color at vertex 4 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(4))[1] ) << "Wrong vertex color at vertex 4 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(4))[2] ) << "Wrong vertex color at vertex 4 component 2";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(7))[0] ) << "Wrong vertex color at vertex 7 component 0";
EXPECT_EQ(0, mesh_.color(mesh_.vertex_handle(7))[1] ) << "Wrong vertex color at vertex 7 component 1";
EXPECT_EQ(255, mesh_.color(mesh_.vertex_handle(7))[2] ) << "Wrong vertex color at vertex 7 component 2";
EXPECT_FALSE(opt.vertex_has_normal()) << "Wrong user opt are returned!";
EXPECT_FALSE(opt.vertex_has_texcoord()) << "Wrong user opt are returned!";
EXPECT_FALSE(opt.face_has_color()) << "Wrong user opt are returned!";
EXPECT_TRUE(opt.vertex_has_color()) << "Wrong user opt are returned!";
EXPECT_TRUE(opt.color_is_float()) << "Wrong user opt are returned!";
EXPECT_TRUE(opt.is_binary()) << "Wrong user opt are returned!";
mesh_.release_vertex_colors();
}
#endif // INCLUDE GUARD

3
src/Unittests/unittests_read_write_PLY.hh
View File

@@ -296,6 +296,7 @@ TEST_F(OpenMeshReadWritePLY, WriteAndReadPLYWithFloatVertexColors) {
EXPECT_FALSE(options.vertex_has_normal()) << "Wrong user options are returned!";
EXPECT_FALSE(options.vertex_has_texcoord()) << "Wrong user options are returned!";
EXPECT_TRUE(options.vertex_has_color()) << "Wrong user options are returned!";
EXPECT_TRUE(options.color_is_float()) << "Wrong user options are returned!";
mesh_.release_vertex_colors();
}
@@ -349,6 +350,8 @@ TEST_F(OpenMeshReadWritePLY, WriteAndReadBinaryPLYWithFloatVertexColors) {
EXPECT_FALSE(options.vertex_has_normal()) << "Wrong user options are returned!";
EXPECT_FALSE(options.vertex_has_texcoord()) << "Wrong user options are returned!";
EXPECT_TRUE(options.vertex_has_color()) << "Wrong user options are returned!";
EXPECT_TRUE(options.color_is_float()) << "Wrong user options are returned!";
EXPECT_TRUE(options.is_binary()) << "Wrong user options are returned!";
mesh_.release_vertex_colors();
}