Skip to content

Commit 36acb3f

Browse files
committed
clang-format
1 parent 79af70b commit 36acb3f

28 files changed

+310
-207
lines changed

python/src/friction/collisions/edge_edge.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ void define_edge_edge_friction_collision(py::module_& m)
1212
.def(
1313
py::init<
1414
const EdgeEdgeCollision&, const VectorMax12d&,
15-
const BarrierPotential&, const double, const double, const double>(),
15+
const BarrierPotential&, const double, const double,
16+
const double>(),
1617
py::arg("collision"), py::arg("positions"),
1718
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
1819
py::arg("static_mu"), py::arg("kinetic_mu"));

python/src/friction/collisions/edge_vertex.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ void define_edge_vertex_friction_collision(py::module_& m)
1414
.def(
1515
py::init<
1616
const EdgeVertexCollision&, const VectorMax12d&,
17-
const BarrierPotential&, const double, const double, const double>(),
17+
const BarrierPotential&, const double, const double,
18+
const double>(),
1819
py::arg("collision"), py::arg("positions"),
1920
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
2021
py::arg("static_mu"), py::arg("kinetic_mu"));

python/src/friction/collisions/face_vertex.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ void define_face_vertex_friction_collision(py::module_& m)
1414
.def(
1515
py::init<
1616
const FaceVertexCollision&, const VectorMax12d&,
17-
const BarrierPotential&, const double, const double, const double>(),
17+
const BarrierPotential&, const double, const double,
18+
const double>(),
1819
py::arg("collision"), py::arg("positions"),
1920
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
2021
py::arg("static_mu"), py::arg("kinetic_mu"));

python/src/friction/collisions/vertex_vertex.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ void define_vertex_vertex_friction_collision(py::module_& m)
1414
.def(
1515
py::init<
1616
const VertexVertexCollision&, const VectorMax12d&,
17-
const BarrierPotential&, const double, const double, const double>(),
17+
const BarrierPotential&, const double, const double,
18+
const double>(),
1819
py::arg("collision"), py::arg("positions"),
1920
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
2021
py::arg("static_mu"), py::arg("kinetic_mu"));

python/src/friction/friction_collisions.cpp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ void define_friction_collisions(py::module_& m)
3636
py::overload_cast<
3737
const CollisionMesh&, const Eigen::MatrixXd&, const Collisions&,
3838
const BarrierPotential&, const double, const Eigen::VectorXd&,
39-
const std::function<double(double, double, std::optional<BlendType>)>&>(
39+
const std::function<double(
40+
double, double, std::optional<BlendType>)>&>(
4041
&FrictionCollisions::build),
4142
py::arg("mesh"), py::arg("vertices"), py::arg("collisions"),
4243
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
@@ -45,8 +46,10 @@ void define_friction_collisions(py::module_& m)
4546
"build",
4647
py::overload_cast<
4748
const CollisionMesh&, const Eigen::MatrixXd&, const Collisions&,
48-
const BarrierPotential&, const double, const double, const double,
49-
const std::map<std::tuple<int, int>, std::pair<double, double>>&>(
49+
const BarrierPotential&, const double, const double,
50+
const double,
51+
const std::map<
52+
std::tuple<int, int>, std::pair<double, double>>&>(
5053
&FrictionCollisions::build),
5154
py::arg("mesh"), py::arg("vertices"), py::arg("collisions"),
5255
py::arg("barrier_potential"), py::arg("barrier_stiffness"),
@@ -65,11 +68,14 @@ void define_friction_collisions(py::module_& m)
6568
kinetic_mu: Global kinetic friction coefficient.
6669
pairwise_friction: Pairwise static and kinetic friction coefficients.
6770
)ipc_Qu8mg5v7")
68-
.def("__len__", &FrictionCollisions::size,
71+
.def(
72+
"__len__", &FrictionCollisions::size,
6973
"Get the number of friction collisions.")
70-
.def("empty", &FrictionCollisions::empty,
74+
.def(
75+
"empty", &FrictionCollisions::empty,
7176
"Get if the friction collisions are empty.")
72-
.def("clear", &FrictionCollisions::clear,
77+
.def(
78+
"clear", &FrictionCollisions::clear,
7379
"Clear the friction collisions.")
7480
.def(
7581
"__getitem__",
@@ -87,7 +93,8 @@ void define_friction_collisions(py::module_& m)
8793
A reference to the collision.
8894
)ipc_Qu8mg5v7",
8995
py::arg("i"))
90-
.def_static("default_blend_mu", &FrictionCollisions::default_blend_mu,
96+
.def_static(
97+
"default_blend_mu", &FrictionCollisions::default_blend_mu,
9198
py::arg("mu0"), py::arg("mu1"), py::arg("type") = std::nullopt)
9299
.def_readwrite("vv_collisions", &FrictionCollisions::vv_collisions)
93100
.def_readwrite("ev_collisions", &FrictionCollisions::ev_collisions)

python/src/friction/smooth_friction_mollifier.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ void define_smooth_friction_mollifier(py::module_& m)
173173
Returns:
174174
The value of the mollifier function at s, using the appropriate mu (static or kinetic).
175175
)ipc_Qu8mg5v7",
176-
py::arg("s"), py::arg("epsv"), py::arg("static_mu"), py::arg("kinetic_mu"));
176+
py::arg("s"), py::arg("epsv"), py::arg("static_mu"),
177+
py::arg("kinetic_mu"));
177178

178179
m.def(
179180
"f1_SF_over_x_pairwise_transition", &f1_SF_over_x_pairwise_transition,
@@ -189,10 +190,12 @@ void define_smooth_friction_mollifier(py::module_& m)
189190
Returns:
190191
The value of the derivative of f0_SF divided by s, using the appropriate mu (static or kinetic).
191192
)ipc_Qu8mg5v7",
192-
py::arg("s"), py::arg("epsv"), py::arg("static_mu"), py::arg("kinetic_mu"));
193+
py::arg("s"), py::arg("epsv"), py::arg("static_mu"),
194+
py::arg("kinetic_mu"));
193195

