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

Minor changes to inline comments in mjModel and mjData headers.

Browse Source 
PiperOrigin-RevId: 688231631
Change-Id: Iae5430142cab256a73a0fb8c698992ceba21b28c
This commit is contained in:
Saran Tunyasuvunakool
2024-10-21 12:28:26 -07:00
committed by Copybara-Service
parent aa91f3c047
commit 98478f8811
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/includes/references.h
+4 -4
View File
@@ -256,8 +256,8 @@ struct mjData_ {
int* ten_J_colind; // column indices in sparse Jacobian (ntendon x nv) int* ten_J_colind; // column indices in sparse Jacobian (ntendon x nv)
mjtNum* ten_J; // tendon Jacobian (ntendon x nv) mjtNum* ten_J; // tendon Jacobian (ntendon x nv)
mjtNum* ten_length; // tendon lengths (ntendon x 1) mjtNum* ten_length; // tendon lengths (ntendon x 1)
int* wrap_obj; // geom id; -1: site; -2: pulley (nwrap*2 x 1) int* wrap_obj; // geom id; -1: site; -2: pulley (nwrap x 2)
mjtNum* wrap_xpos; // Cartesian 3D points in all path (nwrap*2 x 3) mjtNum* wrap_xpos; // Cartesian 3D points in all paths (nwrap x 6)
// computed by mj_fwdPosition/mj_transmission // computed by mj_fwdPosition/mj_transmission
mjtNum* actuator_length; // actuator lengths (nu x 1) mjtNum* actuator_length; // actuator lengths (nu x 1)
@@ -1388,8 +1388,8 @@ struct mjModel_ {
mjtNum* key_qpos; // key position (nkey x nq) mjtNum* key_qpos; // key position (nkey x nq)
mjtNum* key_qvel; // key velocity (nkey x nv) mjtNum* key_qvel; // key velocity (nkey x nv)
mjtNum* key_act; // key activation (nkey x na) mjtNum* key_act; // key activation (nkey x na)
mjtNum* key_mpos; // key mocap position (nkey x 3*nmocap) mjtNum* key_mpos; // key mocap position (nkey x nmocap*3)
mjtNum* key_mquat; // key mocap quaternion (nkey x 4*nmocap) mjtNum* key_mquat; // key mocap quaternion (nkey x nmocap*4)
mjtNum* key_ctrl; // key control (nkey x nu) mjtNum* key_ctrl; // key control (nkey x nu)
// names // names
include/mujoco/mjdata.h
+2 -2
View File
@@ -284,8 +284,8 @@ struct mjData_ {
int* ten_J_colind; // column indices in sparse Jacobian (ntendon x nv) int* ten_J_colind; // column indices in sparse Jacobian (ntendon x nv)
mjtNum* ten_J; // tendon Jacobian (ntendon x nv) mjtNum* ten_J; // tendon Jacobian (ntendon x nv)
mjtNum* ten_length; // tendon lengths (ntendon x 1) mjtNum* ten_length; // tendon lengths (ntendon x 1)
int* wrap_obj; // geom id; -1: site; -2: pulley (nwrap*2 x 1) int* wrap_obj; // geom id; -1: site; -2: pulley (nwrap x 2)
mjtNum* wrap_xpos; // Cartesian 3D points in all path (nwrap*2 x 3) mjtNum* wrap_xpos; // Cartesian 3D points in all paths (nwrap x 6)
// computed by mj_fwdPosition/mj_transmission // computed by mj_fwdPosition/mj_transmission
mjtNum* actuator_length; // actuator lengths (nu x 1) mjtNum* actuator_length; // actuator lengths (nu x 1)
include/mujoco/mjmodel.h
+2 -2
View File
@@ -1095,8 +1095,8 @@ struct mjModel_ {
mjtNum* key_qpos; // key position (nkey x nq) mjtNum* key_qpos; // key position (nkey x nq)
mjtNum* key_qvel; // key velocity (nkey x nv) mjtNum* key_qvel; // key velocity (nkey x nv)
mjtNum* key_act; // key activation (nkey x na) mjtNum* key_act; // key activation (nkey x na)
mjtNum* key_mpos; // key mocap position (nkey x 3*nmocap) mjtNum* key_mpos; // key mocap position (nkey x nmocap*3)
mjtNum* key_mquat; // key mocap quaternion (nkey x 4*nmocap) mjtNum* key_mquat; // key mocap quaternion (nkey x nmocap*4)
mjtNum* key_ctrl; // key control (nkey x nu) mjtNum* key_ctrl; // key control (nkey x nu)
// names // names
introspect/structs.py
+5 -5
View File
@@ -4075,7 +4075,7 @@ STRUCTS: Mapping[str, StructDecl] = dict([
inner_type=ValueType(name='mjtNum'), inner_type=ValueType(name='mjtNum'),
), ),
doc='key mocap position', doc='key mocap position',
array_extent=('nkey', '3*nmocap'), array_extent=('nkey', 'nmocap*3'),
), ),
StructFieldDecl( StructFieldDecl(
name='key_mquat', name='key_mquat',
@@ -4083,7 +4083,7 @@ STRUCTS: Mapping[str, StructDecl] = dict([
inner_type=ValueType(name='mjtNum'), inner_type=ValueType(name='mjtNum'),
), ),
doc='key mocap quaternion', doc='key mocap quaternion',
array_extent=('nkey', '4*nmocap'), array_extent=('nkey', 'nmocap*4'),
), ),
StructFieldDecl( StructFieldDecl(
name='key_ctrl', name='key_ctrl',
@@ -5126,15 +5126,15 @@ STRUCTS: Mapping[str, StructDecl] = dict([
inner_type=ValueType(name='int'), inner_type=ValueType(name='int'),
), ),
doc='geom id; -1: site; -2: pulley', doc='geom id; -1: site; -2: pulley',
array_extent=('nwrap*2',), array_extent=('nwrap', 2),
), ),
StructFieldDecl( StructFieldDecl(
name='wrap_xpos', name='wrap_xpos',
type=PointerType( type=PointerType(
inner_type=ValueType(name='mjtNum'), inner_type=ValueType(name='mjtNum'),
), ),
doc='Cartesian 3D points in all path', doc='Cartesian 3D points in all paths',
array_extent=('nwrap*2', 3), array_extent=('nwrap', 6),
), ),
StructFieldDecl( StructFieldDecl(
name='actuator_length', name='actuator_length',