Skip to content

Commit b8ee7ae

Browse files
committed
Update comments
1 parent bf42fae commit b8ee7ae

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

src/ipc/collisions/normal/normal_collisions.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,15 @@ class NormalCollisions {
136136
to_string(const CollisionMesh& mesh, const Eigen::MatrixXd& vertices) const;
137137

138138
public:
139+
/// @brief Vertex-vertex normal collisions.
139140
std::vector<VertexVertexNormalCollision> vv_collisions;
141+
/// @brief Edge-vertex normal collisions.
140142
std::vector<EdgeVertexNormalCollision> ev_collisions;
143+
/// @brief Edge-edge normal collisions.
141144
std::vector<EdgeEdgeNormalCollision> ee_collisions;
145+
/// @brief Face-vertex normal collisions.
142146
std::vector<FaceVertexNormalCollision> fv_collisions;
147+
/// @brief Plane-vertex normal collisions.
143148
std::vector<PlaneVertexNormalCollision> pv_collisions;
144149

145150
protected:

src/ipc/collisions/tangential/tangential_collisions.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,13 @@ class TangentialCollisions {
7676
}
7777

7878
public:
79+
/// @brief Vertex-vertex tangential collisions.
7980
std::vector<VertexVertexTangentialCollision> vv_collisions;
81+
/// @brief Edge-vertex tangential collisions.
8082
std::vector<EdgeVertexTangentialCollision> ev_collisions;
83+
/// @brief Edge-edge tangential collisions.
8184
std::vector<EdgeEdgeTangentialCollision> ee_collisions;
85+
/// @brief Face-vertex tangential collisions.
8286
std::vector<FaceVertexTangentialCollision> fv_collisions;
8387
};
8488

src/ipc/implicits/plane.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ void construct_point_plane_collisions(
3838
const auto& plane_origin = plane_origins.row(pi);
3939
const auto& plane_normal = plane_normals.row(pi);
4040

41-
double distance_squared = point_plane_distance(
41+
double distance_sqr = point_plane_distance(
4242
points.row(vi), plane_origin, plane_normal);
4343

44-
if (distance_squared - dmin_squared
45-
< 2 * dmin * dhat + dhat_squared) {
44+
if (distance_sqr - dmin_squared < 2 * dmin * dhat + dhat_squared) {
4645
pv_collisions.emplace_back(plane_origin, plane_normal, vi);
4746
pv_collisions.back().dmin = dmin;
4847
}

src/ipc/implicits/plane.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void construct_point_plane_collisions(
3333
default_can_point_plane_collide);
3434

3535
// ============================================================================
36-
// NormalCollision detection
36+
// Collision detection
3737

3838
/// @brief Determine if the step is collision free.
3939
///

0 commit comments

Comments
 (0)