diff --git a/doc/includes/references.h b/doc/includes/references.h index b94d5d71..913d2465 100644 --- a/doc/includes/references.h +++ b/doc/includes/references.h @@ -1154,8 +1154,6 @@ struct mjModel_ { int* mesh_texcoordadr; // texcoord data address; -1: no texcoord (nmesh x 1) int* mesh_texcoordnum; // number of texcoord (nmesh x 1) int* mesh_graphadr; // graph data address; -1: no graph (nmesh x 1) - mjtNum* mesh_pos; // translation applied to asset vertices (nmesh x 3) - mjtNum* mesh_quat; // rotation applied to asset vertices (nmesh x 4) float* mesh_vert; // vertex positions for all meshes (nmeshvert x 3) float* mesh_normal; // normals for all meshes (nmeshnormal x 3) float* mesh_texcoord; // vertex texcoords for all meshes (nmeshtexcoord x 2) @@ -1163,6 +1161,8 @@ struct mjModel_ { int* mesh_facenormal; // normal face data (nmeshface x 3) int* mesh_facetexcoord; // texture face data (nmeshface x 3) int* mesh_graph; // convex graph data (nmeshgraph x 1) + mjtNum* mesh_pos; // translation applied to asset vertices (nmesh x 3) + mjtNum* mesh_quat; // rotation applied to asset vertices (nmesh x 4) int* mesh_pathadr; // address of asset path for mesh; -1: none (nmesh x 1) // skins diff --git a/include/mujoco/mjmodel.h b/include/mujoco/mjmodel.h index b91ee594..a5bdca11 100644 --- a/include/mujoco/mjmodel.h +++ b/include/mujoco/mjmodel.h @@ -868,8 +868,6 @@ struct mjModel_ { int* mesh_texcoordadr; // texcoord data address; -1: no texcoord (nmesh x 1) int* mesh_texcoordnum; // number of texcoord (nmesh x 1) int* mesh_graphadr; // graph data address; -1: no graph (nmesh x 1) - mjtNum* mesh_pos; // translation applied to asset vertices (nmesh x 3) - mjtNum* mesh_quat; // rotation applied to asset vertices (nmesh x 4) float* mesh_vert; // vertex positions for all meshes (nmeshvert x 3) float* mesh_normal; // normals for all meshes (nmeshnormal x 3) float* mesh_texcoord; // vertex texcoords for all meshes (nmeshtexcoord x 2) @@ -877,6 +875,8 @@ struct mjModel_ { int* mesh_facenormal; // normal face data (nmeshface x 3) int* mesh_facetexcoord; // texture face data (nmeshface x 3) int* mesh_graph; // convex graph data (nmeshgraph x 1) + mjtNum* mesh_pos; // translation applied to asset vertices (nmesh x 3) + mjtNum* mesh_quat; // rotation applied to asset vertices (nmesh x 4) int* mesh_pathadr; // address of asset path for mesh; -1: none (nmesh x 1) // skins diff --git a/introspect/structs.py b/introspect/structs.py index 8f44927d..fee5933b 100644 --- a/introspect/structs.py +++ b/introspect/structs.py @@ -2591,20 +2591,6 @@ STRUCTS: Mapping[str, StructDecl] = dict([ ), doc='graph data address; -1: no graph (nmesh x 1)', ), - StructFieldDecl( - name='mesh_pos', - type=PointerType( - inner_type=ValueType(name='mjtNum'), - ), - doc='translation applied to asset vertices (nmesh x 3)', - ), - StructFieldDecl( - name='mesh_quat', - type=PointerType( - inner_type=ValueType(name='mjtNum'), - ), - doc='rotation applied to asset vertices (nmesh x 4)', - ), StructFieldDecl( name='mesh_vert', type=PointerType( @@ -2654,6 +2640,20 @@ STRUCTS: Mapping[str, StructDecl] = dict([ ), doc='convex graph data (nmeshgraph x 1)', # pylint: disable=line-too-long ), + StructFieldDecl( + name='mesh_pos', + type=PointerType( + inner_type=ValueType(name='mjtNum'), + ), + doc='translation applied to asset vertices (nmesh x 3)', + ), + StructFieldDecl( + name='mesh_quat', + type=PointerType( + inner_type=ValueType(name='mjtNum'), + ), + doc='rotation applied to asset vertices (nmesh x 4)', + ), StructFieldDecl( name='mesh_pathadr', type=PointerType( diff --git a/unity/Runtime/Bindings/MjBindings.cs b/unity/Runtime/Bindings/MjBindings.cs index 48816d2d..a5a1219e 100644 --- a/unity/Runtime/Bindings/MjBindings.cs +++ b/unity/Runtime/Bindings/MjBindings.cs @@ -5365,8 +5365,6 @@ public unsafe struct mjModel_ { public int* mesh_texcoordadr; public int* mesh_texcoordnum; public int* mesh_graphadr; - public double* mesh_pos; - public double* mesh_quat; public float* mesh_vert; public float* mesh_normal; public float* mesh_texcoord; @@ -5374,6 +5372,8 @@ public unsafe struct mjModel_ { public int* mesh_facenormal; public int* mesh_facetexcoord; public int* mesh_graph; + public double* mesh_pos; + public double* mesh_quat; public int* mesh_pathadr; public int* skin_matid; public int* skin_group;