Skip to content

Commit fbea72d

Browse files
havesscopybara-github
authored andcommitted
Remove MjcActuatorAPI in favor of typed MjcTransmission.
PiperOrigin-RevId: 781498554 Change-Id: Ib6ce5038645f6ca08638a9d316b0347dc121bc62
1 parent 2d69610 commit fbea72d

File tree

12 files changed

+433
-317
lines changed

12 files changed

+433
-317
lines changed

include/mujoco/experimental/usd/mjcPhysics/tokens.h

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ struct MjcPhysicsTokensType {
5555
MJCPHYSICS_API MjcPhysicsTokensType();
5656
/// \brief "affine"
5757
///
58-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcBiasTypeAttr(), Possible
59-
/// value for MjcPhysicsActuatorAPI::GetMjcGainTypeAttr()
58+
/// Possible value for MjcPhysicsTransmission::GetMjcBiasTypeAttr(), Possible
59+
/// value for MjcPhysicsTransmission::GetMjcGainTypeAttr()
6060
const TfToken affine;
6161
/// \brief "auto"
6262
///
6363
/// Fallback value for MjcPhysicsSceneAPI::GetJacobianAttr(), Fallback value
64-
/// for MjcPhysicsActuatorAPI::GetMjcActLimitedAttr(), Fallback value for
65-
/// MjcPhysicsActuatorAPI::GetMjcCtrlLimitedAttr(), Fallback value for
66-
/// MjcPhysicsActuatorAPI::GetMjcForceLimitedAttr(), Fallback value for
64+
/// for MjcPhysicsTransmission::GetMjcActLimitedAttr(), Fallback value for
65+
/// MjcPhysicsTransmission::GetMjcCtrlLimitedAttr(), Fallback value for
66+
/// MjcPhysicsTransmission::GetMjcForceLimitedAttr(), Fallback value for
6767
/// MjcPhysicsJointAPI::GetMjcActuatorfrclimitedAttr(), This token represents
6868
/// the auto constraint Jacobian and matrices computed from it.
6969
const TfToken auto_;
@@ -97,22 +97,22 @@ struct MjcPhysicsTokensType {
9797
const TfToken exact;
9898
/// \brief "false"
9999
///
100-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcActLimitedAttr(), Possible
101-
/// value for MjcPhysicsActuatorAPI::GetMjcCtrlLimitedAttr(), Possible value
102-
/// for MjcPhysicsActuatorAPI::GetMjcForceLimitedAttr(), Possible value for
103-
/// MjcPhysicsJointAPI::GetMjcActuatorfrclimitedAttr()
100+
/// Possible value for MjcPhysicsTransmission::GetMjcActLimitedAttr(),
101+
/// Possible value for MjcPhysicsTransmission::GetMjcCtrlLimitedAttr(),
102+
/// Possible value for MjcPhysicsTransmission::GetMjcForceLimitedAttr(),
103+
/// Possible value for MjcPhysicsJointAPI::GetMjcActuatorfrclimitedAttr()
104104
const TfToken false_;
105105
/// \brief "filter"
106106
///
107-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr()
107+
/// Possible value for MjcPhysicsTransmission::GetMjcDynTypeAttr()
108108
const TfToken filter;
109109
/// \brief "filterexact"
110110
///
111-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr()
111+
/// Possible value for MjcPhysicsTransmission::GetMjcDynTypeAttr()
112112
const TfToken filterexact;
113113
/// \brief "fixed"
114114
///
115-
/// Fallback value for MjcPhysicsActuatorAPI::GetMjcGainTypeAttr()
115+
/// Fallback value for MjcPhysicsTransmission::GetMjcGainTypeAttr()
116116
const TfToken fixed;
117117
/// \brief "implicit"
118118
///
@@ -126,7 +126,7 @@ struct MjcPhysicsTokensType {
126126
const TfToken implicitfast;
127127
/// \brief "integrator"
128128
///
129-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr()
129+
/// Possible value for MjcPhysicsTransmission::GetMjcDynTypeAttr()
130130
const TfToken integrator;
131131
/// \brief "legacy"
132132
///
@@ -138,23 +138,23 @@ struct MjcPhysicsTokensType {
138138
const TfToken mjcAct;
139139
/// \brief "mjc:actDim"
140140
///
141-
/// MjcPhysicsActuatorAPI
141+
/// MjcPhysicsTransmission
142142
const TfToken mjcActDim;
143143
/// \brief "mjc:actEarly"
144144
///
145-
/// MjcPhysicsActuatorAPI
145+
/// MjcPhysicsTransmission
146146
const TfToken mjcActEarly;
147147
/// \brief "mjc:actLimited"
148148
///
149-
/// MjcPhysicsActuatorAPI
149+
/// MjcPhysicsTransmission
150150
const TfToken mjcActLimited;
151151
/// \brief "mjc:actRange:max"
152152
///
153-
/// MjcPhysicsActuatorAPI
153+
/// MjcPhysicsTransmission
154154
const TfToken mjcActRangeMax;
155155
/// \brief "mjc:actRange:min"
156156
///
157-
/// MjcPhysicsActuatorAPI
157+
/// MjcPhysicsTransmission
158158
const TfToken mjcActRangeMin;
159159
/// \brief "mjc:actuatorfrclimited"
160160
///
@@ -178,43 +178,43 @@ struct MjcPhysicsTokensType {
178178
const TfToken mjcArmature;
179179
/// \brief "mjc:biasPrm"
180180
///
181-
/// MjcPhysicsActuatorAPI
181+
/// MjcPhysicsTransmission
182182
const TfToken mjcBiasPrm;
183183
/// \brief "mjc:biasType"
184184
///
185-
/// MjcPhysicsActuatorAPI
185+
/// MjcPhysicsTransmission
186186
const TfToken mjcBiasType;
187187
/// \brief "mjc:crankLength"
188188
///
189-
/// MjcPhysicsActuatorAPI
189+
/// MjcPhysicsTransmission
190190
const TfToken mjcCrankLength;
191191
/// \brief "mjc:ctrl"
192192
///
193193
/// MjcPhysicsKeyframe
194194
const TfToken mjcCtrl;
195195
/// \brief "mjc:ctrlLimited"
196196
///
197-
/// MjcPhysicsActuatorAPI
197+
/// MjcPhysicsTransmission
198198
const TfToken mjcCtrlLimited;
199199
/// \brief "mjc:ctrlRange:max"
200200
///
201-
/// MjcPhysicsActuatorAPI
201+
/// MjcPhysicsTransmission
202202
const TfToken mjcCtrlRangeMax;
203203
/// \brief "mjc:ctrlRange:min"
204204
///
205-
/// MjcPhysicsActuatorAPI
205+
/// MjcPhysicsTransmission
206206
const TfToken mjcCtrlRangeMin;
207207
/// \brief "mjc:damping"
208208
///
209209
/// MjcPhysicsJointAPI
210210
const TfToken mjcDamping;
211211
/// \brief "mjc:dynPrm"
212212
///
213-
/// MjcPhysicsActuatorAPI
213+
/// MjcPhysicsTransmission
214214
const TfToken mjcDynPrm;
215215
/// \brief "mjc:dynType"
216216
///
217-
/// MjcPhysicsActuatorAPI
217+
/// MjcPhysicsTransmission
218218
const TfToken mjcDynType;
219219
/// \brief "mjc:flag:actuation"
220220
///
@@ -310,47 +310,51 @@ struct MjcPhysicsTokensType {
310310
const TfToken mjcFlagWarmstart;
311311
/// \brief "mjc:forceLimited"
312312
///
313-
/// MjcPhysicsActuatorAPI
313+
/// MjcPhysicsTransmission
314314
const TfToken mjcForceLimited;
315315
/// \brief "mjc:forceRange:max"
316316
///
317-
/// MjcPhysicsActuatorAPI
317+
/// MjcPhysicsTransmission
318318
const TfToken mjcForceRangeMax;
319319
/// \brief "mjc:forceRange:min"
320320
///
321-
/// MjcPhysicsActuatorAPI
321+
/// MjcPhysicsTransmission
322322
const TfToken mjcForceRangeMin;
323323
/// \brief "mjc:frictionloss"
324324
///
325325
/// MjcPhysicsJointAPI
326326
const TfToken mjcFrictionloss;
327327
/// \brief "mjc:gainPrm"
328328
///
329-
/// MjcPhysicsActuatorAPI
329+
/// MjcPhysicsTransmission
330330
const TfToken mjcGainPrm;
331331
/// \brief "mjc:gainType"
332332
///
333-
/// MjcPhysicsActuatorAPI
333+
/// MjcPhysicsTransmission
334334
const TfToken mjcGainType;
335335
/// \brief "mjc:gear"
336336
///
337-
/// MjcPhysicsActuatorAPI
337+
/// MjcPhysicsTransmission
338338
const TfToken mjcGear;
339+
/// \brief "mjc:group"
340+
///
341+
/// MjcPhysicsTransmission
342+
const TfToken mjcGroup;
339343
/// \brief "mjc:inertia"
340344
///
341345
/// MjcPhysicsMeshCollisionAPI
342346
const TfToken mjcInertia;
343347
/// \brief "mjc:jointInParent"
344348
///
345-
/// MjcPhysicsActuatorAPI
349+
/// MjcPhysicsTransmission
346350
const TfToken mjcJointInParent;
347351
/// \brief "mjc:lengthRange:max"
348352
///
349-
/// MjcPhysicsActuatorAPI
353+
/// MjcPhysicsTransmission
350354
const TfToken mjcLengthRangeMax;
351355
/// \brief "mjc:lengthRange:min"
352356
///
353-
/// MjcPhysicsActuatorAPI
357+
/// MjcPhysicsTransmission
354358
const TfToken mjcLengthRangeMin;
355359
/// \brief "mjc:margin"
356360
///
@@ -486,15 +490,15 @@ struct MjcPhysicsTokensType {
486490
const TfToken mjcRef;
487491
/// \brief "mjc:refSite"
488492
///
489-
/// MjcPhysicsActuatorAPI
493+
/// MjcPhysicsTransmission
490494
const TfToken mjcRefSite;
491495
/// \brief "mjc:shellinertia"
492496
///
493497
/// MjcPhysicsCollisionAPI
494498
const TfToken mjcShellinertia;
495499
/// \brief "mjc:sliderSite"
496500
///
497-
/// MjcPhysicsActuatorAPI
501+
/// MjcPhysicsTransmission
498502
const TfToken mjcSliderSite;
499503
/// \brief "mjc:solimpfriction"
500504
///
@@ -524,11 +528,15 @@ struct MjcPhysicsTokensType {
524528
///
525529
/// MjcPhysicsJointAPI
526530
const TfToken mjcStiffness;
531+
/// \brief "mjc:target"
532+
///
533+
/// MjcPhysicsTransmission
534+
const TfToken mjcTarget;
527535
/// \brief "muscle"
528536
///
529-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcBiasTypeAttr(), Possible
530-
/// value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr(), Possible value for
531-
/// MjcPhysicsActuatorAPI::GetMjcGainTypeAttr()
537+
/// Possible value for MjcPhysicsTransmission::GetMjcBiasTypeAttr(), Possible
538+
/// value for MjcPhysicsTransmission::GetMjcDynTypeAttr(), Possible value for
539+
/// MjcPhysicsTransmission::GetMjcGainTypeAttr()
532540
const TfToken muscle;
533541
/// \brief "newton"
534542
///
@@ -537,8 +545,8 @@ struct MjcPhysicsTokensType {
537545
const TfToken newton;
538546
/// \brief "none"
539547
///
540-
/// Fallback value for MjcPhysicsActuatorAPI::GetMjcBiasTypeAttr(), Fallback
541-
/// value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr()
548+
/// Fallback value for MjcPhysicsTransmission::GetMjcBiasTypeAttr(), Fallback
549+
/// value for MjcPhysicsTransmission::GetMjcDynTypeAttr()
542550
const TfToken none;
543551
/// \brief "pgs"
544552
///
@@ -566,21 +574,17 @@ struct MjcPhysicsTokensType {
566574
const TfToken sparse;
567575
/// \brief "true"
568576
///
569-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcActLimitedAttr(), Possible
570-
/// value for MjcPhysicsActuatorAPI::GetMjcCtrlLimitedAttr(), Possible value
571-
/// for MjcPhysicsActuatorAPI::GetMjcForceLimitedAttr(), Possible value for
572-
/// MjcPhysicsJointAPI::GetMjcActuatorfrclimitedAttr()
577+
/// Possible value for MjcPhysicsTransmission::GetMjcActLimitedAttr(),
578+
/// Possible value for MjcPhysicsTransmission::GetMjcCtrlLimitedAttr(),
579+
/// Possible value for MjcPhysicsTransmission::GetMjcForceLimitedAttr(),
580+
/// Possible value for MjcPhysicsJointAPI::GetMjcActuatorfrclimitedAttr()
573581
const TfToken true_;
574582
/// \brief "user"
575583
///
576-
/// Possible value for MjcPhysicsActuatorAPI::GetMjcBiasTypeAttr(), Possible
577-
/// value for MjcPhysicsActuatorAPI::GetMjcDynTypeAttr(), Possible value for
578-
/// MjcPhysicsActuatorAPI::GetMjcGainTypeAttr()
584+
/// Possible value for MjcPhysicsTransmission::GetMjcBiasTypeAttr(), Possible
585+
/// value for MjcPhysicsTransmission::GetMjcDynTypeAttr(), Possible value for
586+
/// MjcPhysicsTransmission::GetMjcGainTypeAttr()
579587
const TfToken user;
580-
/// \brief "MjcActuatorAPI"
581-
///
582-
/// Schema identifier and family for MjcPhysicsActuatorAPI
583-
const TfToken MjcActuatorAPI;
584588
/// \brief "MjcCollisionAPI"
585589
///
586590
/// Schema identifier and family for MjcPhysicsCollisionAPI
@@ -605,6 +609,10 @@ struct MjcPhysicsTokensType {
605609
///
606610
/// Schema identifier and family for MjcPhysicsSiteAPI
607611
const TfToken MjcSiteAPI;
612+
/// \brief "MjcTransmission"
613+
///
614+
/// Schema identifier and family for MjcPhysicsTransmission
615+
const TfToken MjcTransmission;
608616
/// A vector of all of the tokens listed above.
609617
const std::vector<TfToken> allTokens;
610618
};

0 commit comments

Comments
 (0)