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

Add mjv_connector, identical to mjv_makeConnector but with a more convenient "from-to" parameterization.

Browse Source 
PiperOrigin-RevId: 542343761
Change-Id: I75f5ff3c404a2a9f65dfed706e590efd7b951f6e
This commit is contained in:
Yuval Tassa
2023-06-21 13:18:33 -07:00
committed by Copybara-Service
parent 74747e2ae6
commit c50c92ccc8
9 changed files with 142 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/APIreference/functions.rst
+12
View File
@@ -1502,6 +1502,18 @@ mjv_makeConnector
.. mujoco-include:: mjv_makeConnector
Set (type, size, pos, mat) for connector-type geom between given points.
Assume that mjv_initGeom was already called to set all other properties.
Width of mjGEOM_LINE is denominated in pixels.
Deprecated: use mjv_connector.
.. _mjv_connector:
mjv_connector
~~~~~~~~~~~~~
.. mujoco-include:: mjv_connector
Set (type, size, pos, mat) for connector-type geom between given points.
Assume that mjv_initGeom was already called to set all other properties.
Width of mjGEOM_LINE is denominated in pixels.
doc/changelog.rst
+10
View File
@@ -2,6 +2,16 @@
Changelog
=========
Upcoming version (not yet released)
-----------------------------------
General
^^^^^^^
- Added :ref:`mjv_connector` which has identical functionality to :ref:`mjv_makeConnector`, but with more convenient
"from-to" argument parametrization. :ref:`mjv_makeConnector` is now deprecated.
Version 2.3.6 (June 20, 2023)
-----------------------------
doc/includes/references.h
+2
View File
@@ -2297,6 +2297,8 @@ void mjv_initGeom(mjvGeom* geom, int type, const mjtNum size[3],
void mjv_makeConnector(mjvGeom* geom, int type, mjtNum width,
mjtNum a0, mjtNum a1, mjtNum a2,
mjtNum b0, mjtNum b1, mjtNum b2);
void mjv_connector(mjvGeom* geom, int type, mjtNum width,
const mjtNum from[3], const mjtNum to[3]);
void mjv_defaultScene(mjvScene* scn);
void mjv_makeScene(const mjModel* m, mjvScene* scn, int maxgeom);
void mjv_freeScene(mjvScene* scn);
include/mujoco/mujoco.h
+7
View File
@@ -603,10 +603,17 @@ MJAPI void mjv_initGeom(mjvGeom* geom, int type, const mjtNum size[3],
// Set (type, size, pos, mat) for connector-type geom between given points.
// Assume that mjv_initGeom was already called to set all other properties.
// Width of mjGEOM_LINE is denominated in pixels.
// Deprecated: use mjv_connector.
MJAPI void mjv_makeConnector(mjvGeom* geom, int type, mjtNum width,
mjtNum a0, mjtNum a1, mjtNum a2,
mjtNum b0, mjtNum b1, mjtNum b2);
// Set (type, size, pos, mat) for connector-type geom between given points.
// Assume that mjv_initGeom was already called to set all other properties.
// Width of mjGEOM_LINE is denominated in pixels.
MJAPI void mjv_connector(mjvGeom* geom, int type, mjtNum width,
const mjtNum from[3], const mjtNum to[3]);
// Set default abstract scene.
MJAPI void mjv_defaultScene(mjvScene* scn);
introspect/functions.py
+36
View File
@@ -3871,6 +3871,42 @@ FUNCTIONS: Mapping[str, FunctionDecl] = dict([
type=ValueType(name='mjtNum'),
),
),
doc='Set (type, size, pos, mat) for connector-type geom between given points. Assume that mjv_initGeom was already called to set all other properties. Width of mjGEOM_LINE is denominated in pixels. Deprecated: use mjv_connector.', # pylint: disable=line-too-long
)),
('mjv_connector',
FunctionDecl(
name='mjv_connector',
return_type=ValueType(name='void'),
parameters=(
FunctionParameterDecl(
name='geom',
type=PointerType(
inner_type=ValueType(name='mjvGeom'),
),
),
FunctionParameterDecl(
name='type',
type=ValueType(name='int'),
),
FunctionParameterDecl(
name='width',
type=ValueType(name='mjtNum'),
),
FunctionParameterDecl(
name='from',
type=ArrayType(
inner_type=ValueType(name='mjtNum', is_const=True),
extents=(3,),
),
),
FunctionParameterDecl(
name='to',
type=ArrayType(
inner_type=ValueType(name='mjtNum', is_const=True),
extents=(3,),
),
),
),
doc='Set (type, size, pos, mat) for connector-type geom between given points. Assume that mjv_initGeom was already called to set all other properties. Width of mjGEOM_LINE is denominated in pixels.', # pylint: disable=line-too-long
)),
('mjv_defaultScene',
python/mujoco/functions.cc
+1
View File
@@ -602,6 +602,7 @@ PYBIND11_MODULE(_functions, pymodule) {
Def<traits::mjv_defaultFigure>(pymodule);
Def<traits::mjv_initGeom>(pymodule);
Def<traits::mjv_makeConnector>(pymodule);
Def<traits::mjv_connector>(pymodule);
// Skipped: mjv_defaultScene (have MjvScene.__init__, memory managed by
// MjvScene).
// Skipped: mjv_makeScene (have MjvScene.__init__)
src/engine/engine_vis_visualize.c
+66 -105
View File
@@ -159,13 +159,10 @@ static void addContactGeom(const mjModel* m, mjData* d, const mjtByte* flags,
mju_mulMatVec(vec, mat, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, framewidth,
con->pos[0],
con->pos[1],
con->pos[2],
con->pos[0] + vec[0],
con->pos[1] + vec[1],
con->pos[2] + vec[2]);
mjtNum* from = con->pos;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, framewidth, from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -231,15 +228,12 @@ static void addContactGeom(const mjModel* m, mjData* d, const mjtByte* flags,
// one-directional arrow for friction and world, symmetric otherwise
START
mjv_makeConnector(thisgeom,
mjtNum* from = con->pos;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom,
body1 > 0 && body2 > 0 && !split ? mjGEOM_ARROW2 : mjGEOM_ARROW,
m->vis.scale.forcewidth * scl,
con->pos[0],
con->pos[1],
con->pos[2],
con->pos[0] + vec[0],
con->pos[1] + vec[1],
con->pos[2] + vec[2]);
m->vis.scale.forcewidth * scl,from, to);
f2f(thisgeom->rgba, j == 2 ? m->vis.rgba.contactfriction : m->vis.rgba.contactforce, 4);
if (vopt->label == mjLABEL_CONTACTFORCE && j == (split ? 1 : 0)) {
mjSNPRINTF(thisgeom->label, "%-.3g", mju_norm3(frc));
@@ -334,7 +328,12 @@ void mjv_makeConnector(mjvGeom* geom, int type, mjtNum width,
mju_n2f(geom->mat, mat, 9);
}
// set (type, size, pos, mat) connector-type geom between given points
// assume that mjv_initGeom was already called to set all other properties
void mjv_connector(mjvGeom* geom, int type, mjtNum width,
const mjtNum from[3], const mjtNum to[3]) {
mjv_makeConnector(geom, type, width, from[0], from[1], from[2], to[0], to[1], to[2]);
}
// initialize given fields when not NULL, set the rest to their default values
void mjv_initGeom(mjvGeom* geom, int type, const mjtNum* size,
@@ -497,9 +496,7 @@ static void drawBoundingBox(mjvGeom* thisgeom, mjData* d, mjvScene* scn,
mju_addScl3(to, from, dist[k], 2);
if (!(v&split[k])) {
START
mjv_makeConnector(thisgeom, mjGEOM_LINE, 2,
from[0], from[1], from[2],
to[0], to[1], to[2]);
mjv_connector(thisgeom, mjGEOM_LINE, 2, from, to);
f2f(thisgeom->rgba, rgba, 4);
FINISH
}
@@ -712,9 +709,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// construct geom
sz[0] = scl * m->vis.scale.constraint;
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, sz[0],
selpos[0], selpos[1], selpos[2],
pert->refselpos[0], pert->refselpos[1], pert->refselpos[2]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, sz[0], selpos, pert->refselpos);
// prepare color
float rgba[4];
@@ -791,8 +786,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_mulMatVec(vec, xmat, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, sz[0], xpos[0], xpos[1], xpos[2],
xpos[0] + vec[0], xpos[1] + vec[1], xpos[2] + vec[2]);
mjtNum* from = xpos;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, sz[0], from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -870,6 +867,8 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// set type, size, pos, mat depending on joint type
int j = m->jnt_bodyid[i];
mjtNum* from;
mjtNum to[3];
switch (m->jnt_type[i]) {
case mjJNT_FREE:
thisgeom->type = mjGEOM_BOX;
@@ -887,14 +886,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
case mjJNT_SLIDE:
case mjJNT_HINGE:
mjv_makeConnector(thisgeom,
m->jnt_type[i] == mjJNT_SLIDE ? mjGEOM_ARROW : mjGEOM_ARROW1, sz[0],
d->xanchor[3*i+0],
d->xanchor[3*i+1],
d->xanchor[3*i+2],
d->xanchor[3*i+0] + sz[1]*d->xaxis[3*i+0],
d->xanchor[3*i+1] + sz[1]*d->xaxis[3*i+1],
d->xanchor[3*i+2] + sz[1]*d->xaxis[3*i+2]);
from = d->xanchor+3*i;
mju_addScl3(to, from, d->xaxis+3*i, sz[1]);
mjv_connector(thisgeom, m->jnt_type[i] == mjJNT_SLIDE ? mjGEOM_ARROW : mjGEOM_ARROW1,
sz[0], from, to);
break;
default:
@@ -1004,14 +999,11 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
sz[0] = m->vis.scale.actuatorwidth * scl;
// make geom
mjv_makeConnector(thisgeom,
m->jnt_type[j] == mjJNT_SLIDE ? mjGEOM_ARROW : mjGEOM_ARROW1, sz[0],
d->xanchor[3*j+0],
d->xanchor[3*j+1],
d->xanchor[3*j+2],
d->xanchor[3*j+0] + sz[1]*d->xaxis[3*j+0],
d->xanchor[3*j+1] + sz[1]*d->xaxis[3*j+1],
d->xanchor[3*j+2] + sz[1]*d->xaxis[3*j+2]);
mjtNum* from = d->xanchor + 3*j;
mjtNum to[3];
mju_addScl3(to, from, d->xaxis+3*j, sz[1]);
mjv_connector(thisgeom, m->jnt_type[j] == mjJNT_SLIDE ? mjGEOM_ARROW : mjGEOM_ARROW1,
sz[0], from, to);
}
// ball or free joint
@@ -1082,9 +1074,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
sz[0] *= m->vis.map.actuatortendon;
// construct geom
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, sz[0],
d->wrap_xpos[3*k], d->wrap_xpos[3*k+1], d->wrap_xpos[3*k+2],
d->wrap_xpos[3*k+3], d->wrap_xpos[3*k+4], d->wrap_xpos[3*k+5]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, sz[0], d->wrap_xpos+3*k, d->wrap_xpos+3*k+3);
// set material if given
setMaterial(m, thisgeom, m->tendon_matid[j], m->tendon_rgba+4*j, vopt->flags);
@@ -1240,13 +1230,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_mulMatVec(vec, d->geom_xmat+9*i, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, sz[0],
d->geom_xpos[3*i+0],
d->geom_xpos[3*i+1],
d->geom_xpos[3*i+2],
d->geom_xpos[3*i+0] + vec[0],
d->geom_xpos[3*i+1] + vec[1],
d->geom_xpos[3*i+2] + vec[2]);
mjtNum* from = d->geom_xpos+3*i;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, sz[0], from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -1318,13 +1305,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_mulMatVec(vec, d->site_xmat+9*i, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, sz[0],
d->site_xpos[3*i+0],
d->site_xpos[3*i+1],
d->site_xpos[3*i+2],
d->site_xpos[3*i+0] + vec[0],
d->site_xpos[3*i+1] + vec[1],
d->site_xpos[3*i+2] + vec[2]);
mjtNum* from = d->site_xpos+3*i;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, sz[0], from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -1401,13 +1385,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_mulMatVec(vec, d->cam_xmat+9*i, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, sz[0],
d->cam_xpos[3*i+0],
d->cam_xpos[3*i+1],
d->cam_xpos[3*i+2],
d->cam_xpos[3*i+0] + vec[0],
d->cam_xpos[3*i+1] + vec[1],
d->cam_xpos[3*i+2] + vec[2]);
mjtNum* from = d->cam_xpos+3*i;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, sz[0], from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -1470,13 +1451,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_mulMatVec(vec, mat, axis, 3, 3);
// create a cylinder
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, sz[0],
d->light_xpos[3*i+0],
d->light_xpos[3*i+1],
d->light_xpos[3*i+2],
d->light_xpos[3*i+0] + vec[0],
d->light_xpos[3*i+1] + vec[1],
d->light_xpos[3*i+2] + vec[2]);
mjtNum* from = d->light_xpos+3*i;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_CYLINDER, sz[0], from, to);
// set color: R, G or B depending on axis
for (int k=0; k < 3; k++) {
@@ -1530,9 +1508,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
}
// construct geom
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, sz[0],
d->wrap_xpos[3*j], d->wrap_xpos[3*j+1], d->wrap_xpos[3*j+2],
d->wrap_xpos[3*j+3], d->wrap_xpos[3*j+4], d->wrap_xpos[3*j+5]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, sz[0], d->wrap_xpos+3*j, d->wrap_xpos+3*j+3);
// set material if given
setMaterial(m, thisgeom, m->tendon_matid[i], m->tendon_rgba+4*i, vopt->flags);
@@ -1572,9 +1548,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
sz[0] = m->tendon_width[i];
// construct geom
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, sz[0],
catenary[3*j], catenary[3*j+1], catenary[3*j+2],
catenary[3*j+3], catenary[3*j+4], catenary[3*j+5]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, sz[0], catenary+3*j, catenary+3*j+3);
// set material if given
setMaterial(m, thisgeom, m->tendon_matid[i], m->tendon_rgba+4*i, vopt->flags);
@@ -1622,9 +1596,8 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// render slider
START
mjv_makeConnector(thisgeom, mjGEOM_CYLINDER, scl * m->vis.scale.slidercrank,
d->site_xpos[3*k], d->site_xpos[3*k+1], d->site_xpos[3*k+2],
end[0], end[1], end[2]);
mjv_connector(thisgeom, mjGEOM_CYLINDER, scl * m->vis.scale.slidercrank,
d->site_xpos+3*k, end);
f2f(thisgeom->rgba, m->vis.rgba.slidercrank, 4);
if (vopt->label == mjLABEL_ACTUATOR) {
makeLabel(m, mjOBJ_ACTUATOR, i, thisgeom->label);
@@ -1633,9 +1606,8 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// render crank
START
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.slidercrank/2.0,
end[0], end[1], end[2],
d->site_xpos[3*j+0], d->site_xpos[3*j+1], d->site_xpos[3*j+2]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.slidercrank/2.0,
end, d->site_xpos+3*j);
if (broken) {
f2f(thisgeom->rgba, m->vis.rgba.crankbroken, 4);
} else {
@@ -1681,9 +1653,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
nxt = d->xanchor+3*j;
// construct geom
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.connect,
cur[0], cur[1], cur[2],
nxt[0], nxt[1], nxt[2]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.connect, cur, nxt);
f2f(thisgeom->rgba, m->vis.rgba.connect, 4);
FINISH
@@ -1694,9 +1664,7 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// connect first joint (or com) to parent com
START
nxt = d->xipos+3*m->body_parentid[i];
mjv_makeConnector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.connect,
cur[0], cur[1], cur[2],
nxt[0], nxt[1], nxt[2]);
mjv_connector(thisgeom, mjGEOM_CAPSULE, scl * m->vis.scale.connect, cur, nxt);
f2f(thisgeom->rgba, m->vis.rgba.connect, 4);
FINISH
}
@@ -1719,14 +1687,11 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
// make ray
START
mjv_makeConnector(thisgeom, mjGEOM_LINE, 3,
d->site_xpos[3*sid],
d->site_xpos[3*sid+1],
d->site_xpos[3*sid+2],
d->site_xpos[3*sid] + d->site_xmat[9*sid+2]*dst,
d->site_xpos[3*sid+1] + d->site_xmat[9*sid+5]*dst,
d->site_xpos[3*sid+2] + d->site_xmat[9*sid+8]*dst
);
mjtNum* from = d->site_xpos+3*sid;
mjtNum to[3] = {from[0] + d->site_xmat[9*sid+2]*dst,
from[1] + d->site_xmat[9*sid+5]*dst,
from[2] + d->site_xmat[9*sid+8]*dst};
mjv_connector(thisgeom, mjGEOM_LINE, 3, from, to);
f2f(thisgeom->rgba, m->vis.rgba.rangefinder, 4);
FINISH
}
@@ -1748,14 +1713,10 @@ void mjv_addGeoms(const mjModel* m, mjData* d, const mjvOption* vopt,
mju_scl3(vec, xfrc, m->vis.map.force/m->stat.meanmass);
START
mjv_makeConnector(thisgeom, mjGEOM_ARROW,
m->vis.scale.forcewidth * scl,
xpos[0],
xpos[1],
xpos[2],
xpos[0] + vec[0],
xpos[1] + vec[1],
xpos[2] + vec[2]);
mjtNum* from = xpos;
mjtNum to[3];
mju_add3(to, from, vec);
mjv_connector(thisgeom, mjGEOM_ARROW, m->vis.scale.forcewidth * scl, from, to);
f2f(thisgeom->rgba, m->vis.rgba.force, 4);
FINISH
}
src/engine/engine_vis_visualize.h
+5
View File
@@ -30,6 +30,11 @@ MJAPI void mjv_makeConnector(mjvGeom* geom, int type, mjtNum width,
mjtNum a0, mjtNum a1, mjtNum a2,
mjtNum b0, mjtNum b1, mjtNum b2);
// set (type, size, pos, mat) connector-type geom between given points
// assume that mjv_initGeom was already called to set all other properties
MJAPI void mjv_connector(mjvGeom* geom, int type, mjtNum width,
const mjtNum from[3], const mjtNum to[3]);
// initialize given fields when not NULL, set the rest to their default values
MJAPI void mjv_initGeom(mjvGeom* geom, int type, const mjtNum* size,
const mjtNum* pos, const mjtNum* mat, const float* rgba);
unity/Runtime/Bindings/MjBindings.cs
+3
View File
@@ -3385,6 +3385,9 @@ public static unsafe extern void mjv_initGeom(mjvGeom_* geom, int type, double*
[DllImport("mujoco", CallingConvention = CallingConvention.Cdecl)]
public static unsafe extern void mjv_makeConnector(mjvGeom_* geom, int type, double width, double a0, double a1, double a2, double b0, double b1, double b2);
[DllImport("mujoco", CallingConvention = CallingConvention.Cdecl)]
public static unsafe extern void mjv_connector(mjvGeom_* geom, int type, double width, double* from, double* to);
[DllImport("mujoco", CallingConvention = CallingConvention.Cdecl)]
public static unsafe extern void mjv_defaultScene(mjvScene_* scn);