Skip to content

Commit c0a7ea1

Browse files
quaglacopybara-github
authored andcommitted
Added the element type mjOBJ_SPEC for mjSpec.
PiperOrigin-RevId: 742678572 Change-Id: I95a382ac58b5bc88c2aa5c07210549a1d5e2f538
1 parent 9ecec6f commit c0a7ea1

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed

doc/includes/references.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,8 @@ typedef enum mjtObj_ { // type of MujoCo object
607607

608608
// meta elements, do not appear in mjModel
609609
mjOBJ_FRAME = 100, // frame
610-
mjOBJ_DEFAULT // default
610+
mjOBJ_DEFAULT, // default
611+
mjOBJ_MODEL // entire model
611612

612613
} mjtObj;
613614
typedef enum mjtConstraint_ { // type of constraint

include/mujoco/mjmodel.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ typedef enum mjtObj_ { // type of MujoCo object
269269

270270
// meta elements, do not appear in mjModel
271271
mjOBJ_FRAME = 100, // frame
272-
mjOBJ_DEFAULT // default
272+
mjOBJ_DEFAULT, // default
273+
mjOBJ_MODEL // entire model
273274

274275
} mjtObj;
275276

python/mujoco/introspect/enums.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@
288288
('mjNOBJECT', 26),
289289
('mjOBJ_FRAME', 100),
290290
('mjOBJ_DEFAULT', 101),
291+
('mjOBJ_MODEL', 102),
291292
]),
292293
)),
293294
('mjtConstraint',

src/engine/engine_io.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,6 +2143,7 @@ static int numObjects(const mjModel* m, mjtObj objtype) {
21432143
case mjOBJ_DEFAULT:
21442144
case mjOBJ_FRAME:
21452145
case mjOBJ_UNKNOWN:
2146+
case mjOBJ_MODEL:
21462147
return -1;
21472148
case mjOBJ_BODY:
21482149
case mjOBJ_XBODY:

src/user/user_model.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void processlist(mjListKeyMap& ids, vector<T*>& list,
166166
// constructor
167167
mjCModel::mjCModel() {
168168
mjs_defaultSpec(&spec);
169-
elemtype = mjOBJ_UNKNOWN;
169+
elemtype = mjOBJ_MODEL;
170170
spec_comment_.clear();
171171
spec_modelfiledir_.clear();
172172
spec_meshdir_.clear();

unity/Runtime/Bindings/MjBindings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ public enum mjtObj : int{
320320
mjNOBJECT = 26,
321321
mjOBJ_FRAME = 100,
322322
mjOBJ_DEFAULT = 101,
323+
mjOBJ_MODEL = 102,
323324
}
324325
public enum mjtConstraint : int{
325326
mjCNSTR_EQUALITY = 0,

0 commit comments

Comments
 (0)