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

Rollback of 1cda1e7a8c, fixes #3163

Browse Source 
Note this change re-opens issue #2472

PiperOrigin-RevId: 884378131
Change-Id: Ifefc345f1a296e5245cbb10047bb678ffea3598f
This commit is contained in:
Yuval Tassa
2026-03-16 05:16:59 -07:00
committed by Copybara-Service
parent 55f5ac0a1d
commit a47a18dd28
2 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_setconst.c
+2 -12
View File
@@ -737,18 +737,8 @@ static void set0(mjModel* m, mjData* d) {
} }
// average diagonal and assign // average diagonal and assign
mjtNum tran = (A[0] + A[7] + A[14])/3; m->body_invweight0[2*i] = (A[0] + A[7] + A[14])/3;
mjtNum rot = (A[21] + A[28] + A[35])/3; m->body_invweight0[2*i+1] = (A[21] + A[28] + A[35])/3;
// if one is zero, use the other to prevent degenerate constraints
if (tran < mjMINVAL && rot > mjMINVAL) {
tran = rot; // use rotation as fallback for translation
} else if (rot < mjMINVAL && tran > mjMINVAL) {
rot = tran; // use translation as fallback for rotation
}
m->body_invweight0[2*i] = tran;
m->body_invweight0[2*i+1] = rot;
} }
} }
test/engine/engine_forward_test.cc
-37
View File
@@ -811,43 +811,6 @@ TEST_F(ForwardTest, MocapQuats) {
mj_deleteModel(model); mj_deleteModel(model);
} }
// model with degenerate translational inertia
TEST_F(ForwardTest, DegenerateInertia) {
static constexpr char xml[] = R"(
<mujoco>
<option integrator="implicitfast" cone="elliptic">
<flag gravity="disable"/>
</option>
<worldbody>
<body name="1" pos="0.05 0.3 0">
<joint name="1" axis="0 1 0"/>
<geom type="capsule" size="0.1 0.5"/>
</body>
<body name="2">
<joint name="2" axis="1 0 0" stiffness="1" springref="90"/>
<geom type="capsule" size="0.1 0.5"/>
</body>
</worldbody>
</mujoco>
)";
char error[1024];
mjModel* model = LoadModelFromString(xml, error, sizeof(error));
ASSERT_THAT(model, NotNull()) << error;
mjData* data = mj_makeData(model);
for (int i = 0; i < 1000; i++) {
mj_step(model, data);
EXPECT_EQ(data->warning[mjWARN_BADQACC].number, 0)
<< "divergence at timestep " << i;
if (data->warning[mjWARN_BADQACC].number != 0) {
break;
}
}
mj_deleteData(data);
mj_deleteModel(model);
}
// user defined 2nd-order activation dynamics: frequency-controlled oscillator // user defined 2nd-order activation dynamics: frequency-controlled oscillator
// note that scalar mjcb_act_dyn callbacks are expected to return act_dot, but // note that scalar mjcb_act_dyn callbacks are expected to return act_dot, but
// since we have a vector output we write into act_dot directly // since we have a vector output we write into act_dot directly