Skip to content

Commit 1587437

Browse files
lmontautjcarpent
authored andcommitted
serialization: fix nearest_points
1 parent eec3068 commit 1587437

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

include/hpp/fcl/serialization/collision_data.h

+9-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ void save(Archive& ar, const hpp::fcl::Contact& contact,
1717
ar& make_nvp("b1", contact.b1);
1818
ar& make_nvp("b2", contact.b2);
1919
ar& make_nvp("normal", contact.normal);
20+
ar& make_nvp("nearest_points", contact.nearest_points);
2021
ar& make_nvp("pos", contact.pos);
2122
ar& make_nvp("penetration_depth", contact.penetration_depth);
2223
}
@@ -27,7 +28,10 @@ void load(Archive& ar, hpp::fcl::Contact& contact,
2728
ar >> make_nvp("b1", contact.b1);
2829
ar >> make_nvp("b2", contact.b2);
2930
ar >> make_nvp("normal", contact.normal);
30-
ar >> make_nvp("nearest_points", contact.nearest_points);
31+
std::array<hpp::fcl::Vec3f, 2> nearest_points;
32+
ar >> make_nvp("nearest_points", nearest_points);
33+
contact.nearest_points[0] = nearest_points[0];
34+
contact.nearest_points[1] = nearest_points[1];
3135
ar >> make_nvp("pos", contact.pos);
3236
ar >> make_nvp("penetration_depth", contact.penetration_depth);
3337
contact.o1 = NULL;
@@ -129,7 +133,10 @@ void load(Archive& ar, hpp::fcl::DistanceResult& distance_result,
129133
make_nvp("base", boost::serialization::base_object<hpp::fcl::QueryResult>(
130134
distance_result));
131135
ar >> make_nvp("min_distance", distance_result.min_distance);
132-
ar >> make_nvp("nearest_points", distance_result.nearest_points);
136+
std::array<hpp::fcl::Vec3f, 2> nearest_points;
137+
ar >> make_nvp("nearest_points", nearest_points);
138+
distance_result.nearest_points[0] = nearest_points[0];
139+
distance_result.nearest_points[1] = nearest_points[1];
133140
ar >> make_nvp("normal", distance_result.normal);
134141
ar >> make_nvp("b1", distance_result.b1);
135142
ar >> make_nvp("b2", distance_result.b2);

0 commit comments

Comments
 (0)