Extend rangefinder sensor to support cameras.
PiperOrigin-RevId: 848255889 Change-Id: I6e1a9ed13d29d2242558625a47e24e47ad6e87db
This commit is contained in:
committed by
Copybara-Service
parent
4a871990e9
commit
9d646e6548
@@ -1252,7 +1252,6 @@ void mjs_deleteUserValue(mjsElement* element, const char* key) {
|
||||
int mjs_sensorDim(const mjsSensor* sensor) {
|
||||
switch (sensor->type) {
|
||||
case mjSENS_TOUCH:
|
||||
case mjSENS_RANGEFINDER:
|
||||
case mjSENS_JOINTPOS:
|
||||
case mjSENS_JOINTVEL:
|
||||
case mjSENS_TENDONPOS:
|
||||
@@ -1275,6 +1274,15 @@ int mjs_sensorDim(const mjsSensor* sensor) {
|
||||
case mjSENS_CLOCK:
|
||||
return 1;
|
||||
|
||||
case mjSENS_RANGEFINDER:
|
||||
if (sensor->objtype == mjOBJ_CAMERA) {
|
||||
const mjCCamera* camera = static_cast<const mjCCamera*>(
|
||||
static_cast<mjCSensor*>(sensor->element)->get_obj());
|
||||
return static_cast<int>(camera->spec.resolution[0]) *
|
||||
static_cast<int>(camera->spec.resolution[1]);
|
||||
}
|
||||
return 1; // site-attached: single ray
|
||||
|
||||
case mjSENS_CAMPROJECTION:
|
||||
return 2;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user