Add mjNOBJECT value to mjtObj enum.
PiperOrigin-RevId: 590164716 Change-Id: I500741aa4fb97fe2c4f5d2086188bb2c9fdfd1a0
This commit is contained in:
committed by
Copybara-Service
parent
64c33cefcf
commit
28a9e6d9a2
@@ -570,7 +570,9 @@ typedef enum mjtObj_ { // type of MujoCo object
|
|||||||
mjOBJ_TEXT, // text
|
mjOBJ_TEXT, // text
|
||||||
mjOBJ_TUPLE, // tuple
|
mjOBJ_TUPLE, // tuple
|
||||||
mjOBJ_KEY, // keyframe
|
mjOBJ_KEY, // keyframe
|
||||||
mjOBJ_PLUGIN // plugin instance
|
mjOBJ_PLUGIN, // plugin instance
|
||||||
|
|
||||||
|
mjNOBJECT // number of object types
|
||||||
} mjtObj;
|
} mjtObj;
|
||||||
typedef enum mjtConstraint_ { // type of constraint
|
typedef enum mjtConstraint_ { // type of constraint
|
||||||
mjCNSTR_EQUALITY = 0, // equality constraint
|
mjCNSTR_EQUALITY = 0, // equality constraint
|
||||||
|
|||||||
@@ -246,7 +246,9 @@ typedef enum mjtObj_ { // type of MujoCo object
|
|||||||
mjOBJ_TEXT, // text
|
mjOBJ_TEXT, // text
|
||||||
mjOBJ_TUPLE, // tuple
|
mjOBJ_TUPLE, // tuple
|
||||||
mjOBJ_KEY, // keyframe
|
mjOBJ_KEY, // keyframe
|
||||||
mjOBJ_PLUGIN // plugin instance
|
mjOBJ_PLUGIN, // plugin instance
|
||||||
|
|
||||||
|
mjNOBJECT // number of object types
|
||||||
} mjtObj;
|
} mjtObj;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -265,6 +265,7 @@ ENUMS: Mapping[str, EnumDecl] = dict([
|
|||||||
('mjOBJ_TUPLE', 23),
|
('mjOBJ_TUPLE', 23),
|
||||||
('mjOBJ_KEY', 24),
|
('mjOBJ_KEY', 24),
|
||||||
('mjOBJ_PLUGIN', 25),
|
('mjOBJ_PLUGIN', 25),
|
||||||
|
('mjNOBJECT', 26),
|
||||||
]),
|
]),
|
||||||
)),
|
)),
|
||||||
('mjtConstraint',
|
('mjtConstraint',
|
||||||
|
|||||||
@@ -1858,6 +1858,8 @@ static int numObjects(const mjModel* m, mjtObj objtype) {
|
|||||||
return m->nkey;
|
return m->nkey;
|
||||||
case mjOBJ_PLUGIN:
|
case mjOBJ_PLUGIN:
|
||||||
return m->nplugin;
|
return m->nplugin;
|
||||||
|
case mjNOBJECT:
|
||||||
|
return -2;
|
||||||
}
|
}
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -301,6 +301,7 @@ public enum mjtObj : int{
|
|||||||
mjOBJ_TUPLE = 23,
|
mjOBJ_TUPLE = 23,
|
||||||
mjOBJ_KEY = 24,
|
mjOBJ_KEY = 24,
|
||||||
mjOBJ_PLUGIN = 25,
|
mjOBJ_PLUGIN = 25,
|
||||||
|
mjNOBJECT = 26,
|
||||||
}
|
}
|
||||||
public enum mjtConstraint : int{
|
public enum mjtConstraint : int{
|
||||||
mjCNSTR_EQUALITY = 0,
|
mjCNSTR_EQUALITY = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user