194196
m.def(
195-
"df1_x_minus_f1_over_x3_pairwise_transition", &df1_x_minus_f1_over_x3_pairwise_transition,
197+
"df1_x_minus_f1_over_x3_pairwise_transition",
198+
&df1_x_minus_f1_over_x3_pairwise_transition,
196199
R"ipc_Qu8mg5v7(
197200
The derivative of f1 times s minus f1 all divided by s cubed, using the appropriate mu (static or kinetic).
198201
@@ -205,5 +208,6 @@ void define_smooth_friction_mollifier(py::module_& m)
205208
Returns:
206209
The derivative of f1 times s minus f1 all divided by s cubed, using the appropriate mu (static or kinetic).
207210
)ipc_Qu8mg5v7",
208-
py::arg("s"), py::arg("epsv"), py::arg("static_mu"), py::arg("kinetic_mu"));
211+
py::arg("s"), py::arg("epsv"), py::arg("static_mu"),
212+
py::arg("kinetic_mu"));
209213
}

python/src/potentials/friction_potential.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void define_friction_potential(py::module_& m)
3333
py::arg("epsv"))
3434
.def(
3535
"__call__",
36-
py::overload_cast<
36+
py::overload_cast<
3737
const FrictionCollisions&, const CollisionMesh&,
3838
const Eigen::MatrixXd&>(
3939
&FrictionPotential::Potential::operator(), py::const_),
@@ -147,8 +147,7 @@ void define_friction_potential(py::module_& m)
147147
py::arg("wrt"), py::arg("dmin") = 0)
148148
// Adding pairwise friction functions
149149
.def(
150-
"pairwise_force",
151-
&FrictionPotential::pairwise_force,
150+
"pairwise_force", &FrictionPotential::pairwise_force,
152151
R"ipc_Qu8mg5v7(
153152
Compute the pairwise friction force for a collision.
154153
@@ -197,8 +196,7 @@ void define_friction_potential(py::module_& m)
197196
py::arg("wrt"), py::arg("dmin") = 0, py::arg("static_mu"),
198197
py::arg("kinetic_mu"))
199198
.def(
200-
"pairwise_hessian",
201-
&FrictionPotential::pairwise_hessian,
199+
"pairwise_hessian", &FrictionPotential::pairwise_hessian,
202200
R"ipc_Qu8mg5v7(
203201
Compute the Hessian of the pairwise friction potential.
204202

src/ipc/broad_phase/aabb.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class AABB {
2020

2121
AABB(const AABB& aabb1, const AABB& aabb2, const AABB& aabb3)
2222
: AABB(
23-
aabb1.min.min(aabb2.min).min(aabb3.min),
24-
aabb1.max.max(aabb2.max).max(aabb3.max))
23+
aabb1.min.min(aabb2.min).min(aabb3.min),
24+
aabb1.max.max(aabb2.max).max(aabb3.max))
2525
{
2626
}
2727

src/ipc/collision_mesh.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ CollisionMesh::CollisionMesh(
1414
const Eigen::MatrixXi& faces,
1515
const Eigen::SparseMatrix<double>& displacement_map)
1616
: CollisionMesh(
17-
std::vector<bool>(rest_positions.rows(), true),
18-
rest_positions,
19-
edges,
20-
faces,
21-
displacement_map)
17+
std::vector<bool>(rest_positions.rows(), true),
18+
rest_positions,
19+
edges,
20+
faces,
21+
displacement_map)
2222
{
2323
}
2424

src/ipc/friction/collisions/edge_edge.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ EdgeEdgeFrictionCollision::EdgeEdgeFrictionCollision(
3636
: EdgeEdgeFrictionCollision(collision)
3737
{
3838
FrictionCollision::init(
39-
collision, positions, barrier_potential, barrier_stiffness, static_mu, kinetic_mu);
39+
collision, positions, barrier_potential, barrier_stiffness, static_mu,
40+
kinetic_mu);
4041
}
4142

4243
// ============================================================================

0 commit comments

Comments
 (0)