File tree 4 files changed +12
-4
lines changed
4 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -136,10 +136,15 @@ class NormalCollisions {
136
136
to_string (const CollisionMesh& mesh, const Eigen::MatrixXd& vertices) const ;
137
137
138
138
public:
139
+ // / @brief Vertex-vertex normal collisions.
139
140
std::vector<VertexVertexNormalCollision> vv_collisions;
141
+ // / @brief Edge-vertex normal collisions.
140
142
std::vector<EdgeVertexNormalCollision> ev_collisions;
143
+ // / @brief Edge-edge normal collisions.
141
144
std::vector<EdgeEdgeNormalCollision> ee_collisions;
145
+ // / @brief Face-vertex normal collisions.
142
146
std::vector<FaceVertexNormalCollision> fv_collisions;
147
+ // / @brief Plane-vertex normal collisions.
143
148
std::vector<PlaneVertexNormalCollision> pv_collisions;
144
149
145
150
protected:
Original file line number Diff line number Diff line change @@ -76,9 +76,13 @@ class TangentialCollisions {
76
76
}
77
77
78
78
public:
79
+ // / @brief Vertex-vertex tangential collisions.
79
80
std::vector<VertexVertexTangentialCollision> vv_collisions;
81
+ // / @brief Edge-vertex tangential collisions.
80
82
std::vector<EdgeVertexTangentialCollision> ev_collisions;
83
+ // / @brief Edge-edge tangential collisions.
81
84
std::vector<EdgeEdgeTangentialCollision> ee_collisions;
85
+ // / @brief Face-vertex tangential collisions.
82
86
std::vector<FaceVertexTangentialCollision> fv_collisions;
83
87
};
84
88
Original file line number Diff line number Diff line change @@ -38,11 +38,10 @@ void construct_point_plane_collisions(
38
38
const auto & plane_origin = plane_origins.row (pi );
39
39
const auto & plane_normal = plane_normals.row (pi );
40
40
41
- double distance_squared = point_plane_distance (
41
+ double distance_sqr = point_plane_distance (
42
42
points.row (vi), plane_origin, plane_normal);
43
43
44
- if (distance_squared - dmin_squared
45
- < 2 * dmin * dhat + dhat_squared) {
44
+ if (distance_sqr - dmin_squared < 2 * dmin * dhat + dhat_squared) {
46
45
pv_collisions.emplace_back (plane_origin, plane_normal, vi);
47
46
pv_collisions.back ().dmin = dmin;
48
47
}
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ void construct_point_plane_collisions(
33
33
default_can_point_plane_collide);
34
34
35
35
// ============================================================================
36
- // NormalCollision detection
36
+ // Collision detection
37
37
38
38
// / @brief Determine if the step is collision free.
39
39
// /
You can’t perform that action at this time.
0 commit comments