Fix swapped vertical frustum bounds for cameras with principal point offset.

The frustum_top and frustum_bottom assignments in mjv_updateCamera used
the wrong elements of the zver array, causing the principal point cy
offset to be applied with an inverted sign. This shifted the rendered
image vertically by 2*cy pixels.
This commit is contained in:
Kevin Zakka
2026-03-04 01:03:55 -08:00
parent a06c091157
commit 77ce80bc63
2 changed files with 48 additions and 2 deletions
+2 -2
View File
@@ -2910,8 +2910,8 @@ void mjv_updateCamera(const mjModel* m, const mjData* d, mjvCamera* cam, mjvScen
scn->camera[view].orthographic = orthographic;
// set symmetric frustum using intrinsic camera matrix
scn->camera[view].frustum_top = zver[1];
scn->camera[view].frustum_bottom = -zver[0];
scn->camera[view].frustum_top = zver[0];
scn->camera[view].frustum_bottom = -zver[1];
scn->camera[view].frustum_center = (zhor[1] - zhor[0]) / 2;
scn->camera[view].frustum_width = (zhor[1] + zhor[0]) / 2;
scn->camera[view].frustum_near = zclip[0];
+46
View File
@@ -108,5 +108,51 @@ TEST_F(MjvSceneTest, UpdateSceneGeomsExhausted) {
mj_deleteModel(model);
}
TEST_F(MjvSceneTest, PrincipalPointFrustumSign) {
constexpr char xml[] = R"(
<mujoco>
<worldbody>
<camera name="cam" pos="0 0 1" zaxis="0 0 1"
sensorsize="0.01 0.01" focal="0.01 0.01"
principal="0 0.002"/>
</worldbody>
</mujoco>
)";
mjModel* model = LoadModelFromString(xml);
ASSERT_THAT(model, NotNull());
mjData* data = mj_makeData(model);
mj_forward(model, data);
InitSceneObjects(model);
// point camera at the fixed cam
cam_.type = mjCAMERA_FIXED;
cam_.fixedcamid = 0;
mjv_updateCamera(model, data, &cam_, &scn_);
float top = scn_.camera[0].frustum_top;
float bottom = scn_.camera[0].frustum_bottom;
// with cy > 0 the principal point is above center, so the frustum should
// extend further downward than upward: |bottom| > top
EXPECT_GT(-bottom, top);
// verify exact values against the pinhole model
float znear = model->vis.map.znear * model->stat.extent;
float cy = model->cam_intrinsic[3];
float fy = model->cam_intrinsic[1];
float sh = model->cam_sensorsize[1];
float half = znear / fy * (sh / 2);
float offset = znear / fy * cy;
EXPECT_FLOAT_EQ(top, half - offset);
EXPECT_FLOAT_EQ(bottom, -(half + offset));
mj_deleteData(data);
FreeSceneObjects();
mj_deleteModel(model);
}
} // namespace
} // namespace mujoco