From 0a5da8db220336993dd1012ea887a14321c71e40 Mon Sep 17 00:00:00 2001 From: Sam Haves Date: Wed, 14 May 2025 09:09:01 -0700 Subject: [PATCH] Rename MjcSiteAPI to MjcPhysicsSiteAPI for consistency. PiperOrigin-RevId: 758708231 Change-Id: I75914ba52159996515547aa9e2e93690cadbfc66 --- src/experimental/usd/mjcPhysics/generatedSchema.usda | 2 +- src/experimental/usd/mjcPhysics/plugInfo.json | 2 +- src/experimental/usd/mjcPhysics/schema.usda | 2 +- src/experimental/usd/mjcPhysics/siteAPI.h | 4 ++-- src/experimental/usd/mjcPhysics/tokens.cpp | 4 ++-- src/experimental/usd/mjcPhysics/tokens.h | 4 ++-- src/experimental/usd/mjcPhysics/wrapTokens.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/experimental/usd/mjcPhysics/generatedSchema.usda b/src/experimental/usd/mjcPhysics/generatedSchema.usda index 62050c6c..7510f8e3 100644 --- a/src/experimental/usd/mjcPhysics/generatedSchema.usda +++ b/src/experimental/usd/mjcPhysics/generatedSchema.usda @@ -220,7 +220,7 @@ class "MjcPhysicsSceneAPI" ( ) } -class "MjcSiteAPI" ( +class "MjcPhysicsSiteAPI" ( doc = "API describing a Mujoco site." ) { diff --git a/src/experimental/usd/mjcPhysics/plugInfo.json b/src/experimental/usd/mjcPhysics/plugInfo.json index fcf19910..9206a5d0 100644 --- a/src/experimental/usd/mjcPhysics/plugInfo.json +++ b/src/experimental/usd/mjcPhysics/plugInfo.json @@ -18,7 +18,7 @@ }, "MjcPhysicsSiteAPI": { "alias": { - "UsdSchemaBase": "MjcSiteAPI" + "UsdSchemaBase": "MjcPhysicsSiteAPI" }, "autoGenerated": true, "bases": [ diff --git a/src/experimental/usd/mjcPhysics/schema.usda b/src/experimental/usd/mjcPhysics/schema.usda index d6e2727d..7bd5b6e6 100644 --- a/src/experimental/usd/mjcPhysics/schema.usda +++ b/src/experimental/usd/mjcPhysics/schema.usda @@ -510,7 +510,7 @@ class "MjcPhysicsSceneAPI" ) } -class "MjcSiteAPI" +class "MjcPhysicsSiteAPI" ( customData = { string className = "SiteAPI" diff --git a/src/experimental/usd/mjcPhysics/siteAPI.h b/src/experimental/usd/mjcPhysics/siteAPI.h index e1981297..74712557 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; // -------------------------------------------------------------------------- // -// MJCSITEAPI // +// MJCPHYSICSSITEAPI // // -------------------------------------------------------------------------- // /// \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 "MjcSiteAPI" to the + /// This information is stored by adding "MjcPhysicsSiteAPI" 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 b6bfd4b8..4f0da276 100644 --- a/src/experimental/usd/mjcPhysics/tokens.cpp +++ b/src/experimental/usd/mjcPhysics/tokens.cpp @@ -86,7 +86,7 @@ MjcPhysicsTokensType::MjcPhysicsTokensType() rk4("rk4", TfToken::Immortal), sparse("sparse", TfToken::Immortal), MjcPhysicsSceneAPI("MjcPhysicsSceneAPI", TfToken::Immortal), - MjcSiteAPI("MjcSiteAPI", TfToken::Immortal), + MjcPhysicsSiteAPI("MjcPhysicsSiteAPI", TfToken::Immortal), allTokens({auto_, cg, dense, @@ -149,7 +149,7 @@ MjcPhysicsTokensType::MjcPhysicsTokensType() rk4, sparse, MjcPhysicsSceneAPI, - MjcSiteAPI}) {} + MjcPhysicsSiteAPI}) {} TfStaticData MjcPhysicsTokens; diff --git a/src/experimental/usd/mjcPhysics/tokens.h b/src/experimental/usd/mjcPhysics/tokens.h index 8d6b5f92..92ffc587 100644 --- a/src/experimental/usd/mjcPhysics/tokens.h +++ b/src/experimental/usd/mjcPhysics/tokens.h @@ -313,10 +313,10 @@ struct MjcPhysicsTokensType { /// /// Schema identifer and family for MjcPhysicsSceneAPI const TfToken MjcPhysicsSceneAPI; - /// \brief "MjcSiteAPI" + /// \brief "MjcPhysicsSiteAPI" /// /// Schema identifer and family for MjcPhysicsSiteAPI - const TfToken MjcSiteAPI; + const TfToken MjcPhysicsSiteAPI; /// 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 bd9d4b75..5b0672cc 100644 --- a/src/experimental/usd/mjcPhysics/wrapTokens.cpp +++ b/src/experimental/usd/mjcPhysics/wrapTokens.cpp @@ -146,5 +146,5 @@ void wrapMjcPhysicsTokens() { _AddToken(cls, "rk4", MjcPhysicsTokens->rk4); _AddToken(cls, "sparse", MjcPhysicsTokens->sparse); _AddToken(cls, "MjcPhysicsSceneAPI", MjcPhysicsTokens->MjcPhysicsSceneAPI); - _AddToken(cls, "MjcSiteAPI", MjcPhysicsTokens->MjcSiteAPI); + _AddToken(cls, "MjcPhysicsSiteAPI", MjcPhysicsTokens->MjcPhysicsSiteAPI); }