diff --git a/src/experimental/usd/mjcPhysics/generatedSchema.usda b/src/experimental/usd/mjcPhysics/generatedSchema.usda
index 7510f8e3..4cb4d177 100644
--- a/src/experimental/usd/mjcPhysics/generatedSchema.usda
+++ b/src/experimental/usd/mjcPhysics/generatedSchema.usda
@@ -3,7 +3,7 @@
"WARNING: THIS FILE IS GENERATED BY usdGenSchema. DO NOT EDIT."
)
-class "MjcPhysicsSceneAPI" (
+class "SceneAPI" (
doc = "API providing global simulation options for Mujoco."
)
{
@@ -220,7 +220,7 @@ class "MjcPhysicsSceneAPI" (
)
}
-class "MjcPhysicsSiteAPI" (
+class "SiteAPI" (
doc = "API describing a Mujoco site."
)
{
diff --git a/src/experimental/usd/mjcPhysics/plugInfo.json b/src/experimental/usd/mjcPhysics/plugInfo.json
index 9206a5d0..56e11dd5 100644
--- a/src/experimental/usd/mjcPhysics/plugInfo.json
+++ b/src/experimental/usd/mjcPhysics/plugInfo.json
@@ -8,7 +8,7 @@
"Types": {
"MjcPhysicsSceneAPI": {
"alias": {
- "UsdSchemaBase": "MjcPhysicsSceneAPI"
+ "UsdSchemaBase": "SceneAPI"
},
"autoGenerated": true,
"bases": [
@@ -18,7 +18,7 @@
},
"MjcPhysicsSiteAPI": {
"alias": {
- "UsdSchemaBase": "MjcPhysicsSiteAPI"
+ "UsdSchemaBase": "SiteAPI"
},
"autoGenerated": true,
"bases": [
diff --git a/src/experimental/usd/mjcPhysics/sceneAPI.h b/src/experimental/usd/mjcPhysics/sceneAPI.h
index 0fd0d56e..4b77202a 100644
--- a/src/experimental/usd/mjcPhysics/sceneAPI.h
+++ b/src/experimental/usd/mjcPhysics/sceneAPI.h
@@ -35,7 +35,7 @@ PXR_NAMESPACE_OPEN_SCOPE
class SdfAssetPath;
// -------------------------------------------------------------------------- //
-// MJCPHYSICSSCENEAPI //
+// SCENEAPI //
// -------------------------------------------------------------------------- //
/// \class MjcPhysicsSceneAPI
@@ -110,7 +110,7 @@ class MjcPhysicsSceneAPI : public UsdAPISchemaBase {
static bool CanApply(const UsdPrim &prim, std::string *whyNot = nullptr);
/// Applies this single-apply API schema to the given \p prim.
- /// This information is stored by adding "MjcPhysicsSceneAPI" to the
+ /// This information is stored by adding "SceneAPI" to the
/// token-valued, listOp metadata \em apiSchemas on the prim.
///
/// \return A valid MjcPhysicsSceneAPI object is returned upon success.
diff --git a/src/experimental/usd/mjcPhysics/schema.usda b/src/experimental/usd/mjcPhysics/schema.usda
index 7bd5b6e6..3d416fc2 100644
--- a/src/experimental/usd/mjcPhysics/schema.usda
+++ b/src/experimental/usd/mjcPhysics/schema.usda
@@ -92,11 +92,8 @@ over "GLOBAL" (
}
-class "MjcPhysicsSceneAPI"
+class "SceneAPI"
(
- customData = {
- string className = "SceneAPI"
- }
doc = """API providing global simulation options for Mujoco."""
inherits =
@@ -510,11 +507,8 @@ class "MjcPhysicsSceneAPI"
)
}
-class "MjcPhysicsSiteAPI"
+class "SiteAPI"
(
- customData = {
- string className = "SiteAPI"
- }
doc = """API describing a Mujoco site."""
inherits =
diff --git a/src/experimental/usd/mjcPhysics/siteAPI.h b/src/experimental/usd/mjcPhysics/siteAPI.h
index 74712557..537345ce 100644
--- a/src/experimental/usd/mjcPhysics/siteAPI.h
+++ b/src/experimental/usd/mjcPhysics/siteAPI.h
@@ -34,7 +34,7 @@ PXR_NAMESPACE_OPEN_SCOPE
class SdfAssetPath;
// -------------------------------------------------------------------------- //
-// MJCPHYSICSSITEAPI //
+// SITEAPI //
// -------------------------------------------------------------------------- //
/// \class MjcPhysicsSiteAPI
@@ -104,7 +104,7 @@ class MjcPhysicsSiteAPI : public UsdAPISchemaBase {
static bool CanApply(const UsdPrim &prim, std::string *whyNot = nullptr);
/// Applies this single-apply API schema to the given \p prim.
- /// This information is stored by adding "MjcPhysicsSiteAPI" to the
+ /// This information is stored by adding "SiteAPI" to the
/// token-valued, listOp metadata \em apiSchemas on the prim.
///
/// \return A valid MjcPhysicsSiteAPI object is returned upon success.
diff --git a/src/experimental/usd/mjcPhysics/tokens.cpp b/src/experimental/usd/mjcPhysics/tokens.cpp
index 4f0da276..7b1868f8 100644
--- a/src/experimental/usd/mjcPhysics/tokens.cpp
+++ b/src/experimental/usd/mjcPhysics/tokens.cpp
@@ -85,8 +85,8 @@ MjcPhysicsTokensType::MjcPhysicsTokensType()
pyramidal("pyramidal", TfToken::Immortal),
rk4("rk4", TfToken::Immortal),
sparse("sparse", TfToken::Immortal),
- MjcPhysicsSceneAPI("MjcPhysicsSceneAPI", TfToken::Immortal),
- MjcPhysicsSiteAPI("MjcPhysicsSiteAPI", TfToken::Immortal),
+ SceneAPI("SceneAPI", TfToken::Immortal),
+ SiteAPI("SiteAPI", TfToken::Immortal),
allTokens({auto_,
cg,
dense,
@@ -148,8 +148,8 @@ MjcPhysicsTokensType::MjcPhysicsTokensType()
pyramidal,
rk4,
sparse,
- MjcPhysicsSceneAPI,
- MjcPhysicsSiteAPI}) {}
+ SceneAPI,
+ SiteAPI}) {}
TfStaticData MjcPhysicsTokens;
diff --git a/src/experimental/usd/mjcPhysics/tokens.h b/src/experimental/usd/mjcPhysics/tokens.h
index 92ffc587..50239a66 100644
--- a/src/experimental/usd/mjcPhysics/tokens.h
+++ b/src/experimental/usd/mjcPhysics/tokens.h
@@ -309,14 +309,14 @@ struct MjcPhysicsTokensType {
/// Possible value for MjcPhysicsSceneAPI::GetJacobianAttr(), This token
/// represents the sparse constraint Jacobian and matrices computed from it.
const TfToken sparse;
- /// \brief "MjcPhysicsSceneAPI"
+ /// \brief "SceneAPI"
///
/// Schema identifer and family for MjcPhysicsSceneAPI
- const TfToken MjcPhysicsSceneAPI;
- /// \brief "MjcPhysicsSiteAPI"
+ const TfToken SceneAPI;
+ /// \brief "SiteAPI"
///
/// Schema identifer and family for MjcPhysicsSiteAPI
- const TfToken MjcPhysicsSiteAPI;
+ const TfToken SiteAPI;
/// A vector of all of the tokens listed above.
const std::vector allTokens;
};
diff --git a/src/experimental/usd/mjcPhysics/wrapTokens.cpp b/src/experimental/usd/mjcPhysics/wrapTokens.cpp
index 5b0672cc..3a5aa603 100644
--- a/src/experimental/usd/mjcPhysics/wrapTokens.cpp
+++ b/src/experimental/usd/mjcPhysics/wrapTokens.cpp
@@ -145,6 +145,6 @@ void wrapMjcPhysicsTokens() {
_AddToken(cls, "pyramidal", MjcPhysicsTokens->pyramidal);
_AddToken(cls, "rk4", MjcPhysicsTokens->rk4);
_AddToken(cls, "sparse", MjcPhysicsTokens->sparse);
- _AddToken(cls, "MjcPhysicsSceneAPI", MjcPhysicsTokens->MjcPhysicsSceneAPI);
- _AddToken(cls, "MjcPhysicsSiteAPI", MjcPhysicsTokens->MjcPhysicsSiteAPI);
+ _AddToken(cls, "SceneAPI", MjcPhysicsTokens->SceneAPI);
+ _AddToken(cls, "SiteAPI", MjcPhysicsTokens->SiteAPI);
}