chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change MuJoCo engine source code function-spacing convention from 3 blank lines to 2

Browse Source 
PiperOrigin-RevId: 813754244
Change-Id: I6836e41c3b021cb727e922c25c60f629b9814c93
This commit is contained in:
Yuval Tassa
2025-10-01 07:57:17 -07:00
committed by Copybara-Service
parent c439628f82
commit edbdb5195c
36 changed files with 8 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_collision_primitive.c
-14
View File
@@ -49,7 +49,6 @@ static int mjraw_PlaneSphere(mjContact* con, mjtNum margin,
}
// plane : sphere
int mjc_PlaneSphere(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -58,7 +57,6 @@ int mjc_PlaneSphere(const mjModel* m, const mjData* d,
}
// plane : capsule
int mjc_PlaneCapsule(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -89,7 +87,6 @@ int mjc_PlaneCapsule(const mjModel* m, const mjData* d,
}
// plane : cylinder
int mjc_PlaneCylinder(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -194,7 +191,6 @@ int mjc_PlaneCylinder(const mjModel* m, const mjData* d,
}
// plane : box
int mjc_PlaneBox(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -242,7 +238,6 @@ int mjc_PlaneBox(const mjModel* m, const mjData* d,
}
//--------------------------- sphere and capsule collisions ----------------------------------------
// sphere : sphere (actual implementation, can be called with modified parameters)
@@ -280,7 +275,6 @@ static int mjraw_SphereSphere(mjContact* con, mjtNum margin,
}
// sphere : sphere
int mjc_SphereSphere(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -289,7 +283,6 @@ int mjc_SphereSphere(const mjModel* m, const mjData* d,
}
// raw sphere : capsule
int mjraw_SphereCapsule(mjContact* con, mjtNum margin,
const mjtNum* pos1, const mjtNum* mat1, const mjtNum* size1,
@@ -309,7 +302,6 @@ int mjraw_SphereCapsule(mjContact* con, mjtNum margin,
}
// sphere : capsule
int mjc_SphereCapsule(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -318,7 +310,6 @@ int mjc_SphereCapsule(const mjModel* m, const mjData* d,
}
// sphere : cylinder
int mjc_SphereCylinder(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -392,7 +383,6 @@ int mjc_SphereCylinder(const mjModel* m, const mjData* d,
}
// raw capsule : capsule
int mjraw_CapsuleCapsule(mjContact* con, mjtNum margin,
const mjtNum* pos1, const mjtNum* mat1, const mjtNum* size1,
@@ -489,7 +479,6 @@ int mjraw_CapsuleCapsule(mjContact* con, mjtNum margin,
}
// capsule : capsule
int mjc_CapsuleCapsule(const mjModel* m, const mjData* d,
mjContact* con, int g1, int g2, mjtNum margin) {
@@ -498,14 +487,12 @@ int mjc_CapsuleCapsule(const mjModel* m, const mjData* d,
}
// sign of (signed) area of planar triangle
static mjtNum areaSign(const mjtNum p1[2], const mjtNum p2[2], const mjtNum p3[2]) {
return mju_sign((p1[0]-p3[0])*(p2[1]-p3[1]) - (p2[0]-p3[0])*(p1[1]-p3[1]));
}
// find nearest point to p within line segment (u,v); return distance to p
static mjtNum pointSegment(mjtNum res[2], const mjtNum p[2],
const mjtNum u[2], const mjtNum v[2]) {
@@ -532,7 +519,6 @@ static mjtNum pointSegment(mjtNum res[2], const mjtNum p[2],
}
// sphere : triangle with radius
int mjraw_SphereTriangle(mjContact* con, mjtNum margin,
const mjtNum* s, mjtNum rs,