diff --git a/mesh/mesh_are_equivalent.cc b/mesh/mesh_are_equivalent.cc index 6c9a149..8e31c0f 100644 --- a/mesh/mesh_are_equivalent.cc +++ b/mesh/mesh_are_equivalent.cc @@ -136,8 +136,8 @@ bool MeshAreEquivalent::operator()(const Mesh &mesh0, const Mesh &mesh1) { DCHECK(att1->IsValid()); // Prepare blocks of memomry to hold data of corners for this attribute. - std::unique_ptr data0(new uint8[att0->byte_stride()]); - std::unique_ptr data1(new uint8[att0->byte_stride()]); + std::unique_ptr data0(new uint8_t[att0->byte_stride()]); + std::unique_ptr data1(new uint8_t[att0->byte_stride()]); // Check every corner of every face. for (int i = 0; i < num_faces_; ++i) { diff --git a/testdata/cube_att_sub_o.obj b/testdata/cube_att_sub_o.obj new file mode 100644 index 0000000..bfb4436 --- /dev/null +++ b/testdata/cube_att_sub_o.obj @@ -0,0 +1,36 @@ +v 0.0 0.0 0.0 +v 0.0 0.0 1.0 +v 0.0 1.0 0.0 +v 0.0 1.0 1.0 +v 1.0 0.0 0.0 +v 1.0 0.0 1.0 +v 1.0 1.0 0.0 +v 1.0 1.0 1.0 + +vn 0.0 0.0 1.0 +vn 0.0 0.0 -1.0 +vn 0.0 1.0 0.0 +vn 0.0 -1.0 0.0 +vn 1.0 0.0 0.0 +vn -1.0 0.0 0.0 + +vt 0.0 0.0 +vt 0.0 1.0 +vt 1.0 0.0 +vt 1.0 1.0 + +o obj0 +f 1/4/2 7/1/2 5/2/2 +f 1/4/2 3/3/2 7/1/2 +f 1/2/6 4/3/6 3/1/6 +f 1/2/6 2/4/6 4/3/6 +o obj1 +f 3/1/3 8/4/3 7/3/3 +f 3/1/3 4/2/3 8/4/3 +f 5/4/5 7/3/5 8/1/5 +f 5/4/5 8/1/5 6/2/5 +f 1/2/4 5/4/4 6/3/4 +o obj2 +f 1/2/4 6/3/4 2/1/4 +f 2/2/1 6/4/1 8/3/1 +f 2/2/1 8/3/1 4/1/1 diff --git a/testdata/one_face_312.obj b/testdata/one_face_312.obj new file mode 100644 index 0000000..ab34ba6 --- /dev/null +++ b/testdata/one_face_312.obj @@ -0,0 +1,11 @@ +v 1.00 0.10 0.00 +v 2.00 0.01 0.00 +v 3.00 0.11 0.00 + +# 3 vertices, 0 vertices normals + +f 3 1 2 + +# 1 faces, 0 coords texture + +# End of File \ No newline at end of file diff --git a/testdata/three_faces_123.obj b/testdata/three_faces_123.obj new file mode 100644 index 0000000..8c07950 --- /dev/null +++ b/testdata/three_faces_123.obj @@ -0,0 +1,16 @@ +v 0.123 0.6514 0.000001 +v 0.342 0.1234 0.000002 +v 0.156 0.8422 0.000003 +v 0.252 0.2344 0.000004 +v 0.782 4.2515 0.000005 +v 0.127 1.2715 0.000006 + +# 6 vertices, 0 vertices normals + +f 1 2 3 +f 4 5 6 +f 3 6 2 + +# 3 faces, 0 coords texture + +# End of File \ No newline at end of file diff --git a/testdata/three_faces_312.obj b/testdata/three_faces_312.obj new file mode 100644 index 0000000..9d04ff8 --- /dev/null +++ b/testdata/three_faces_312.obj @@ -0,0 +1,16 @@ +v 0.123 0.6514 0.000001 +v 0.342 0.1234 0.000002 +v 0.156 0.8422 0.000003 +v 0.252 0.2344 0.000004 +v 0.782 4.2515 0.000005 +v 0.127 1.2715 0.000006 + +# 6 vertices, 0 vertices normals + +f 5 6 4 +f 3 1 2 +f 2 3 6 + +# 3 faces, 0 coords texture + +# End of File \ No newline at end of file diff --git a/testdata/two_faces_123.obj b/testdata/two_faces_123.obj new file mode 100644 index 0000000..d671ac5 --- /dev/null +++ b/testdata/two_faces_123.obj @@ -0,0 +1,15 @@ +v 0.123 0.6514 0.000001 +v 0.342 0.1234 0.000002 +v 0.156 0.8422 0.000003 +v 0.252 0.2344 0.000004 +v 0.782 4.2515 0.000005 +v 0.127 1.2715 0.000006 + +# 6 vertices, 0 vertices normals + +f 1 2 3 +f 4 5 6 + +# 2 faces, 0 coords texture + +# End of File \ No newline at end of file diff --git a/testdata/two_faces_312.obj b/testdata/two_faces_312.obj new file mode 100644 index 0000000..f0eb37c --- /dev/null +++ b/testdata/two_faces_312.obj @@ -0,0 +1,15 @@ +v 0.123 0.6514 0.000001 +v 0.342 0.1234 0.000002 +v 0.156 0.8422 0.000003 +v 0.252 0.2344 0.000004 +v 0.782 4.2515 0.000005 +v 0.127 1.2715 0.000006 + +# 6 vertices, 0 vertices normals + +f 5 6 4 +f 3 1 2 + +# 1 faces, 0 coords texture + +# End of File \ No newline at end of file