From f0ae76b18dcd4cc93599ef287e72241ded38c98a Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 8 Jan 2024 15:57:40 +1300 Subject: [PATCH 01/16] Get working on arch linux. Should be more flexible in general but more testing needs to be done I think. --- CMakeLists.txt | 3 +-- bind/pcp.cpp | 5 ----- bind/sdf.cpp | 2 -- bind/usd.cpp | 8 ++++++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e2523e8..9328b608 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,7 @@ bbl_translate_binding( -D__TBB_show_deprecation_message_task_H ) -target_link_libraries(openusd-c PUBLIC usd usdGeom sdf sdr ndr pcp) - +target_link_libraries(openusd-c PUBLIC ${PXR_LIBRARIES}) target_compile_definitions(openusd-c PRIVATE NOMINMAX BOOST_ALL_NO_LIB __TBB_show_deprecation_message_task_H) diff --git a/bind/pcp.cpp b/bind/pcp.cpp index aa297a3f..2e443a06 100644 --- a/bind/pcp.cpp +++ b/bind/pcp.cpp @@ -164,13 +164,10 @@ BBL_MODULE(pcp) { .m(&PXR_NS::PcpChanges::DidMaybeFixAsset) .m(&PXR_NS::PcpChanges::DidMuteLayer) .m(&PXR_NS::PcpChanges::DidUnmuteLayer) - .m(&PXR_NS::PcpChanges::DidChangeLayers) - .m(&PXR_NS::PcpChanges::DidChangeLayerOffsets) .m(&PXR_NS::PcpChanges::DidChangeSignificantly) .m(&PXR_NS::PcpChanges::DidChangeSpecs) .m(&PXR_NS::PcpChanges::DidChangeSpecStack) .m(&PXR_NS::PcpChanges::DidChangeTargets) - .m(&PXR_NS::PcpChanges::DidChangeRelocates) .m(&PXR_NS::PcpChanges::DidChangePaths) .m(&PXR_NS::PcpChanges::DidDestroyCache) .m(&PXR_NS::PcpChanges::DidChangeAssetResolver) @@ -520,8 +517,6 @@ BBL_MODULE(pcp) { .m(&PXR_NS::PcpMapFunction::IsIdentity) .m(&PXR_NS::PcpMapFunction::IsIdentityPathMapping) .m(&PXR_NS::PcpMapFunction::HasRootIdentity) - .m(&PXR_NS::PcpMapFunction::MapSourceToTarget) - .m(&PXR_NS::PcpMapFunction::MapTargetToSource) .m(&PXR_NS::PcpMapFunction::Compose) .m(&PXR_NS::PcpMapFunction::ComposeOffset) .m(&PXR_NS::PcpMapFunction::GetInverse) diff --git a/bind/sdf.cpp b/bind/sdf.cpp index 8a296280..c4a89a04 100644 --- a/bind/sdf.cpp +++ b/bind/sdf.cpp @@ -959,7 +959,6 @@ BBL_MODULE(sdf) { // .m((PXR_NS::SdfPathExpression (PXR_NS::SdfPathExpression::*)(const PXR_NS::SdfPathExpression &)) // &PXR_NS::SdfPathExpression::ComposeOver, "ComposeOver_01") .m(&PXR_NS::SdfPathExpression::IsComplete) - .m(&PXR_NS::SdfPathExpression::GetDebugString) .m(&PXR_NS::SdfPathExpression::IsEmpty) .m(&PXR_NS::SdfPathExpression::operator bool, "op_bool") .m(&PXR_NS::SdfPathExpression::GetParseError) @@ -987,7 +986,6 @@ BBL_MODULE(sdf) { &PXR_NS::SdfPathExpression::PathPattern::SetPrefix, "SetPrefix_00") .m((void (PXR_NS::SdfPathExpression::PathPattern::*)(const PXR_NS::SdfPath &)) &PXR_NS::SdfPathExpression::PathPattern::SetPrefix, "SetPrefix_01") - .m(&PXR_NS::SdfPathExpression::PathPattern::GetDebugString) // .m((const std::vector & (PXR_NS::SdfPathExpression::PathPattern::*)() const) // &PXR_NS::SdfPathExpression::PathPattern::GetComponents, "GetComponents_00") // .m((std::vector (PXR_NS::SdfPathExpression::PathPattern::*)()) diff --git a/bind/usd.cpp b/bind/usd.cpp index 8a194e4e..0d7a483f 100644 --- a/bind/usd.cpp +++ b/bind/usd.cpp @@ -1091,7 +1091,9 @@ BBL_MODULE(usd) { bbl::Class("PrimRangeIterator") .opaque_ptr() .ctor(bbl::Class::Ctor<>(), "new") - .m(&PXR_NS::UsdPrimRange::iterator::operator++, "op_inc") + .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)()) + &PXR_NS::UsdPrimRange::iterator::operator++, "op_inc" + ) .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&)) &PXR_NS::UsdPrimRange::iterator::operator=, "op_assign" ) @@ -1107,7 +1109,9 @@ BBL_MODULE(usd) { bbl::Class("PrimSiblingIterator") .m(&PXR_NS::UsdPrimSiblingIterator::operator*, "deref") - .m(&PXR_NS::UsdPrimSiblingIterator::operator++, "op_inc") + .m((PXR_NS::UsdPrimSiblingIterator & (PXR_NS::UsdPrimSiblingIterator::*)()) + &PXR_NS::UsdPrimSiblingIterator::operator++, "op_inc" + ) ; bbl::fn(&bblext::PrimSiblingIterator_op_eq); From 6c3942dae110b8290d6e8c8e8382113877c99073 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Thu, 4 Jan 2024 23:44:29 +1300 Subject: [PATCH 02/16] Add a set_ar_resolver_factory function --- bind/ar.cpp | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 3ea2ab0e..233dd460 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -10,6 +10,109 @@ #include #include #include +#include + +namespace bblext { + void set_ar_resolver_factory( + const PXR_NS::TfType& type, + void* create_id, + void* create_identifier, + void* open_asset, + void* resolve, + void* resolve_for_new_asset, + void *open_asset_for_write + ) { + typedef std::string (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string&, const PXR_NS::ArResolvedPath&); + typedef std::string (*CREATE_IDENTIFIER_FN_PTR)(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath); + typedef std::shared_ptr (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath &resolvedPath); + typedef PXR_NS::ArResolvedPath (*RESOLVE_FN_PTR)(const std::string &assetPath); + typedef PXR_NS::ArResolvedPath (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string &assetPath); + typedef std::shared_ptr (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath &, PXR_NS::ArResolver::WriteMode); + + class CustomFunctionArResolver : public PXR_NS::ArResolver { + CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; + CREATE_IDENTIFIER_FN_PTR create_identifier; + OPEN_ASSET_FN_PTR open_asset; + RESOLVE_FN_PTR resolve; + RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; + + public: + CustomFunctionArResolver( + CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, + CREATE_IDENTIFIER_FN_PTR create_identifier_, + OPEN_ASSET_FN_PTR open_asset_, + RESOLVE_FN_PTR resolve_, + RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ + ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { + } + + std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { + return create_identifier_for_new_asset(assetPath, anchorAssetPath); + } + + std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { + return create_identifier(assetPath, anchorAssetPath); + } + + PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const { + return resolve(assetPath); + } + + PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const { + return resolve_for_new_asset(assetPath); + } + + std::shared_ptr _OpenAsset(const PXR_NS::ArResolvedPath &resolvedPath) const { + return open_asset(resolvedPath); + } + + std::shared_ptr _OpenAssetForWrite( + const PXR_NS::ArResolvedPath &resolvedPath, + PXR_NS::ArResolver::WriteMode writeMode + ) const { + return open_asset_for_write(resolvedPath, writeMode); + } + }; + + class CustomFunctionArResolverFactory: public PXR_NS::Ar_ResolverFactoryBase { + CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; + CREATE_IDENTIFIER_FN_PTR create_identifier; + OPEN_ASSET_FN_PTR open_asset; + RESOLVE_FN_PTR resolve; + RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; + + public: + CustomFunctionArResolverFactory( + CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, + CREATE_IDENTIFIER_FN_PTR create_identifier_, + OPEN_ASSET_FN_PTR open_asset_, + RESOLVE_FN_PTR resolve_, + RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ + ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} + + virtual PXR_NS::ArResolver* New() const { + return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write); + } + }; + + type.SetFactory( + std::unique_ptr( + new CustomFunctionArResolverFactory( + (CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR) create_id, + (CREATE_IDENTIFIER_FN_PTR) create_identifier, + (OPEN_ASSET_FN_PTR) open_asset, + (RESOLVE_FN_PTR) resolve, + (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, + (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write + ) + ) + ); + } +} BBL_MODULE(ar) { bbl::Class() @@ -112,7 +215,7 @@ BBL_MODULE(ar) { .smartptr_to() ; - + bbl::fn(&bblext::set_ar_resolver_factory); } From c0833b28a16e830264efaade37f2f994736a4234 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 5 Jan 2024 21:33:04 +1300 Subject: [PATCH 03/16] Get working! --- bind/ar.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 233dd460..171581b0 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -10,9 +10,21 @@ #include #include #include +#include #include +#include namespace bblext { + std::shared_ptr asset_from_string(std::string& string) { + char* buf = new char[string.size()]; + memcpy(buf, string.data(), string.size()); + + std::shared_ptr buffer; + buffer.reset(buf, std::default_delete()); + + return PXR_NS::ArInMemoryAsset::FromBuffer(buffer, string.size()); + } + void set_ar_resolver_factory( const PXR_NS::TfType& type, void* create_id, @@ -20,14 +32,14 @@ namespace bblext { void* open_asset, void* resolve, void* resolve_for_new_asset, - void *open_asset_for_write + void* open_asset_for_write ) { - typedef std::string (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string&, const PXR_NS::ArResolvedPath&); - typedef std::string (*CREATE_IDENTIFIER_FN_PTR)(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath); - typedef std::shared_ptr (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath &resolvedPath); - typedef PXR_NS::ArResolvedPath (*RESOLVE_FN_PTR)(const std::string &assetPath); - typedef PXR_NS::ArResolvedPath (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string &assetPath); - typedef std::shared_ptr (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath &, PXR_NS::ArResolver::WriteMode); + typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); + typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); + typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output); + typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); + typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); + typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); class CustomFunctionArResolver : public PXR_NS::ArResolver { CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; @@ -49,30 +61,60 @@ namespace bblext { } std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { - return create_identifier_for_new_asset(assetPath, anchorAssetPath); + std::cout << "_CreateIdentifierForNewAsset" << std::endl; + std::string output; + std::string* output_ptr = &output; + create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr); + output = *output_ptr; + return output; } std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { - return create_identifier(assetPath, anchorAssetPath); + std::cout << "_CreateIdentifier" << std::endl; + std::string output; + std::string* output_ptr = &output; + create_identifier(&assetPath, &anchorAssetPath, &output_ptr); + output = *output_ptr; + return output; } PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const { - return resolve(assetPath); + std::cout << "_Resolve" << std::endl; + PXR_NS::ArResolvedPath output; + PXR_NS::ArResolvedPath* output_ptr = &output; + resolve(&assetPath, &output_ptr); + output = *output_ptr; + return output; } PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const { - return resolve_for_new_asset(assetPath); + std::cout << "_ResolveForNewAsset" << std::endl; + PXR_NS::ArResolvedPath output; + PXR_NS::ArResolvedPath* output_ptr = &output; + resolve_for_new_asset(&assetPath, &output_ptr); + output = *output_ptr; + return output; } std::shared_ptr _OpenAsset(const PXR_NS::ArResolvedPath &resolvedPath) const { - return open_asset(resolvedPath); + std::cout << "_OpenAsset" << std::endl; + std::shared_ptr output; + std::shared_ptr* output_ptr = &output; + open_asset(&resolvedPath, &output_ptr); + output = *output_ptr; + return output; } std::shared_ptr _OpenAssetForWrite( const PXR_NS::ArResolvedPath &resolvedPath, PXR_NS::ArResolver::WriteMode writeMode ) const { - return open_asset_for_write(resolvedPath, writeMode); + std::cout << "_OpenAssetForWrite" << std::endl; + std::shared_ptr output; + std::shared_ptr* output_ptr = &output; + open_asset_for_write(&resolvedPath, writeMode, &output_ptr); + output = *output_ptr; + return output; } }; @@ -216,6 +258,7 @@ BBL_MODULE(ar) { ; bbl::fn(&bblext::set_ar_resolver_factory); + bbl::fn(&bblext::asset_from_string); } From ff918e9042b2f9a703da3cb5d310ab3a825d824d Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Tue, 9 Jan 2024 15:18:06 +1300 Subject: [PATCH 04/16] Pass a context type --- bind/ar.cpp | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 171581b0..f44b2d69 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -32,14 +32,15 @@ namespace bblext { void* open_asset, void* resolve, void* resolve_for_new_asset, - void* open_asset_for_write + void* open_asset_for_write, + void* context ) { - typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); - typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); - typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output); - typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); - typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); - typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); + typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output, void* context); + typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output, void* context); + typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output, void* context); + typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output, void* context); + typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output, void* context); + typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output, void* context); class CustomFunctionArResolver : public PXR_NS::ArResolver { CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; @@ -48,6 +49,7 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; + void* context; public: CustomFunctionArResolver( @@ -56,15 +58,16 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ - ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, + void* context_ + ): context(context_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { } std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { std::cout << "_CreateIdentifierForNewAsset" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr); + create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr, context); output = *output_ptr; return output; } @@ -73,7 +76,7 @@ namespace bblext { std::cout << "_CreateIdentifier" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier(&assetPath, &anchorAssetPath, &output_ptr); + create_identifier(&assetPath, &anchorAssetPath, &output_ptr, context); output = *output_ptr; return output; } @@ -82,7 +85,7 @@ namespace bblext { std::cout << "_Resolve" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve(&assetPath, &output_ptr); + resolve(&assetPath, &output_ptr, context); output = *output_ptr; return output; } @@ -91,7 +94,7 @@ namespace bblext { std::cout << "_ResolveForNewAsset" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve_for_new_asset(&assetPath, &output_ptr); + resolve_for_new_asset(&assetPath, &output_ptr, context); output = *output_ptr; return output; } @@ -100,7 +103,7 @@ namespace bblext { std::cout << "_OpenAsset" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset(&resolvedPath, &output_ptr); + open_asset(&resolvedPath, &output_ptr, context); output = *output_ptr; return output; } @@ -112,7 +115,7 @@ namespace bblext { std::cout << "_OpenAssetForWrite" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset_for_write(&resolvedPath, writeMode, &output_ptr); + open_asset_for_write(&resolvedPath, writeMode, &output_ptr, context); output = *output_ptr; return output; } @@ -125,6 +128,7 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; + void* context; public: CustomFunctionArResolverFactory( @@ -133,11 +137,12 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ - ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, + void* context_ + ): context(context_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} virtual PXR_NS::ArResolver* New() const { - return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write); + return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write, context); } }; @@ -149,7 +154,8 @@ namespace bblext { (OPEN_ASSET_FN_PTR) open_asset, (RESOLVE_FN_PTR) resolve, (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, - (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write + (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, + context ) ) ); From 04173db64d3ec108e5a584ceb5e779bed728b4eb Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Tue, 9 Jan 2024 15:38:17 +1300 Subject: [PATCH 05/16] Revert "Pass a context type" This reverts commit ff918e9042b2f9a703da3cb5d310ab3a825d824d. --- bind/ar.cpp | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index f44b2d69..171581b0 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -32,15 +32,14 @@ namespace bblext { void* open_asset, void* resolve, void* resolve_for_new_asset, - void* open_asset_for_write, - void* context + void* open_asset_for_write ) { - typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output, void* context); - typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output, void* context); - typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output, void* context); - typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output, void* context); - typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output, void* context); - typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output, void* context); + typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); + typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); + typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output); + typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); + typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); + typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); class CustomFunctionArResolver : public PXR_NS::ArResolver { CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; @@ -49,7 +48,6 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; - void* context; public: CustomFunctionArResolver( @@ -58,16 +56,15 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, - void* context_ - ): context(context_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ + ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { } std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { std::cout << "_CreateIdentifierForNewAsset" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr, context); + create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr); output = *output_ptr; return output; } @@ -76,7 +73,7 @@ namespace bblext { std::cout << "_CreateIdentifier" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier(&assetPath, &anchorAssetPath, &output_ptr, context); + create_identifier(&assetPath, &anchorAssetPath, &output_ptr); output = *output_ptr; return output; } @@ -85,7 +82,7 @@ namespace bblext { std::cout << "_Resolve" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve(&assetPath, &output_ptr, context); + resolve(&assetPath, &output_ptr); output = *output_ptr; return output; } @@ -94,7 +91,7 @@ namespace bblext { std::cout << "_ResolveForNewAsset" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve_for_new_asset(&assetPath, &output_ptr, context); + resolve_for_new_asset(&assetPath, &output_ptr); output = *output_ptr; return output; } @@ -103,7 +100,7 @@ namespace bblext { std::cout << "_OpenAsset" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset(&resolvedPath, &output_ptr, context); + open_asset(&resolvedPath, &output_ptr); output = *output_ptr; return output; } @@ -115,7 +112,7 @@ namespace bblext { std::cout << "_OpenAssetForWrite" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset_for_write(&resolvedPath, writeMode, &output_ptr, context); + open_asset_for_write(&resolvedPath, writeMode, &output_ptr); output = *output_ptr; return output; } @@ -128,7 +125,6 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; - void* context; public: CustomFunctionArResolverFactory( @@ -137,12 +133,11 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, - void* context_ - ): context(context_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ + ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} virtual PXR_NS::ArResolver* New() const { - return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write, context); + return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write); } }; @@ -154,8 +149,7 @@ namespace bblext { (OPEN_ASSET_FN_PTR) open_asset, (RESOLVE_FN_PTR) resolve, (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, - (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, - context + (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write ) ) ); From 44a8b9ec9d1dafd5377d69a77401d96a0ec2429b Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Tue, 9 Jan 2024 16:17:26 +1300 Subject: [PATCH 06/16] Add _GetExtension --- bind/ar.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bind/ar.cpp b/bind/ar.cpp index 171581b0..1207884c 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -105,6 +105,11 @@ namespace bblext { return output; } + std::string _GetExtension(const std::string& assetPath) const { + std::cout << "_GetExtension" << std::endl; + return PXR_NS::ArResolver::_GetExtension(assetPath); + } + std::shared_ptr _OpenAssetForWrite( const PXR_NS::ArResolvedPath &resolvedPath, PXR_NS::ArResolver::WriteMode writeMode From 94e478363ef1acde107847bd00718392a6bf497c Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Tue, 9 Jan 2024 20:56:13 +1300 Subject: [PATCH 07/16] Get extension function, some other stuff --- bind/ar.cpp | 78 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 1207884c..514d6950 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -15,14 +15,14 @@ #include namespace bblext { - std::shared_ptr asset_from_string(std::string& string) { - char* buf = new char[string.size()]; - memcpy(buf, string.data(), string.size()); + std::shared_ptr asset_from_bytes(const char* bytes, size_t len) { + char* buf = new char[len]; + memcpy(buf, bytes, len); std::shared_ptr buffer; buffer.reset(buf, std::default_delete()); - return PXR_NS::ArInMemoryAsset::FromBuffer(buffer, string.size()); + return PXR_NS::ArInMemoryAsset::FromBuffer(buffer, len); } void set_ar_resolver_factory( @@ -32,7 +32,8 @@ namespace bblext { void* open_asset, void* resolve, void* resolve_for_new_asset, - void* open_asset_for_write + void* open_asset_for_write, + void* get_extension ) { typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); @@ -40,6 +41,7 @@ namespace bblext { typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); + typedef void (*GET_EXTENSION_FN_PTR)(const std::string* assetPath, std::string** output); class CustomFunctionArResolver : public PXR_NS::ArResolver { CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; @@ -48,7 +50,8 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; - + GET_EXTENSION_FN_PTR get_extension; + public: CustomFunctionArResolver( CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, @@ -56,11 +59,12 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ - ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, + GET_EXTENSION_FN_PTR get_extension_ + ): get_extension(get_extension_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { } - std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { + std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifierForNewAsset" << std::endl; std::string output; std::string* output_ptr = &output; @@ -69,7 +73,7 @@ namespace bblext { return output; } - std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const { + std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifier" << std::endl; std::string output; std::string* output_ptr = &output; @@ -78,7 +82,7 @@ namespace bblext { return output; } - PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const { + PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const override { std::cout << "_Resolve" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; @@ -87,16 +91,20 @@ namespace bblext { return output; } - PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const { + PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const override { std::cout << "_ResolveForNewAsset" << std::endl; - PXR_NS::ArResolvedPath output; - PXR_NS::ArResolvedPath* output_ptr = &output; - resolve_for_new_asset(&assetPath, &output_ptr); - output = *output_ptr; - return output; + if (resolve_for_new_asset) { + PXR_NS::ArResolvedPath output; + PXR_NS::ArResolvedPath* output_ptr = &output; + resolve_for_new_asset(&assetPath, &output_ptr); + output = *output_ptr; + return output; + } else { + return PXR_NS::ArResolvedPath(); + } } - std::shared_ptr _OpenAsset(const PXR_NS::ArResolvedPath &resolvedPath) const { + std::shared_ptr _OpenAsset(const PXR_NS::ArResolvedPath &resolvedPath) const override { std::cout << "_OpenAsset" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; @@ -105,15 +113,29 @@ namespace bblext { return output; } - std::string _GetExtension(const std::string& assetPath) const { + PXR_NS::ArTimestamp _GetModificationTimestamp(const std::string &assetPath, const PXR_NS::ArResolvedPath &resolvedPath) const override { + std::cout << "_GetModificationTimestamp" << std::endl; + return PXR_NS::ArResolver::_GetModificationTimestamp(assetPath, resolvedPath); + } + + std::string _GetExtension(const std::string& assetPath) const override { std::cout << "_GetExtension" << std::endl; - return PXR_NS::ArResolver::_GetExtension(assetPath); + + if (get_extension) { + std::string output; + std::string* output_ptr = &output; + get_extension(&assetPath, &output_ptr); + output = *output_ptr; + return output; + } else { + return PXR_NS::ArResolver::_GetExtension(assetPath); + } } std::shared_ptr _OpenAssetForWrite( const PXR_NS::ArResolvedPath &resolvedPath, PXR_NS::ArResolver::WriteMode writeMode - ) const { + ) const override { std::cout << "_OpenAssetForWrite" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; @@ -130,7 +152,8 @@ namespace bblext { RESOLVE_FN_PTR resolve; RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; - + GET_EXTENSION_FN_PTR get_extension; + public: CustomFunctionArResolverFactory( CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, @@ -138,11 +161,12 @@ namespace bblext { OPEN_ASSET_FN_PTR open_asset_, RESOLVE_FN_PTR resolve_, RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_ - ): open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} + OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, + GET_EXTENSION_FN_PTR get_extension_ + ): get_extension(get_extension_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} virtual PXR_NS::ArResolver* New() const { - return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write); + return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write, get_extension); } }; @@ -154,7 +178,8 @@ namespace bblext { (OPEN_ASSET_FN_PTR) open_asset, (RESOLVE_FN_PTR) resolve, (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, - (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write + (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, + (GET_EXTENSION_FN_PTR) get_extension ) ) ); @@ -187,6 +212,7 @@ BBL_MODULE(ar) { ; bbl::Class("ResolvedPath") + .ctor(bbl::Class::Ctor<>(), "default") .ctor(bbl::Class::Ctor("resolvedPath"), "ctor") .m(&PXR_NS::ArResolvedPath::GetPathString) .m(&PXR_NS::ArResolvedPath::GetHash) From a490f6755f2516e933442fa3d17821b3fea09ac1 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 12 Jan 2024 21:46:57 +1300 Subject: [PATCH 08/16] Fix function name --- bind/ar.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 514d6950..1c3a66ac 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -289,9 +289,8 @@ BBL_MODULE(ar) { ; bbl::fn(&bblext::set_ar_resolver_factory); - bbl::fn(&bblext::asset_from_string); + bbl::fn(&bblext::asset_from_bytes); } #endif - From 5e19def266914feba7d76c529791df21f5e50d84 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 12 Jan 2024 23:02:52 +1300 Subject: [PATCH 09/16] get_modification_timestamp --- bind/ar.cpp | 96 ++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 1c3a66ac..d17278ae 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -27,13 +27,14 @@ namespace bblext { void set_ar_resolver_factory( const PXR_NS::TfType& type, - void* create_id, + void* create_identifier_for_new_asset, void* create_identifier, void* open_asset, void* resolve, void* resolve_for_new_asset, void* open_asset_for_write, - void* get_extension + void* get_extension, + void* get_modification_timestamp ) { typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); @@ -42,8 +43,9 @@ namespace bblext { typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); typedef void (*GET_EXTENSION_FN_PTR)(const std::string* assetPath, std::string** output); + typedef void (*GET_MODIFICATION_TIMESTAMP_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *resolvedPath, PXR_NS::ArTimestamp** output); - class CustomFunctionArResolver : public PXR_NS::ArResolver { + struct Functions { CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; CREATE_IDENTIFIER_FN_PTR create_identifier; OPEN_ASSET_FN_PTR open_asset; @@ -51,24 +53,33 @@ namespace bblext { RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; GET_EXTENSION_FN_PTR get_extension; + GET_MODIFICATION_TIMESTAMP_FN_PTR get_modification_timestamp; + }; + + Functions functions = { + (CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR) create_identifier_for_new_asset, + (CREATE_IDENTIFIER_FN_PTR) create_identifier, + (OPEN_ASSET_FN_PTR) open_asset, + (RESOLVE_FN_PTR) resolve, + (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, + (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, + (GET_EXTENSION_FN_PTR) get_extension, + (GET_MODIFICATION_TIMESTAMP_FN_PTR) get_modification_timestamp + }; + + class CustomFunctionArResolver : public PXR_NS::ArResolver { + Functions functions; public: CustomFunctionArResolver( - CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, - CREATE_IDENTIFIER_FN_PTR create_identifier_, - OPEN_ASSET_FN_PTR open_asset_, - RESOLVE_FN_PTR resolve_, - RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, - GET_EXTENSION_FN_PTR get_extension_ - ): get_extension(get_extension_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier_for_new_asset(create_identifier_for_new_asset_), create_identifier(create_identifier_) { - } + Functions functions_ + ): functions(functions_) {} std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifierForNewAsset" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr); + functions.create_identifier_for_new_asset(&assetPath, &anchorAssetPath, &output_ptr); output = *output_ptr; return output; } @@ -77,7 +88,7 @@ namespace bblext { std::cout << "_CreateIdentifier" << std::endl; std::string output; std::string* output_ptr = &output; - create_identifier(&assetPath, &anchorAssetPath, &output_ptr); + functions.create_identifier(&assetPath, &anchorAssetPath, &output_ptr); output = *output_ptr; return output; } @@ -86,17 +97,17 @@ namespace bblext { std::cout << "_Resolve" << std::endl; PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve(&assetPath, &output_ptr); + functions.resolve(&assetPath, &output_ptr); output = *output_ptr; return output; } PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const override { std::cout << "_ResolveForNewAsset" << std::endl; - if (resolve_for_new_asset) { + if (functions.resolve_for_new_asset) { PXR_NS::ArResolvedPath output; PXR_NS::ArResolvedPath* output_ptr = &output; - resolve_for_new_asset(&assetPath, &output_ptr); + functions.resolve_for_new_asset(&assetPath, &output_ptr); output = *output_ptr; return output; } else { @@ -108,23 +119,32 @@ namespace bblext { std::cout << "_OpenAsset" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset(&resolvedPath, &output_ptr); + functions.open_asset(&resolvedPath, &output_ptr); output = *output_ptr; return output; } PXR_NS::ArTimestamp _GetModificationTimestamp(const std::string &assetPath, const PXR_NS::ArResolvedPath &resolvedPath) const override { std::cout << "_GetModificationTimestamp" << std::endl; - return PXR_NS::ArResolver::_GetModificationTimestamp(assetPath, resolvedPath); + + if (functions.get_modification_timestamp) { + PXR_NS::ArTimestamp output; + PXR_NS::ArTimestamp* output_ptr = &output; + functions.get_modification_timestamp(&assetPath, &resolvedPath, &output_ptr); + output = *output_ptr; + return output; + } else { + return PXR_NS::ArResolver::_GetModificationTimestamp(assetPath, resolvedPath); + } } std::string _GetExtension(const std::string& assetPath) const override { std::cout << "_GetExtension" << std::endl; - if (get_extension) { + if (functions.get_extension) { std::string output; std::string* output_ptr = &output; - get_extension(&assetPath, &output_ptr); + functions.get_extension(&assetPath, &output_ptr); output = *output_ptr; return output; } else { @@ -139,48 +159,28 @@ namespace bblext { std::cout << "_OpenAssetForWrite" << std::endl; std::shared_ptr output; std::shared_ptr* output_ptr = &output; - open_asset_for_write(&resolvedPath, writeMode, &output_ptr); + functions.open_asset_for_write(&resolvedPath, writeMode, &output_ptr); output = *output_ptr; return output; } }; class CustomFunctionArResolverFactory: public PXR_NS::Ar_ResolverFactoryBase { - CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; - CREATE_IDENTIFIER_FN_PTR create_identifier; - OPEN_ASSET_FN_PTR open_asset; - RESOLVE_FN_PTR resolve; - RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; - GET_EXTENSION_FN_PTR get_extension; + Functions functions; - public: + public: CustomFunctionArResolverFactory( - CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset_, - CREATE_IDENTIFIER_FN_PTR create_identifier_, - OPEN_ASSET_FN_PTR open_asset_, - RESOLVE_FN_PTR resolve_, - RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset_, - OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write_, - GET_EXTENSION_FN_PTR get_extension_ - ): get_extension(get_extension_), open_asset_for_write(open_asset_for_write_), resolve_for_new_asset(resolve_for_new_asset_), resolve(resolve_), open_asset(open_asset_), create_identifier(create_identifier_), create_identifier_for_new_asset(create_identifier_for_new_asset_) {} + Functions functions_ + ): functions(functions_) {} virtual PXR_NS::ArResolver* New() const { - return new CustomFunctionArResolver(create_identifier_for_new_asset, create_identifier, open_asset, resolve, resolve_for_new_asset, open_asset_for_write, get_extension); + return new CustomFunctionArResolver(functions); } }; type.SetFactory( std::unique_ptr( - new CustomFunctionArResolverFactory( - (CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR) create_id, - (CREATE_IDENTIFIER_FN_PTR) create_identifier, - (OPEN_ASSET_FN_PTR) open_asset, - (RESOLVE_FN_PTR) resolve, - (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, - (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, - (GET_EXTENSION_FN_PTR) get_extension - ) + new CustomFunctionArResolverFactory(functions) ) ); } From d1aee60234c2b259a7581a47d153997c3f3e3c0c Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 15 Jan 2024 10:37:44 +1300 Subject: [PATCH 10/16] Add writable asset functions --- bind/ar.cpp | 73 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index d17278ae..de2147ba 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -34,37 +34,72 @@ namespace bblext { void* resolve_for_new_asset, void* open_asset_for_write, void* get_extension, - void* get_modification_timestamp + void* get_modification_timestamp, + void* close_writeable_asset, + void* open_writable_asset, + void* write_writable_asset ) { - typedef void (*CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR)(const std::string*, const PXR_NS::ArResolvedPath*, std::string** output); typedef void (*CREATE_IDENTIFIER_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *anchorAssetPath, std::string** output); typedef void (*OPEN_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, std::shared_ptr** output); typedef void (*RESOLVE_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); - typedef void (*RESOLVE_FOR_NEW_ASSET_FN_PTR)(const std::string *assetPath, PXR_NS::ArResolvedPath** output); typedef void (*OPEN_ASSET_FOR_WRITE_FN_PTR)(const PXR_NS::ArResolvedPath *, PXR_NS::ArResolver::WriteMode, std::shared_ptr** output); typedef void (*GET_EXTENSION_FN_PTR)(const std::string* assetPath, std::string** output); typedef void (*GET_MODIFICATION_TIMESTAMP_FN_PTR)(const std::string *assetPath, const PXR_NS::ArResolvedPath *resolvedPath, PXR_NS::ArTimestamp** output); + typedef bool (*CLOSE_WRITABLE_ASSET_FN_PTR)(void*); + typedef void* (*OPEN_WRITABLE_ASSET_FN_PTR)(const PXR_NS::ArResolvedPath *resolvedPath, PXR_NS::ArResolver::WriteMode); + typedef size_t (*WRITE_WRITABLE_ASSET_FN_PTR)(void*, const void*, size_t, size_t); + + class CustomFunctionWriteableAsset: public PXR_NS::ArWritableAsset { + public: + void* custom_data; + CLOSE_WRITABLE_ASSET_FN_PTR close_writeable_asset; + WRITE_WRITABLE_ASSET_FN_PTR write_writable_asset; + + CustomFunctionWriteableAsset( + const PXR_NS::ArResolvedPath &resolved_path, + PXR_NS::ArResolver::WriteMode writeMode, + CLOSE_WRITABLE_ASSET_FN_PTR close_writeable_asset_, + OPEN_WRITABLE_ASSET_FN_PTR open_writable_asset, + WRITE_WRITABLE_ASSET_FN_PTR write_writable_asset_ + ): write_writable_asset(write_writable_asset_), custom_data(open_writable_asset(&resolved_path, writeMode)), close_writeable_asset(close_writeable_asset_) { + + } + + bool Close() { + return close_writeable_asset(custom_data); + } + + size_t Write(const void* src, size_t count, size_t offset) { + return write_writable_asset(custom_data, src, count, offset); + } + }; struct Functions { - CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR create_identifier_for_new_asset; + CREATE_IDENTIFIER_FN_PTR create_identifier_for_new_asset; CREATE_IDENTIFIER_FN_PTR create_identifier; OPEN_ASSET_FN_PTR open_asset; RESOLVE_FN_PTR resolve; - RESOLVE_FOR_NEW_ASSET_FN_PTR resolve_for_new_asset; + RESOLVE_FN_PTR resolve_for_new_asset; OPEN_ASSET_FOR_WRITE_FN_PTR open_asset_for_write; GET_EXTENSION_FN_PTR get_extension; GET_MODIFICATION_TIMESTAMP_FN_PTR get_modification_timestamp; + CLOSE_WRITABLE_ASSET_FN_PTR close_writeable_asset; + OPEN_WRITABLE_ASSET_FN_PTR open_writable_asset; + WRITE_WRITABLE_ASSET_FN_PTR write_writable_asset; }; Functions functions = { - (CREATE_IDENTIFIER_FOR_NEW_ASSET_FN_PTR) create_identifier_for_new_asset, + (CREATE_IDENTIFIER_FN_PTR) create_identifier_for_new_asset, (CREATE_IDENTIFIER_FN_PTR) create_identifier, (OPEN_ASSET_FN_PTR) open_asset, (RESOLVE_FN_PTR) resolve, - (RESOLVE_FOR_NEW_ASSET_FN_PTR) resolve_for_new_asset, + (RESOLVE_FN_PTR) resolve_for_new_asset, (OPEN_ASSET_FOR_WRITE_FN_PTR) open_asset_for_write, (GET_EXTENSION_FN_PTR) get_extension, - (GET_MODIFICATION_TIMESTAMP_FN_PTR) get_modification_timestamp + (GET_MODIFICATION_TIMESTAMP_FN_PTR) get_modification_timestamp, + (CLOSE_WRITABLE_ASSET_FN_PTR) close_writeable_asset, + (OPEN_WRITABLE_ASSET_FN_PTR) open_writable_asset, + (WRITE_WRITABLE_ASSET_FN_PTR) write_writable_asset }; class CustomFunctionArResolver : public PXR_NS::ArResolver { @@ -74,7 +109,7 @@ namespace bblext { CustomFunctionArResolver( Functions functions_ ): functions(functions_) {} - + std::string _CreateIdentifierForNewAsset(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifierForNewAsset" << std::endl; std::string output; @@ -83,7 +118,7 @@ namespace bblext { output = *output_ptr; return output; } - + std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifier" << std::endl; std::string output; @@ -92,7 +127,7 @@ namespace bblext { output = *output_ptr; return output; } - + PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const override { std::cout << "_Resolve" << std::endl; PXR_NS::ArResolvedPath output; @@ -101,7 +136,7 @@ namespace bblext { output = *output_ptr; return output; } - + PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const override { std::cout << "_ResolveForNewAsset" << std::endl; if (functions.resolve_for_new_asset) { @@ -114,7 +149,7 @@ namespace bblext { return PXR_NS::ArResolvedPath(); } } - + std::shared_ptr _OpenAsset(const PXR_NS::ArResolvedPath &resolvedPath) const override { std::cout << "_OpenAsset" << std::endl; std::shared_ptr output; @@ -123,7 +158,7 @@ namespace bblext { output = *output_ptr; return output; } - + PXR_NS::ArTimestamp _GetModificationTimestamp(const std::string &assetPath, const PXR_NS::ArResolvedPath &resolvedPath) const override { std::cout << "_GetModificationTimestamp" << std::endl; @@ -154,14 +189,10 @@ namespace bblext { std::shared_ptr _OpenAssetForWrite( const PXR_NS::ArResolvedPath &resolvedPath, - PXR_NS::ArResolver::WriteMode writeMode + PXR_NS::ArResolver::WriteMode writeMode ) const override { std::cout << "_OpenAssetForWrite" << std::endl; - std::shared_ptr output; - std::shared_ptr* output_ptr = &output; - functions.open_asset_for_write(&resolvedPath, writeMode, &output_ptr); - output = *output_ptr; - return output; + return std::make_shared(resolvedPath, writeMode, functions.close_writeable_asset, functions.open_writable_asset, functions.write_writable_asset); } }; @@ -177,7 +208,7 @@ namespace bblext { return new CustomFunctionArResolver(functions); } }; - + type.SetFactory( std::unique_ptr( new CustomFunctionArResolverFactory(functions) From d5290a296f702bebbc8a7d92e9b39600d891120a Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 15 Jan 2024 14:17:07 +1300 Subject: [PATCH 11/16] Check PXR_VERSION --- bind/pcp.cpp | 9 +++++++++ bind/sdf.cpp | 6 ++++++ bind/usd.cpp | 10 +++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/bind/pcp.cpp b/bind/pcp.cpp index 97015cb0..42304e0a 100644 --- a/bind/pcp.cpp +++ b/bind/pcp.cpp @@ -165,6 +165,11 @@ BBL_MODULE(pcp) { .m(&PXR_NS::PcpChanges::DidMaybeFixAsset) .m(&PXR_NS::PcpChanges::DidMuteLayer) .m(&PXR_NS::PcpChanges::DidUnmuteLayer) +#if PXR_VERSION <= 2308 + .m(&PXR_NS::PcpChanges::DidChangeLayers) + .m(&PXR_NS::PcpChanges::DidChangeLayerOffsets) + .m(&PXR_NS::PcpChanges::DidChangeRelocates) +#endif .m(&PXR_NS::PcpChanges::DidChangeSignificantly) .m(&PXR_NS::PcpChanges::DidChangeSpecs) .m(&PXR_NS::PcpChanges::DidChangeSpecStack) @@ -527,6 +532,10 @@ BBL_MODULE(pcp) { .m(&PXR_NS::PcpMapFunction::IsIdentity) .m(&PXR_NS::PcpMapFunction::IsIdentityPathMapping) .m(&PXR_NS::PcpMapFunction::HasRootIdentity) +#if PXR_VERSION <= 2308 + .m(&PXR_NS::PcpMapFunction::MapSourceToTarget) + .m(&PXR_NS::PcpMapFunction::MapTargetToSource) +#endif .m(&PXR_NS::PcpMapFunction::Compose) .m(&PXR_NS::PcpMapFunction::ComposeOffset) .m(&PXR_NS::PcpMapFunction::GetInverse) diff --git a/bind/sdf.cpp b/bind/sdf.cpp index 7f2513c5..bb5ccfe7 100644 --- a/bind/sdf.cpp +++ b/bind/sdf.cpp @@ -1057,6 +1057,9 @@ BBL_MODULE(sdf) { // .m((PXR_NS::SdfPathExpression (PXR_NS::SdfPathExpression::*)(const PXR_NS::SdfPathExpression &)) // &PXR_NS::SdfPathExpression::ComposeOver, "ComposeOver_01") .m(&PXR_NS::SdfPathExpression::IsComplete) +#if PXR_VERSION <= 2308 + .m(&PXR_NS::SdfPathExpression::GetDebugString) +#endif .m(&PXR_NS::SdfPathExpression::IsEmpty) .m(&PXR_NS::SdfPathExpression::operator bool, "op_bool") .m(&PXR_NS::SdfPathExpression::GetParseError) @@ -1084,6 +1087,9 @@ BBL_MODULE(sdf) { &PXR_NS::SdfPathExpression::PathPattern::SetPrefix, "SetPrefix_00") .m((void (PXR_NS::SdfPathExpression::PathPattern::*)(const PXR_NS::SdfPath &)) &PXR_NS::SdfPathExpression::PathPattern::SetPrefix, "SetPrefix_01") +#if PXR_VERSION <= 2308 + .m(&PXR_NS::SdfPathExpression::PathPattern::GetDebugString) +#endif // .m((const std::vector & (PXR_NS::SdfPathExpression::PathPattern::*)() const) // &PXR_NS::SdfPathExpression::PathPattern::GetComponents, "GetComponents_00") // .m((std::vector (PXR_NS::SdfPathExpression::PathPattern::*)()) diff --git a/bind/usd.cpp b/bind/usd.cpp index 0d7a483f..984224f0 100644 --- a/bind/usd.cpp +++ b/bind/usd.cpp @@ -1091,10 +1091,14 @@ BBL_MODULE(usd) { bbl::Class("PrimRangeIterator") .opaque_ptr() .ctor(bbl::Class::Ctor<>(), "new") +#if PXR_VERSION <= 2308 + .m(&PXR_NS::UsdPrimRange::iterator::operator++, "op_inc") +#else .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)()) &PXR_NS::UsdPrimRange::iterator::operator++, "op_inc" ) - .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&)) +#endif + .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&)) &PXR_NS::UsdPrimRange::iterator::operator=, "op_assign" ) .m((bool(PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&) const) @@ -1109,9 +1113,13 @@ BBL_MODULE(usd) { bbl::Class("PrimSiblingIterator") .m(&PXR_NS::UsdPrimSiblingIterator::operator*, "deref") + #if PXR_VERSION <= 2308 + .m(&PXR_NS::UsdPrimSiblingIterator::operator++, "op_inc") +#else .m((PXR_NS::UsdPrimSiblingIterator & (PXR_NS::UsdPrimSiblingIterator::*)()) &PXR_NS::UsdPrimSiblingIterator::operator++, "op_inc" ) +#endif ; bbl::fn(&bblext::PrimSiblingIterator_op_eq); From 1fa06a5597032140601caabbf209980121309890 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 15 Jan 2024 14:38:09 +1300 Subject: [PATCH 12/16] Remove ArResolvedPath::default as I don't require it --- bind/ar.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index de2147ba..2de69381 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -243,7 +243,6 @@ BBL_MODULE(ar) { ; bbl::Class("ResolvedPath") - .ctor(bbl::Class::Ctor<>(), "default") .ctor(bbl::Class::Ctor("resolvedPath"), "ctor") .m(&PXR_NS::ArResolvedPath::GetPathString) .m(&PXR_NS::ArResolvedPath::GetHash) From 174a66c7a91d00c17549ed80bada1a3f220c4870 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 19 Jan 2024 20:43:08 +1300 Subject: [PATCH 13/16] Add a few extra methods --- bind/sdf.cpp | 1 + bind/std.cpp | 5 ++-- bind/tf.cpp | 2 +- bind/usd.cpp | 10 ++++++- bind/usdGeom.cpp | 68 +++++++++++++++++++++++++----------------------- 5 files changed, 49 insertions(+), 37 deletions(-) diff --git a/bind/sdf.cpp b/bind/sdf.cpp index bb5ccfe7..8470cb83 100644 --- a/bind/sdf.cpp +++ b/bind/sdf.cpp @@ -722,6 +722,7 @@ BBL_MODULE(sdf) { bbl::Class("LayerOffset") .ctor(bbl::Class::Ctor("offset", "scale"), "ctor") + .ctor(bbl::Class::Ctor(), "default") .m(&PXR_NS::SdfLayerOffset::GetOffset) .m(&PXR_NS::SdfLayerOffset::GetScale) .m(&PXR_NS::SdfLayerOffset::SetOffset) diff --git a/bind/std.cpp b/bind/std.cpp index 1645d1ba..fc7a23f0 100644 --- a/bind/std.cpp +++ b/bind/std.cpp @@ -10,8 +10,9 @@ BBL_MODULE(std) { - bbl::Class("String").ctor( - bbl::Class::Ctor(), "from_char_ptr") + bbl::Class("String") + .ctor(bbl::Class::Ctor<>(), "default") + .ctor(bbl::Class::Ctor(), "from_char_ptr") .m(&std::string::c_str) ; diff --git a/bind/tf.cpp b/bind/tf.cpp index 3122a8d0..cb8eb317 100644 --- a/bind/tf.cpp +++ b/bind/tf.cpp @@ -22,7 +22,7 @@ BBL_MODULE(tf) { bbl::Class("Token") .opaque_ptr() - .ctor(bbl::Class::Ctor<>(), "new") + .ctor(bbl::Class::Ctor(), "new") .m(&Token::GetText) ; diff --git a/bind/usd.cpp b/bind/usd.cpp index 984224f0..bb7faf09 100644 --- a/bind/usd.cpp +++ b/bind/usd.cpp @@ -88,6 +88,14 @@ PXR_NS::UsdStageRefPtr Stage_Open(char const* filename, PXR_NS::UsdStage::Initia return PXR_NS::UsdStage::Open(filename, loadSet); } +bool StageRefPtr_ExportToString( + const PXR_NS::UsdStageRefPtr& stage, + std::string** output, + bool addSourceFileComment = true +) { + return stage->ExportToString(*output, addSourceFileComment); +} + } @@ -1349,7 +1357,6 @@ BBL_MODULE(usd) { // Flatten & Export Utilities .m(&PXR_NS::UsdStage::Export) - .m(&PXR_NS::UsdStage::ExportToString) .m(&PXR_NS::UsdStage::Flatten) // PXR_NS::UsdStage Metadata @@ -1491,6 +1498,7 @@ BBL_MODULE(usd) { ; bbl::fn(&bblext::Stage_Open); + bbl::fn(&bblext::StageRefPtr_ExportToString); bbl::Enum("StageInitialLoadSet"); diff --git a/bind/usdGeom.cpp b/bind/usdGeom.cpp index 109af2bb..4e53a9f7 100644 --- a/bind/usdGeom.cpp +++ b/bind/usdGeom.cpp @@ -645,44 +645,46 @@ BBL_MODULE(usdGeom) { bbl::Class("Xformable") - .ctor(bbl::Class::Ctor<>(),"new") - .m(&PXR_NS::UsdGeomXformable::GetXformOpOrderAttr) - .m(&PXR_NS::UsdGeomXformable::AddXformOp) - .m(&PXR_NS::UsdGeomXformable::AddTranslateOp) - .m(&PXR_NS::UsdGeomXformable::AddScaleOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateXOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateYOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateZOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateXYZOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateXZYOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateYXZOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateYZXOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateZXYOp) - .m(&PXR_NS::UsdGeomXformable::AddRotateZYXOp) - .m(&PXR_NS::UsdGeomXformable::AddOrientOp) - .m(&PXR_NS::UsdGeomXformable::AddTransformOp) - .m(&PXR_NS::UsdGeomXformable::SetResetXformStack) - .m(&PXR_NS::UsdGeomXformable::SetXformOpOrder) - .m(&PXR_NS::UsdGeomXformable::GetOrderedXformOps) - .m(&PXR_NS::UsdGeomXformable::ClearXformOpOrder) - .m(&PXR_NS::UsdGeomXformable::MakeMatrixXform) - .m((bool (PXR_NS::UsdGeomXformable::*)() const) - &PXR_NS::UsdGeomXformable::TransformMightBeTimeVarying) - .m((bool (PXR_NS::UsdGeomXformable::*)(std::vector const&) const) - &PXR_NS::UsdGeomXformable::TransformMightBeTimeVarying, "TransformMightBeTimeVarying_using") - .m((bool (PXR_NS::UsdGeomXformable::*)(std::vector*) const) - &PXR_NS::UsdGeomXformable::GetTimeSamples) - .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfInterval const&, std::vector*) const) - &PXR_NS::UsdGeomXformable::GetTimeSamplesInInterval) - .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfMatrix4d*, bool*, PXR_NS::UsdTimeCode const) const) - &PXR_NS::UsdGeomXformable::GetLocalTransformation) - .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfMatrix4d*, bool*, std::vector const&, PXR_NS::UsdTimeCode const) const) + .ctor(bbl::Class::Ctor(),"new") + .m(&PXR_NS::UsdGeomXformable::GetXformOpOrderAttr) + .m(&PXR_NS::UsdGeomXformable::AddXformOp) + .m(&PXR_NS::UsdGeomXformable::GetXformOp) + .m(&PXR_NS::UsdGeomXformable::AddTranslateOp) + .m(&PXR_NS::UsdGeomXformable::AddScaleOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateXOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateYOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateZOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateXYZOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateXZYOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateYXZOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateYZXOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateZXYOp) + .m(&PXR_NS::UsdGeomXformable::AddRotateZYXOp) + .m(&PXR_NS::UsdGeomXformable::AddOrientOp) + .m(&PXR_NS::UsdGeomXformable::AddTransformOp) + .m(&PXR_NS::UsdGeomXformable::SetResetXformStack) + .m(&PXR_NS::UsdGeomXformable::SetXformOpOrder) + .m(&PXR_NS::UsdGeomXformable::GetOrderedXformOps) + .m(&PXR_NS::UsdGeomXformable::ClearXformOpOrder) + .m(&PXR_NS::UsdGeomXformable::MakeMatrixXform) + .m((bool (PXR_NS::UsdGeomXformable::*)() const) + &PXR_NS::UsdGeomXformable::TransformMightBeTimeVarying) + .m((bool (PXR_NS::UsdGeomXformable::*)(std::vector const&) const) + &PXR_NS::UsdGeomXformable::TransformMightBeTimeVarying, "TransformMightBeTimeVarying_using") + .m((bool (PXR_NS::UsdGeomXformable::*)(std::vector*) const) + &PXR_NS::UsdGeomXformable::GetTimeSamples) + .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfInterval const&, std::vector*) const) + &PXR_NS::UsdGeomXformable::GetTimeSamplesInInterval) + .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfMatrix4d*, bool*, PXR_NS::UsdTimeCode const) const) + &PXR_NS::UsdGeomXformable::GetLocalTransformation) + .m((bool (PXR_NS::UsdGeomXformable::*)(PXR_NS::GfMatrix4d*, bool*, std::vector const&, PXR_NS::UsdTimeCode const) const) &PXR_NS::UsdGeomXformable::GetLocalTransformation, "GetLocalTransformation_with_ops") ; bbl::Class("XformOp") .ctor(bbl::Class::Ctor("attr", "isInverseOp"), "new") - + .m((bool (PXR_NS::UsdGeomXformOp::*)(const PXR_NS::VtValue&, PXR_NS::UsdTimeCode) const) + &PXR_NS::UsdGeomXformOp::Set) .m(&PXR_NS::UsdGeomXformOp::GetOpType) .m(&PXR_NS::UsdGeomXformOp::GetPrecision) .m(&PXR_NS::UsdGeomXformOp::IsInverseOp) From c22de9b0b5fc2fec617b808bf618e396dc7790cb Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 22 Jan 2024 12:56:31 +1300 Subject: [PATCH 14/16] Make create_identifier and resolve optional --- bind/ar.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/bind/ar.cpp b/bind/ar.cpp index 2de69381..4c615941 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -121,20 +121,28 @@ namespace bblext { std::string _CreateIdentifier(const std::string &assetPath, const PXR_NS::ArResolvedPath &anchorAssetPath) const override { std::cout << "_CreateIdentifier" << std::endl; - std::string output; - std::string* output_ptr = &output; - functions.create_identifier(&assetPath, &anchorAssetPath, &output_ptr); - output = *output_ptr; - return output; + if (functions.create_identifier) { + std::string output; + std::string* output_ptr = &output; + functions.create_identifier(&assetPath, &anchorAssetPath, &output_ptr); + output = *output_ptr; + return output; + } else { + return assetPath; + } } PXR_NS::ArResolvedPath _Resolve(const std::string &assetPath) const override { std::cout << "_Resolve" << std::endl; - PXR_NS::ArResolvedPath output; - PXR_NS::ArResolvedPath* output_ptr = &output; - functions.resolve(&assetPath, &output_ptr); - output = *output_ptr; - return output; + if (functions.resolve) { + PXR_NS::ArResolvedPath output; + PXR_NS::ArResolvedPath* output_ptr = &output; + functions.resolve(&assetPath, &output_ptr); + output = *output_ptr; + return output; + } else { + return PXR_NS::ArResolvedPath(assetPath); + } } PXR_NS::ArResolvedPath _ResolveForNewAsset(const std::string &assetPath) const override { From 25925dbc3613b1bd46b7618320208cf2d38d554d Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Mon, 22 Jan 2024 23:57:45 +1300 Subject: [PATCH 15/16] Fix whitespace issues --- CMakeLists.txt | 52 ++++----- bind/gf.cpp | 9 +- bind/js.cpp | 2 +- bind/ndr.cpp | 2 - bind/pcp.cpp | 1 - bind/sdf.cpp | 10 +- bind/sdr.cpp | 2 - bind/std.cpp | 3 +- bind/tf.cpp | 1 - bind/usd.cpp | 279 ++++++++++++++++++++++----------------------- bind/usdGeom.cpp | 100 ++++++++-------- bind/usdLux.cpp | 2 - bind/usdRender.cpp | 2 - bind/usdShade.cpp | 2 - bind/vt.cpp | 117 ++++++++++--------- gen/CMakeLists.txt | 6 +- 16 files changed, 287 insertions(+), 303 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c452597c..7a6ae389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,42 +7,42 @@ find_package(pxr REQUIRED) option(BUILD_EXAMPLE "Build the example program" OFF) # The bindfile contains all our binding definitions -set(bindfiles - bind/ar.cpp - bind/gf.cpp - bind/js.cpp - bind/ndr.cpp - bind/pcp.cpp +set(bindfiles + bind/ar.cpp + bind/gf.cpp + bind/js.cpp + bind/ndr.cpp + bind/pcp.cpp bind/sdf.cpp bind/sdr.cpp bind/std.cpp - bind/tf.cpp + bind/tf.cpp bind/usd.cpp - bind/usdGeom.cpp - bind/usdLux.cpp - bind/usdRender.cpp - bind/usdShade.cpp - bind/vt.cpp + bind/usdGeom.cpp + bind/usdLux.cpp + bind/usdRender.cpp + bind/usdShade.cpp + bind/vt.cpp ) # Configures bbl-translate to generate the shim library source and build it as # libopenusd-c bbl_translate_binding( openusd - BINDFILES + BINDFILES ${bindfiles} - COMPILE_ARGS - -Wno-deprecated-builtins + COMPILE_ARGS + -Wno-deprecated-builtins "-Wno-#pragma-messages" - -DNOMINMAX - -D_MT - -DBOOST_ALL_NO_LIB - -D__TBB_show_deprecation_message_task_H + -DNOMINMAX + -D_MT + -DBOOST_ALL_NO_LIB + -D__TBB_show_deprecation_message_task_H ) target_link_libraries( - openusd-c - PUBLIC + openusd-c + PUBLIC ${PXR_LIBRARIES} ) @@ -69,14 +69,14 @@ target_compile_options(bind-dummy PRIVATE $) install( - TARGETS + TARGETS openusd-c - LIBRARY + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - INCLUDES + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/bind/gf.cpp b/bind/gf.cpp index 9ac9040c..3c4c75b9 100644 --- a/bind/gf.cpp +++ b/bind/gf.cpp @@ -208,12 +208,12 @@ struct Rotation { BBL_MODULE(gf) { // clang-format off - // We don't bind methods for simple classes like this and will poke at the members directly or build that + // We don't bind methods for simple classes like this and will poke at the members directly or build that // functionality in higher-level language bindings bbl::Class("Vec2f") .replace_with() ; - + bbl::Class>("Vec2fArray") VTARRAY_METHODS(PXR_NS::GfVec2f) ; @@ -909,11 +909,11 @@ BBL_MODULE(gf) { bbl::Class>("Matrix4dArray") VTARRAY_METHODS(PXR_NS::GfMatrix4d) ; - + bbl::Class>("Matrix4dArrayVector") BBL_STD_VECTOR_METHODS(PXR_NS::VtMatrix4dArray) ; - + bbl::Class("Matrix2f") .replace_with() .ctor(bbl::Class::Ctor<>(), "default") @@ -2007,4 +2007,3 @@ BBL_MODULE(gf) { #endif - diff --git a/bind/js.cpp b/bind/js.cpp index a1fce3f0..94517682 100644 --- a/bind/js.cpp +++ b/bind/js.cpp @@ -47,4 +47,4 @@ BBL_MODULE(js) { } -#endif \ No newline at end of file +#endif diff --git a/bind/ndr.cpp b/bind/ndr.cpp index e8f37760..6b51d77d 100644 --- a/bind/ndr.cpp +++ b/bind/ndr.cpp @@ -162,5 +162,3 @@ BBL_MODULE(ndr) { #endif - - diff --git a/bind/pcp.cpp b/bind/pcp.cpp index 42304e0a..8ec7eef5 100644 --- a/bind/pcp.cpp +++ b/bind/pcp.cpp @@ -742,4 +742,3 @@ BBL_MODULE(pcp) { #endif - diff --git a/bind/sdf.cpp b/bind/sdf.cpp index 8470cb83..d2d891cd 100644 --- a/bind/sdf.cpp +++ b/bind/sdf.cpp @@ -398,7 +398,7 @@ BBL_MODULE(sdf) { BBL_STD_VECTOR_METHODS(PXR_NS::SdfAttributeSpecHandle) ; - + /// XXX: what's this bbl::Class("AttributeSpecView"); @@ -843,7 +843,7 @@ BBL_MODULE(sdf) { BBL_STD_VECTOR_METHODS(PXR_NS::SdfNamespaceEdit) ; - + bbl::Class("NamespaceEditDetail") .ctor(bbl::Class::Ctor<>(), "default") ; @@ -1460,7 +1460,7 @@ BBL_MODULE(sdf) { bbl::Class>("RelationshipSpecHandleOffsetPair") ; - bbl::Class>>( "RelationshipSpecHandleOffsetPairVector") + bbl::Class>>( "RelationshipSpecHandleOffsetPairVector") BBL_STD_VECTOR_METHODS((std::pair)) ; @@ -1683,13 +1683,13 @@ BBL_MODULE(sdf) { .m(&PXR_NS::SdfVariantSpec::GetVariantSets) .m(&PXR_NS::SdfVariantSpec::GetVariantNames) ; - + bbl::Class("VariantSpecHandle"); bbl::Class("VariantSpecHandleVector") BBL_STD_VECTOR_METHODS(PXR_NS::SdfVariantSpecHandle) ; - + bbl::Class("VariantView"); } diff --git a/bind/sdr.cpp b/bind/sdr.cpp index ce4ef2c4..0917bcd0 100644 --- a/bind/sdr.cpp +++ b/bind/sdr.cpp @@ -79,5 +79,3 @@ BBL_MODULE(sdr) { #endif - - diff --git a/bind/std.cpp b/bind/std.cpp index fc7a23f0..3b95c7a8 100644 --- a/bind/std.cpp +++ b/bind/std.cpp @@ -38,9 +38,8 @@ BBL_MODULE(std) { bbl::Class>("DoublePair"); bbl::Class>("FloatPair"); - + } #endif - diff --git a/bind/tf.cpp b/bind/tf.cpp index cb8eb317..9bcd7d81 100644 --- a/bind/tf.cpp +++ b/bind/tf.cpp @@ -79,4 +79,3 @@ BBL_MODULE(tf) { #endif - diff --git a/bind/usd.cpp b/bind/usd.cpp index bb7faf09..da104fac 100644 --- a/bind/usd.cpp +++ b/bind/usd.cpp @@ -472,47 +472,47 @@ BBL_MODULE(usd) { bbl::Class("Attribute") .ctor(bbl::Class::Ctor<>(), "default") - .m(&PXR_NS::UsdAttribute::GetVariability) - .m(&PXR_NS::UsdAttribute::SetVariability) - .m(&PXR_NS::UsdAttribute::GetTypeName) - .m(&PXR_NS::UsdAttribute::SetTypeName) - .m(&PXR_NS::UsdAttribute::GetRoleName) - .m(&PXR_NS::UsdAttribute::AddConnection) - .m(&PXR_NS::UsdAttribute::RemoveConnection) - .m(&PXR_NS::UsdAttribute::SetConnections) - .m(&PXR_NS::UsdAttribute::ClearConnections) - .m(&PXR_NS::UsdAttribute::GetConnections) - .m(&PXR_NS::UsdAttribute::HasAuthoredConnections) - .m(&PXR_NS::UsdAttribute::GetColorSpace) - .m(&PXR_NS::UsdAttribute::SetColorSpace) - .m(&PXR_NS::UsdAttribute::HasColorSpace) - .m(&PXR_NS::UsdAttribute::ClearColorSpace) - .m(&PXR_NS::UsdAttribute::GetTimeSamples) - .m(&PXR_NS::UsdAttribute::GetTimeSamplesInInterval) - .m(&PXR_NS::UsdAttribute::GetNumTimeSamples) - .m(&PXR_NS::UsdAttribute::GetBracketingTimeSamples) - .m(&PXR_NS::UsdAttribute::HasValue) - .m(&PXR_NS::UsdAttribute::HasAuthoredValueOpinion) - .m(&PXR_NS::UsdAttribute::HasAuthoredValue) - .m(&PXR_NS::UsdAttribute::HasFallbackValue) - .m(&PXR_NS::UsdAttribute::ValueMightBeTimeVarying) - .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue*, PXR_NS::UsdTimeCode) const) + .m(&PXR_NS::UsdAttribute::GetVariability) + .m(&PXR_NS::UsdAttribute::SetVariability) + .m(&PXR_NS::UsdAttribute::GetTypeName) + .m(&PXR_NS::UsdAttribute::SetTypeName) + .m(&PXR_NS::UsdAttribute::GetRoleName) + .m(&PXR_NS::UsdAttribute::AddConnection) + .m(&PXR_NS::UsdAttribute::RemoveConnection) + .m(&PXR_NS::UsdAttribute::SetConnections) + .m(&PXR_NS::UsdAttribute::ClearConnections) + .m(&PXR_NS::UsdAttribute::GetConnections) + .m(&PXR_NS::UsdAttribute::HasAuthoredConnections) + .m(&PXR_NS::UsdAttribute::GetColorSpace) + .m(&PXR_NS::UsdAttribute::SetColorSpace) + .m(&PXR_NS::UsdAttribute::HasColorSpace) + .m(&PXR_NS::UsdAttribute::ClearColorSpace) + .m(&PXR_NS::UsdAttribute::GetTimeSamples) + .m(&PXR_NS::UsdAttribute::GetTimeSamplesInInterval) + .m(&PXR_NS::UsdAttribute::GetNumTimeSamples) + .m(&PXR_NS::UsdAttribute::GetBracketingTimeSamples) + .m(&PXR_NS::UsdAttribute::HasValue) + .m(&PXR_NS::UsdAttribute::HasAuthoredValueOpinion) + .m(&PXR_NS::UsdAttribute::HasAuthoredValue) + .m(&PXR_NS::UsdAttribute::HasFallbackValue) + .m(&PXR_NS::UsdAttribute::ValueMightBeTimeVarying) + .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue*, PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::Get - ) - .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)(PXR_NS::UsdTimeCode) const) + ) + .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)(PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::GetResolveInfo, "GetResolveInfo_at_time" ) - .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)() const) + .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)() const) &PXR_NS::UsdAttribute::GetResolveInfo - ) - .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue const&, PXR_NS::UsdTimeCode) const) + ) + .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue const&, PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::Set - ) - .m(&PXR_NS::UsdAttribute::Clear) - .m(&PXR_NS::UsdAttribute::ClearAtTime) - .m(&PXR_NS::UsdAttribute::ClearDefault) - .m(&PXR_NS::UsdAttribute::Block) - .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamples) + ) + .m(&PXR_NS::UsdAttribute::Clear) + .m(&PXR_NS::UsdAttribute::ClearAtTime) + .m(&PXR_NS::UsdAttribute::ClearDefault) + .m(&PXR_NS::UsdAttribute::Block) + .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamples) .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamplesInInterval) ; @@ -530,65 +530,65 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdObject::As, "As_Relationship") .m(&PXR_NS::UsdObject::As, "As_Property") .m(&PXR_NS::UsdObject::As, "As_Prim") - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue*) const) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue*) const) &PXR_NS::UsdObject::GetMetadata, "GetMetadata_value" ) - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) &PXR_NS::UsdObject::SetMetadata, "SetMetadata_value" ) - .m(&PXR_NS::UsdObject::ClearMetadata) - .m(&PXR_NS::UsdObject::HasMetadata) - .m(&PXR_NS::UsdObject::HasAuthoredMetadata) - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue*) const) + .m(&PXR_NS::UsdObject::ClearMetadata) + .m(&PXR_NS::UsdObject::HasMetadata) + .m(&PXR_NS::UsdObject::HasAuthoredMetadata) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue*) const) &PXR_NS::UsdObject::GetMetadataByDictKey, "GetMetadataByDictKey_value" ) .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) &PXR_NS::UsdObject::SetMetadataByDictKey, "SetMetadataByDictKey_value" - ) - .m(&PXR_NS::UsdObject::ClearMetadataByDictKey) - .m(&PXR_NS::UsdObject::HasMetadataDictKey) - .m(&PXR_NS::UsdObject::HasAuthoredMetadataDictKey) - .m(&PXR_NS::UsdObject::GetAllMetadata) - .m(&PXR_NS::UsdObject::GetAllAuthoredMetadata) - .m(&PXR_NS::UsdObject::IsHidden) - .m(&PXR_NS::UsdObject::SetHidden) - .m(&PXR_NS::UsdObject::ClearHidden) - .m(&PXR_NS::UsdObject::HasAuthoredHidden) - .m(&PXR_NS::UsdObject::GetCustomData) - .m(&PXR_NS::UsdObject::GetCustomDataByKey) - .m(&PXR_NS::UsdObject::SetCustomData) - .m(&PXR_NS::UsdObject::SetCustomDataByKey) - .m(&PXR_NS::UsdObject::ClearCustomData) - .m(&PXR_NS::UsdObject::ClearCustomDataByKey) - .m(&PXR_NS::UsdObject::HasCustomData) - .m(&PXR_NS::UsdObject::HasCustomDataKey) - .m(&PXR_NS::UsdObject::HasAuthoredCustomData) - .m(&PXR_NS::UsdObject::HasAuthoredCustomDataKey) - .m(&PXR_NS::UsdObject::GetAssetInfo) - .m(&PXR_NS::UsdObject::GetAssetInfoByKey) - .m(&PXR_NS::UsdObject::SetAssetInfo) - .m(&PXR_NS::UsdObject::SetAssetInfoByKey) - .m(&PXR_NS::UsdObject::ClearAssetInfo) - .m(&PXR_NS::UsdObject::ClearAssetInfoByKey) - .m(&PXR_NS::UsdObject::HasAssetInfo) - .m(&PXR_NS::UsdObject::HasAssetInfoKey) - .m(&PXR_NS::UsdObject::HasAuthoredAssetInfo) - .m(&PXR_NS::UsdObject::HasAuthoredAssetInfoKey) - .m(&PXR_NS::UsdObject::GetDocumentation) - .m(&PXR_NS::UsdObject::SetDocumentation) - .m(&PXR_NS::UsdObject::ClearDocumentation) - .m(&PXR_NS::UsdObject::HasAuthoredDocumentation) - .m(&PXR_NS::UsdObject::GetDisplayName) - .m(&PXR_NS::UsdObject::SetDisplayName) - .m(&PXR_NS::UsdObject::ClearDisplayName) - .m(&PXR_NS::UsdObject::HasAuthoredDisplayName) - .m(&PXR_NS::UsdObject::IsValid) - .m(&PXR_NS::UsdObject::GetStage) - .m(&PXR_NS::UsdObject::GetPath) - .m(&PXR_NS::UsdObject::GetPrimPath) - .m(&PXR_NS::UsdObject::GetPrim) - .m(&PXR_NS::UsdObject::GetName) - .m(&PXR_NS::UsdObject::GetNamespaceDelimiter) + ) + .m(&PXR_NS::UsdObject::ClearMetadataByDictKey) + .m(&PXR_NS::UsdObject::HasMetadataDictKey) + .m(&PXR_NS::UsdObject::HasAuthoredMetadataDictKey) + .m(&PXR_NS::UsdObject::GetAllMetadata) + .m(&PXR_NS::UsdObject::GetAllAuthoredMetadata) + .m(&PXR_NS::UsdObject::IsHidden) + .m(&PXR_NS::UsdObject::SetHidden) + .m(&PXR_NS::UsdObject::ClearHidden) + .m(&PXR_NS::UsdObject::HasAuthoredHidden) + .m(&PXR_NS::UsdObject::GetCustomData) + .m(&PXR_NS::UsdObject::GetCustomDataByKey) + .m(&PXR_NS::UsdObject::SetCustomData) + .m(&PXR_NS::UsdObject::SetCustomDataByKey) + .m(&PXR_NS::UsdObject::ClearCustomData) + .m(&PXR_NS::UsdObject::ClearCustomDataByKey) + .m(&PXR_NS::UsdObject::HasCustomData) + .m(&PXR_NS::UsdObject::HasCustomDataKey) + .m(&PXR_NS::UsdObject::HasAuthoredCustomData) + .m(&PXR_NS::UsdObject::HasAuthoredCustomDataKey) + .m(&PXR_NS::UsdObject::GetAssetInfo) + .m(&PXR_NS::UsdObject::GetAssetInfoByKey) + .m(&PXR_NS::UsdObject::SetAssetInfo) + .m(&PXR_NS::UsdObject::SetAssetInfoByKey) + .m(&PXR_NS::UsdObject::ClearAssetInfo) + .m(&PXR_NS::UsdObject::ClearAssetInfoByKey) + .m(&PXR_NS::UsdObject::HasAssetInfo) + .m(&PXR_NS::UsdObject::HasAssetInfoKey) + .m(&PXR_NS::UsdObject::HasAuthoredAssetInfo) + .m(&PXR_NS::UsdObject::HasAuthoredAssetInfoKey) + .m(&PXR_NS::UsdObject::GetDocumentation) + .m(&PXR_NS::UsdObject::SetDocumentation) + .m(&PXR_NS::UsdObject::ClearDocumentation) + .m(&PXR_NS::UsdObject::HasAuthoredDocumentation) + .m(&PXR_NS::UsdObject::GetDisplayName) + .m(&PXR_NS::UsdObject::SetDisplayName) + .m(&PXR_NS::UsdObject::ClearDisplayName) + .m(&PXR_NS::UsdObject::HasAuthoredDisplayName) + .m(&PXR_NS::UsdObject::IsValid) + .m(&PXR_NS::UsdObject::GetStage) + .m(&PXR_NS::UsdObject::GetPath) + .m(&PXR_NS::UsdObject::GetPrimPath) + .m(&PXR_NS::UsdObject::GetPrim) + .m(&PXR_NS::UsdObject::GetName) + .m(&PXR_NS::UsdObject::GetNamespaceDelimiter) .m(&PXR_NS::UsdObject::GetDescription) ; @@ -629,10 +629,10 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::GetAuthoredPropertyNames) .m(&PXR_NS::UsdPrim::GetProperties, "GetProperties_matching_predicate") .m(&PXR_NS::UsdPrim::GetAuthoredProperties, "GetAuthoredProperties_matching_predicate") - .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) + .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) &PXR_NS::UsdPrim::GetPropertiesInNamespace ) - .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) + .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) &PXR_NS::UsdPrim::GetAuthoredPropertiesInNamespace ) .m(&PXR_NS::UsdPrim::GetPropertyOrder) @@ -645,55 +645,55 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::RemoveAppliedSchema) // IsA - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::IsA ) // methods can be renamed to give useful names to overloads - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion) const) &PXR_NS::UsdPrim::IsA, "IsA_with_version" ) // IsInFamily - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::IsInFamily ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_policy" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_policy_and_version" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_type" ) .m(&PXR_NS::UsdPrim::GetVersionIfIsInFamily) // HasAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::HasAPI ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_instance_name" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_schema_identifier" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_instance_name_and_schema_identifier" ) // HasAPIInFamily - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_instance" ) - .m((bool(PXR_NS::UsdPrim::*)( PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)( PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_version" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_version_and_instance" ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -715,14 +715,14 @@ BBL_MODULE(usd) { // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, // PXR_NS::UsdSchemaVersion*) const) & // PXR_NS::UsdPrim::GetVersionIfHasAPIInFamily) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion*) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion*) const) &PXR_NS::UsdPrim::GetVersionIfHasAPIInFamily ) // CanApplyAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, std::string*) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, std::string*) const) &PXR_NS::UsdPrim::CanApplyAPI - ) + ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, // PXR_NS::TfToken const&, std::string*) // const) & @@ -740,7 +740,7 @@ BBL_MODULE(usd) { // PXR_NS::UsdPrim::CanApplyAPI) // ApplyAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::ApplyAPI ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -760,7 +760,7 @@ BBL_MODULE(usd) { // PXR_NS::UsdPrim::ApplyAPI) // RemoveAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::RemoveAPI ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -812,7 +812,7 @@ BBL_MODULE(usd) { // Attributes // We'll only do one of these create methods as the rest are for // convenience, and we should do convenience on the FFI side - .m((PXR_NS::UsdAttribute(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::SdfValueTypeName const&, bool, PXR_NS::SdfVariability) const) + .m((PXR_NS::UsdAttribute(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::SdfValueTypeName const&, bool, PXR_NS::SdfVariability) const) &PXR_NS::UsdPrim::CreateAttribute ) .m(&PXR_NS::UsdPrim::GetAttributes) @@ -822,7 +822,7 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::FindAllAttributeConnectionPaths) // Relationships - .m((PXR_NS::UsdRelationship(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, bool) const) + .m((PXR_NS::UsdRelationship(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, bool) const) &PXR_NS::UsdPrim::CreateRelationship ) .m(&PXR_NS::UsdPrim::GetRelationships) @@ -890,29 +890,29 @@ BBL_MODULE(usd) { bbl::Class("Property") .ctor(bbl::Class::Ctor<>(), "default") - .m(&PXR_NS::UsdProperty::GetPropertyStack) - .m(&PXR_NS::UsdProperty::GetPropertyStackWithLayerOffsets) - .m(&PXR_NS::UsdProperty::GetBaseName) - .m(&PXR_NS::UsdProperty::GetNamespace) - .m(&PXR_NS::UsdProperty::SplitName) - .m(&PXR_NS::UsdProperty::GetDisplayGroup) - .m(&PXR_NS::UsdProperty::SetDisplayGroup) - .m(&PXR_NS::UsdProperty::ClearDisplayGroup) - .m(&PXR_NS::UsdProperty::HasAuthoredDisplayGroup) - .m(&PXR_NS::UsdProperty::GetNestedDisplayGroups) - .m(&PXR_NS::UsdProperty::SetNestedDisplayGroups) - .m(&PXR_NS::UsdProperty::IsCustom) - .m(&PXR_NS::UsdProperty::SetCustom) - .m(&PXR_NS::UsdProperty::IsDefined) - .m(&PXR_NS::UsdProperty::IsAuthored) - .m(&PXR_NS::UsdProperty::IsAuthoredAt) - .m((PXR_NS::UsdProperty (PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&) const) + .m(&PXR_NS::UsdProperty::GetPropertyStack) + .m(&PXR_NS::UsdProperty::GetPropertyStackWithLayerOffsets) + .m(&PXR_NS::UsdProperty::GetBaseName) + .m(&PXR_NS::UsdProperty::GetNamespace) + .m(&PXR_NS::UsdProperty::SplitName) + .m(&PXR_NS::UsdProperty::GetDisplayGroup) + .m(&PXR_NS::UsdProperty::SetDisplayGroup) + .m(&PXR_NS::UsdProperty::ClearDisplayGroup) + .m(&PXR_NS::UsdProperty::HasAuthoredDisplayGroup) + .m(&PXR_NS::UsdProperty::GetNestedDisplayGroups) + .m(&PXR_NS::UsdProperty::SetNestedDisplayGroups) + .m(&PXR_NS::UsdProperty::IsCustom) + .m(&PXR_NS::UsdProperty::SetCustom) + .m(&PXR_NS::UsdProperty::IsDefined) + .m(&PXR_NS::UsdProperty::IsAuthored) + .m(&PXR_NS::UsdProperty::IsAuthoredAt) + .m((PXR_NS::UsdProperty (PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&) const) &PXR_NS::UsdProperty::FlattenTo, "FlattenTo_prim" - ) + ) .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&, PXR_NS::TfToken const&) const) & PXR_NS::UsdProperty::FlattenTo, "FlattenTo_named_property" - ) - .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdProperty const&) const) + ) + .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdProperty const&) const) &PXR_NS::UsdProperty::FlattenTo, "FlattenTo_property" ) ; @@ -984,16 +984,16 @@ BBL_MODULE(usd) { // Arc editing .m(&PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingLayer) .m(&PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingPrimPath) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfReferenceEditorProxy*, PXR_NS::SdfReference*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfReferenceEditorProxy*, PXR_NS::SdfReference*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_reference" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfPayloadEditorProxy*, PXR_NS::SdfPayload*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfPayloadEditorProxy*, PXR_NS::SdfPayload*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_payload" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)( PXR_NS::SdfPathEditorProxy*, PXR_NS::SdfPath*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)( PXR_NS::SdfPathEditorProxy*, PXR_NS::SdfPath*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_path" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfNameEditorProxy*, std::string*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfNameEditorProxy*, std::string*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_name" ) @@ -1048,13 +1048,13 @@ BBL_MODULE(usd) { // GetPropertyMetadata // GetPropertyMetadataByDictKey .m(&PXR_NS::UsdPrimDefinition::GetPropertyDocumentation) - .m((bool(PXR_NS::UsdPrimDefinition::*)(PXR_NS::SdfLayerHandle const&, PXR_NS::SdfPath const&, PXR_NS::SdfSpecifier) const) + .m((bool(PXR_NS::UsdPrimDefinition::*)(PXR_NS::SdfLayerHandle const&, PXR_NS::SdfPath const&, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo ) - .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::TfToken const& name, PXR_NS::SdfSpecifier) const) + .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::TfToken const& name, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo, "FlattenTo_prim_under_parent" ) - .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::SdfSpecifier) const) + .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo, "FlattenTo_prim" ) ; @@ -1109,7 +1109,7 @@ BBL_MODULE(usd) { .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&)) &PXR_NS::UsdPrimRange::iterator::operator=, "op_assign" ) - .m((bool(PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&) const) + .m((bool(PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&) const) &PXR_NS::UsdPrimRange::iterator::operator==, "op_eq" ) .m(&PXR_NS::UsdPrimRange::iterator::operator*, "deref"); @@ -1331,7 +1331,7 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdStage::SetLoadRules) .m(&PXR_NS::UsdStage::GetPopulationMask) .m(&PXR_NS::UsdStage::SetPopulationMask) - .m(&PXR_NS::UsdStage::ExpandPopulationMask) + .m(&PXR_NS::UsdStage::ExpandPopulationMask) // Layers and Edit Targets .m(&PXR_NS::UsdStage::GetSessionLayer) @@ -1711,4 +1711,3 @@ BBL_MODULE(usd) { } #endif - diff --git a/bind/usdGeom.cpp b/bind/usdGeom.cpp index 4e53a9f7..75a3cfd3 100644 --- a/bind/usdGeom.cpp +++ b/bind/usdGeom.cpp @@ -187,12 +187,12 @@ BBL_MODULE(usdGeom) { bbl::Class("Curves") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomCurves::GetCurveVertexCountsAttr) - .m(&PXR_NS::UsdGeomCurves::CreateCurveVertexCountsAttr) - .m(&PXR_NS::UsdGeomCurves::GetWidthsAttr) - .m(&PXR_NS::UsdGeomCurves::CreateWidthsAttr) - .m(&PXR_NS::UsdGeomCurves::GetWidthsInterpolation) - .m(&PXR_NS::UsdGeomCurves::SetWidthsInterpolation) + .m(&PXR_NS::UsdGeomCurves::GetCurveVertexCountsAttr) + .m(&PXR_NS::UsdGeomCurves::CreateCurveVertexCountsAttr) + .m(&PXR_NS::UsdGeomCurves::GetWidthsAttr) + .m(&PXR_NS::UsdGeomCurves::CreateWidthsAttr) + .m(&PXR_NS::UsdGeomCurves::GetWidthsInterpolation) + .m(&PXR_NS::UsdGeomCurves::SetWidthsInterpolation) .m(&PXR_NS::UsdGeomCurves::GetCurveCount) ; @@ -209,15 +209,15 @@ BBL_MODULE(usdGeom) { bbl::Class("Gprim") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomGprim::GetDisplayColorAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorAttr) - .m(&PXR_NS::UsdGeomGprim::GetDisplayOpacityAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDisplayOpacityAttr) - .m(&PXR_NS::UsdGeomGprim::GetDoubleSidedAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDoubleSidedAttr) - .m(&PXR_NS::UsdGeomGprim::GetOrientationAttr) - .m(&PXR_NS::UsdGeomGprim::CreateOrientationAttr) - .m(&PXR_NS::UsdGeomGprim::GetDisplayColorPrimvar) + .m(&PXR_NS::UsdGeomGprim::GetDisplayColorAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorAttr) + .m(&PXR_NS::UsdGeomGprim::GetDisplayOpacityAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDisplayOpacityAttr) + .m(&PXR_NS::UsdGeomGprim::GetDoubleSidedAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDoubleSidedAttr) + .m(&PXR_NS::UsdGeomGprim::GetOrientationAttr) + .m(&PXR_NS::UsdGeomGprim::CreateOrientationAttr) + .m(&PXR_NS::UsdGeomGprim::GetDisplayColorPrimvar) .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorPrimvar) ; @@ -230,28 +230,28 @@ BBL_MODULE(usdGeom) { bbl::Class("Imageable") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomImageable::GetVisibilityAttr) - .m(&PXR_NS::UsdGeomImageable::CreateVisibilityAttr) - .m(&PXR_NS::UsdGeomImageable::GetPurposeAttr) - .m(&PXR_NS::UsdGeomImageable::CreatePurposeAttr) - .m(&PXR_NS::UsdGeomImageable::GetProxyPrimRel) - .m(&PXR_NS::UsdGeomImageable::CreateProxyPrimRel) - .m(&PXR_NS::UsdGeomImageable::MakeVisible) - .m(&PXR_NS::UsdGeomImageable::MakeInvisible) - .m(&PXR_NS::UsdGeomImageable::ComputeVisibility) - .m(&PXR_NS::UsdGeomImageable::GetPurposeVisibilityAttr) - .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)() const) - &PXR_NS::UsdGeomImageable::ComputePurposeInfo) - .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdGeomImageable::PurposeInfo const&) const) - &PXR_NS::UsdGeomImageable::ComputePurposeInfo, "ComputePurposeInfo_given_parent") - .m(&PXR_NS::UsdGeomImageable::ComputePurpose) - .m(&PXR_NS::UsdGeomImageable::ComputeProxyPrim) - .m((bool (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdPrim const&) const) - &PXR_NS::UsdGeomImageable::SetProxyPrim) - .m(&PXR_NS::UsdGeomImageable::ComputeWorldBound) - .m(&PXR_NS::UsdGeomImageable::ComputeLocalBound) - .m(&PXR_NS::UsdGeomImageable::ComputeUntransformedBound) - .m(&PXR_NS::UsdGeomImageable::ComputeLocalToWorldTransform) + .m(&PXR_NS::UsdGeomImageable::GetVisibilityAttr) + .m(&PXR_NS::UsdGeomImageable::CreateVisibilityAttr) + .m(&PXR_NS::UsdGeomImageable::GetPurposeAttr) + .m(&PXR_NS::UsdGeomImageable::CreatePurposeAttr) + .m(&PXR_NS::UsdGeomImageable::GetProxyPrimRel) + .m(&PXR_NS::UsdGeomImageable::CreateProxyPrimRel) + .m(&PXR_NS::UsdGeomImageable::MakeVisible) + .m(&PXR_NS::UsdGeomImageable::MakeInvisible) + .m(&PXR_NS::UsdGeomImageable::ComputeVisibility) + .m(&PXR_NS::UsdGeomImageable::GetPurposeVisibilityAttr) + .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)() const) + &PXR_NS::UsdGeomImageable::ComputePurposeInfo) + .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdGeomImageable::PurposeInfo const&) const) + &PXR_NS::UsdGeomImageable::ComputePurposeInfo, "ComputePurposeInfo_given_parent") + .m(&PXR_NS::UsdGeomImageable::ComputePurpose) + .m(&PXR_NS::UsdGeomImageable::ComputeProxyPrim) + .m((bool (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdPrim const&) const) + &PXR_NS::UsdGeomImageable::SetProxyPrim) + .m(&PXR_NS::UsdGeomImageable::ComputeWorldBound) + .m(&PXR_NS::UsdGeomImageable::ComputeLocalBound) + .m(&PXR_NS::UsdGeomImageable::ComputeUntransformedBound) + .m(&PXR_NS::UsdGeomImageable::ComputeLocalToWorldTransform) .m(&PXR_NS::UsdGeomImageable::ComputeParentToWorldTransform) ; @@ -394,17 +394,17 @@ BBL_MODULE(usdGeom) { bbl::Class("PointBased") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomPointBased::GetPointsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreatePointsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetVelocitiesAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateVelocitiesAttr) - .m(&PXR_NS::UsdGeomPointBased::GetAccelerationsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateAccelerationsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetNormalsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateNormalsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetNormalsInterpolation) - .m(&PXR_NS::UsdGeomPointBased::SetNormalsInterpolation) - .m((bool (PXR_NS::UsdGeomPointBased::*)(PXR_NS::VtArray*, PXR_NS::UsdTimeCode const, PXR_NS::UsdTimeCode const) const) + .m(&PXR_NS::UsdGeomPointBased::GetPointsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreatePointsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetVelocitiesAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateVelocitiesAttr) + .m(&PXR_NS::UsdGeomPointBased::GetAccelerationsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateAccelerationsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetNormalsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateNormalsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetNormalsInterpolation) + .m(&PXR_NS::UsdGeomPointBased::SetNormalsInterpolation) + .m((bool (PXR_NS::UsdGeomPointBased::*)(PXR_NS::VtArray*, PXR_NS::UsdTimeCode const, PXR_NS::UsdTimeCode const) const) &PXR_NS::UsdGeomPointBased::ComputePointsAtTime) ; @@ -442,7 +442,7 @@ BBL_MODULE(usdGeom) { &PXR_NS::UsdGeomPointInstancer::ComputeExtentAtTimes, "ComputeExtentAtTimes_with_transform") .m(&PXR_NS::UsdGeomPointInstancer::GetInstanceCount) ; - + bbl::Enum("ProtoXformInclusion"); bbl::Enum("MaskApplication"); @@ -499,7 +499,7 @@ BBL_MODULE(usdGeom) { bbl::Class>("PrimvarVector") BBL_STD_VECTOR_METHODS(PXR_NS::UsdGeomPrimvar) ; - + bbl::Class("PrimvarsAPI") .ctor(bbl::Class::Ctor(), "new") diff --git a/bind/usdLux.cpp b/bind/usdLux.cpp index 82574a5c..5bf0571a 100644 --- a/bind/usdLux.cpp +++ b/bind/usdLux.cpp @@ -357,5 +357,3 @@ BBL_MODULE(usdLux) { #endif - - diff --git a/bind/usdRender.cpp b/bind/usdRender.cpp index 8c49ed92..7cc12fc1 100644 --- a/bind/usdRender.cpp +++ b/bind/usdRender.cpp @@ -125,5 +125,3 @@ BBL_MODULE(usdRender) { #endif - - diff --git a/bind/usdShade.cpp b/bind/usdShade.cpp index 6b77024c..3a3e52ad 100644 --- a/bind/usdShade.cpp +++ b/bind/usdShade.cpp @@ -619,5 +619,3 @@ BBL_MODULE(usdShade) { #endif - - diff --git a/bind/vt.cpp b/bind/vt.cpp index 96c9e7bf..267ed398 100644 --- a/bind/vt.cpp +++ b/bind/vt.cpp @@ -65,7 +65,7 @@ BBL_MODULE(vt) { ) .m((bool const& (Value::*)() const&) &Value::Get, "Get_bool" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uchar") .m((bool (Value::*)() const) @@ -73,7 +73,7 @@ BBL_MODULE(vt) { ) .m((uint8_t const& (Value::*)() const&) &Value::Get, "Get_uchar" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uint") .m((bool (Value::*)() const) @@ -81,7 +81,7 @@ BBL_MODULE(vt) { ) .m((uint32_t const& (Value::*)() const&) &Value::Get, "Get_uint" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_int") .m((bool (Value::*)() const) @@ -89,7 +89,7 @@ BBL_MODULE(vt) { ) .m((int const& (Value::*)() const&) &Value::Get, "Get_int" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uint64") .m((bool (Value::*)() const) @@ -97,7 +97,7 @@ BBL_MODULE(vt) { ) .m((uint64_t const& (Value::*)() const&) &Value::Get, "Get_uint64" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_int64") .m((bool (Value::*)() const) @@ -105,7 +105,7 @@ BBL_MODULE(vt) { ) .m((int64_t const& (Value::*)() const&) &Value::Get, "Get_int64" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_float") .m((bool (Value::*)() const) @@ -113,7 +113,7 @@ BBL_MODULE(vt) { ) .m((float const& (Value::*)() const&) &Value::Get, "Get_float" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_double") .m((bool (Value::*)() const) @@ -121,7 +121,7 @@ BBL_MODULE(vt) { ) .m((double const& (Value::*)() const&) &Value::Get, "Get_double" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_TfToken") .m((bool (Value::*)() const) @@ -129,7 +129,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::TfToken const& (Value::*)() const&) &Value::Get, "Get_TfToken" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_SdfAssetPath") .m((bool (Value::*)() const) @@ -137,7 +137,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::SdfAssetPath const& (Value::*)() const&) &Value::Get, "Get_SdfAssetPath" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_SdfTimeCode") .m((bool (Value::*)() const) @@ -145,7 +145,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::SdfTimeCode const& (Value::*)() const&) &Value::Get, "Get_SdfTimeCode" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_string") .m((bool (Value::*)() const) @@ -153,7 +153,7 @@ BBL_MODULE(vt) { ) .m((std::string const& (Value::*)() const&) &Value::Get, "Get_string" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2d") .m((bool (Value::*)() const) @@ -161,7 +161,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2d const& (Value::*)() const&) &Value::Get, "Get_GfVec2d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2h") .m((bool (Value::*)() const) @@ -169,7 +169,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2h const& (Value::*)() const&) &Value::Get, "Get_GfVec2h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2f") .m((bool (Value::*)() const) @@ -177,7 +177,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2f const& (Value::*)() const&) &Value::Get, "Get_GfVec2f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2i") .m((bool (Value::*)() const) @@ -185,7 +185,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2i const& (Value::*)() const&) &Value::Get, "Get_GfVec2i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3d") .m((bool (Value::*)() const) @@ -193,7 +193,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3d const& (Value::*)() const&) &Value::Get, "Get_GfVec3d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3h") .m((bool (Value::*)() const) @@ -201,7 +201,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3h const& (Value::*)() const&) &Value::Get, "Get_GfVec3h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3f") .m((bool (Value::*)() const) @@ -209,7 +209,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3f const& (Value::*)() const&) &Value::Get, "Get_GfVec3f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3i") .m((bool (Value::*)() const) @@ -217,7 +217,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3i const& (Value::*)() const&) &Value::Get, "Get_GfVec3i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4d") .m((bool (Value::*)() const) @@ -225,7 +225,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4d const& (Value::*)() const&) &Value::Get, "Get_GfVec4d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4h") .m((bool (Value::*)() const) @@ -233,7 +233,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4h const& (Value::*)() const&) &Value::Get, "Get_GfVec4h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4f") .m((bool (Value::*)() const) @@ -241,7 +241,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4f const& (Value::*)() const&) &Value::Get, "Get_GfVec4f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4i") .m((bool (Value::*)() const) @@ -249,7 +249,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4i const& (Value::*)() const&) &Value::Get, "Get_GfVec4i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuatd") .m((bool (Value::*)() const) @@ -257,7 +257,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuatd const& (Value::*)() const&) &Value::Get, "Get_GfQuatd" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuatf") .m((bool (Value::*)() const) @@ -265,7 +265,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuatf const& (Value::*)() const&) &Value::Get, "Get_GfQuatf" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuath") .m((bool (Value::*)() const) @@ -273,7 +273,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuath const& (Value::*)() const&) &Value::Get, "Get_GfQuath" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix2d") .m((bool (Value::*)() const) @@ -281,7 +281,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix2d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix2d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix2f") .m((bool (Value::*)() const) @@ -289,7 +289,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix2f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix2f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix3d") .m((bool (Value::*)() const) @@ -297,7 +297,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix3d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix3d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix3f") .m((bool (Value::*)() const) @@ -305,7 +305,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix3f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix3f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix4d") .m((bool (Value::*)() const) @@ -313,7 +313,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix4d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix4d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix4f") .m((bool (Value::*)() const) @@ -321,7 +321,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix4f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix4f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtTokenArray") .m((bool (Value::*)() const) @@ -329,7 +329,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtTokenArray const& (Value::*)() const&) &Value::Get, "Get_VtTokenArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtStringArray") .m((bool (Value::*)() const) @@ -337,7 +337,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtStringArray const& (Value::*)() const&) &Value::Get, "Get_VtStringArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtBoolArray") .m((bool (Value::*)() const) @@ -345,7 +345,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtBoolArray const& (Value::*)() const&) &Value::Get, "Get_VtBoolArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUCharArray") .m((bool (Value::*)() const) @@ -353,7 +353,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUCharArray const& (Value::*)() const&) &Value::Get, "Get_VtUCharArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUIntArray") .m((bool (Value::*)() const) @@ -361,7 +361,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUIntArray const& (Value::*)() const&) &Value::Get, "Get_VtUIntArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtIntArray") .m((bool (Value::*)() const) @@ -369,7 +369,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtIntArray const& (Value::*)() const&) &Value::Get, "Get_VtIntArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUInt64Array") .m((bool (Value::*)() const) @@ -377,7 +377,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUInt64Array const& (Value::*)() const&) &Value::Get, "Get_VtUInt64Array" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtInt64Array") .m((bool (Value::*)() const) @@ -385,7 +385,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtInt64Array const& (Value::*)() const&) &Value::Get, "Get_VtInt64Array" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtFloatArray") .m((bool (Value::*)() const) @@ -393,7 +393,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtFloatArray const& (Value::*)() const&) &Value::Get, "Get_VtFloatArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtDoubleArray") .m((bool (Value::*)() const) @@ -401,7 +401,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtDoubleArray const& (Value::*)() const&) &Value::Get, "Get_VtDoubleArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2fArray") .m((bool (Value::*)() const) @@ -409,7 +409,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3fArray") .m((bool (Value::*)() const) @@ -417,7 +417,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4fArray") .m((bool (Value::*)() const) @@ -425,7 +425,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2dArray") .m((bool (Value::*)() const) @@ -433,7 +433,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3dArray") .m((bool (Value::*)() const) @@ -441,7 +441,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4dArray") .m((bool (Value::*)() const) @@ -449,7 +449,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2hArray") .m((bool (Value::*)() const) @@ -457,7 +457,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3hArray") .m((bool (Value::*)() const) @@ -465,7 +465,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4hArray") .m((bool (Value::*)() const) @@ -473,7 +473,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuatfArray") .m((bool (Value::*)() const) @@ -481,7 +481,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuatfArray const& (Value::*)() const&) &Value::Get, "Get_VtQuatfArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuatdArray") .m((bool (Value::*)() const) @@ -489,7 +489,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuatdArray const& (Value::*)() const&) &Value::Get, "Get_VtQuatdArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuathArray") .m((bool (Value::*)() const) @@ -497,7 +497,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuathArray const& (Value::*)() const&) &Value::Get, "Get_VtQuathArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix2dArray") .m((bool (Value::*)() const) @@ -505,7 +505,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix2dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix2dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix3dArray") .m((bool (Value::*)() const) @@ -513,7 +513,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix3dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix3dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix4dArray") .m((bool (Value::*)() const) @@ -521,7 +521,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix4dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix4dArray" - ) + ) ; @@ -576,4 +576,3 @@ BBL_MODULE(vt) { #endif - diff --git a/gen/CMakeLists.txt b/gen/CMakeLists.txt index 0131e415..d2cb402a 100644 --- a/gen/CMakeLists.txt +++ b/gen/CMakeLists.txt @@ -12,12 +12,12 @@ bbl_generate_binding( pxrInternal_v0_23__pxrReserved__ COMPILE_ARGS - -DNOMINMAX - -DBOOST_ALL_NO_LIB + -DNOMINMAX + -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H -D_MT -Wno-deprecated-builtins ) target_link_libraries(openusd-gen PUBLIC usd sdf js usdGeom) -target_compile_definitions(openusd-gen PRIVATE -DNOMINMAX -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H) \ No newline at end of file +target_compile_definitions(openusd-gen PRIVATE -DNOMINMAX -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H) From 41c5ef5415a7d4af4e8c794b2d891e1ab5003dab Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Tue, 6 Feb 2024 09:41:25 +1300 Subject: [PATCH 16/16] Remove whitespace changes --- CMakeLists.txt | 42 +++---- bind/ar.cpp | 1 + bind/gf.cpp | 9 +- bind/js.cpp | 2 +- bind/ndr.cpp | 2 + bind/pcp.cpp | 1 + bind/sdf.cpp | 10 +- bind/sdr.cpp | 2 + bind/std.cpp | 3 +- bind/tf.cpp | 1 + bind/usd.cpp | 279 +++++++++++++++++++++++---------------------- bind/usdGeom.cpp | 100 ++++++++-------- bind/usdLux.cpp | 2 + bind/usdRender.cpp | 2 + bind/usdShade.cpp | 2 + bind/vt.cpp | 117 +++++++++---------- gen/CMakeLists.txt | 6 +- 17 files changed, 299 insertions(+), 282 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98818bf6..d6abf4eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,16 +7,16 @@ find_package(pxr REQUIRED) option(BUILD_EXAMPLE "Build the example program" OFF) # The bindfile contains all our binding definitions -set(bindfiles - bind/ar.cpp - bind/gf.cpp - bind/js.cpp - bind/ndr.cpp - bind/pcp.cpp +set(bindfiles + bind/ar.cpp + bind/gf.cpp + bind/js.cpp + bind/ndr.cpp + bind/pcp.cpp bind/sdf.cpp bind/sdr.cpp bind/std.cpp - bind/tf.cpp + bind/tf.cpp bind/usd.cpp bind/usdGeom.cpp bind/usdLux.cpp @@ -30,20 +30,20 @@ set(bindfiles # libopenusd-c bbl_translate_binding( openusd - BINDFILES + BINDFILES ${bindfiles} - COMPILE_ARGS - -Wno-deprecated-builtins + COMPILE_ARGS + -Wno-deprecated-builtins "-Wno-#pragma-messages" - -DNOMINMAX - -D_MT - -DBOOST_ALL_NO_LIB - -D__TBB_show_deprecation_message_task_H + -DNOMINMAX + -D_MT + -DBOOST_ALL_NO_LIB + -D__TBB_show_deprecation_message_task_H ) target_link_libraries( - openusd-c - PUBLIC + openusd-c + PUBLIC ${PXR_LIBRARIES} ) @@ -70,14 +70,14 @@ target_compile_options(bind-dummy PRIVATE $) install( - TARGETS + TARGETS openusd-c - LIBRARY + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - INCLUDES + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) diff --git a/bind/ar.cpp b/bind/ar.cpp index 4c615941..a7f735a3 100644 --- a/bind/ar.cpp +++ b/bind/ar.cpp @@ -332,3 +332,4 @@ BBL_MODULE(ar) { #endif + diff --git a/bind/gf.cpp b/bind/gf.cpp index 3c4c75b9..9ac9040c 100644 --- a/bind/gf.cpp +++ b/bind/gf.cpp @@ -208,12 +208,12 @@ struct Rotation { BBL_MODULE(gf) { // clang-format off - // We don't bind methods for simple classes like this and will poke at the members directly or build that + // We don't bind methods for simple classes like this and will poke at the members directly or build that // functionality in higher-level language bindings bbl::Class("Vec2f") .replace_with() ; - + bbl::Class>("Vec2fArray") VTARRAY_METHODS(PXR_NS::GfVec2f) ; @@ -909,11 +909,11 @@ BBL_MODULE(gf) { bbl::Class>("Matrix4dArray") VTARRAY_METHODS(PXR_NS::GfMatrix4d) ; - + bbl::Class>("Matrix4dArrayVector") BBL_STD_VECTOR_METHODS(PXR_NS::VtMatrix4dArray) ; - + bbl::Class("Matrix2f") .replace_with() .ctor(bbl::Class::Ctor<>(), "default") @@ -2007,3 +2007,4 @@ BBL_MODULE(gf) { #endif + diff --git a/bind/js.cpp b/bind/js.cpp index 94517682..a1fce3f0 100644 --- a/bind/js.cpp +++ b/bind/js.cpp @@ -47,4 +47,4 @@ BBL_MODULE(js) { } -#endif +#endif \ No newline at end of file diff --git a/bind/ndr.cpp b/bind/ndr.cpp index 6b51d77d..e8f37760 100644 --- a/bind/ndr.cpp +++ b/bind/ndr.cpp @@ -162,3 +162,5 @@ BBL_MODULE(ndr) { #endif + + diff --git a/bind/pcp.cpp b/bind/pcp.cpp index 8ec7eef5..42304e0a 100644 --- a/bind/pcp.cpp +++ b/bind/pcp.cpp @@ -742,3 +742,4 @@ BBL_MODULE(pcp) { #endif + diff --git a/bind/sdf.cpp b/bind/sdf.cpp index a9d53066..6cd53540 100644 --- a/bind/sdf.cpp +++ b/bind/sdf.cpp @@ -412,7 +412,7 @@ BBL_MODULE(sdf) { BBL_STD_VECTOR_METHODS(PXR_NS::SdfAttributeSpecHandle) ; - + /// XXX: what's this bbl::Class("AttributeSpecView"); @@ -868,7 +868,7 @@ BBL_MODULE(sdf) { BBL_STD_VECTOR_METHODS(PXR_NS::SdfNamespaceEdit) ; - + bbl::Class("NamespaceEditDetail") .ctor(bbl::Class::Ctor<>(), "default") ; @@ -1485,7 +1485,7 @@ BBL_MODULE(sdf) { bbl::Class>("RelationshipSpecHandleOffsetPair") ; - bbl::Class>>( "RelationshipSpecHandleOffsetPairVector") + bbl::Class>>( "RelationshipSpecHandleOffsetPairVector") BBL_STD_VECTOR_METHODS((std::pair)) ; @@ -1708,13 +1708,13 @@ BBL_MODULE(sdf) { .m(&PXR_NS::SdfVariantSpec::GetVariantSets) .m(&PXR_NS::SdfVariantSpec::GetVariantNames) ; - + bbl::Class("VariantSpecHandle"); bbl::Class("VariantSpecHandleVector") BBL_STD_VECTOR_METHODS(PXR_NS::SdfVariantSpecHandle) ; - + bbl::Class("VariantView"); } diff --git a/bind/sdr.cpp b/bind/sdr.cpp index 0917bcd0..ce4ef2c4 100644 --- a/bind/sdr.cpp +++ b/bind/sdr.cpp @@ -79,3 +79,5 @@ BBL_MODULE(sdr) { #endif + + diff --git a/bind/std.cpp b/bind/std.cpp index 76bb4908..0f812527 100644 --- a/bind/std.cpp +++ b/bind/std.cpp @@ -44,8 +44,9 @@ BBL_MODULE(std) { bbl::Class>("DoublePair"); bbl::Class>("FloatPair"); - + } #endif + diff --git a/bind/tf.cpp b/bind/tf.cpp index 9bcd7d81..cb8eb317 100644 --- a/bind/tf.cpp +++ b/bind/tf.cpp @@ -79,3 +79,4 @@ BBL_MODULE(tf) { #endif + diff --git a/bind/usd.cpp b/bind/usd.cpp index d04f80fd..73310fd1 100644 --- a/bind/usd.cpp +++ b/bind/usd.cpp @@ -473,47 +473,47 @@ BBL_MODULE(usd) { bbl::Class("Attribute") .ctor(bbl::Class::Ctor<>(), "default") - .m(&PXR_NS::UsdAttribute::GetVariability) - .m(&PXR_NS::UsdAttribute::SetVariability) - .m(&PXR_NS::UsdAttribute::GetTypeName) - .m(&PXR_NS::UsdAttribute::SetTypeName) - .m(&PXR_NS::UsdAttribute::GetRoleName) - .m(&PXR_NS::UsdAttribute::AddConnection) - .m(&PXR_NS::UsdAttribute::RemoveConnection) - .m(&PXR_NS::UsdAttribute::SetConnections) - .m(&PXR_NS::UsdAttribute::ClearConnections) - .m(&PXR_NS::UsdAttribute::GetConnections) - .m(&PXR_NS::UsdAttribute::HasAuthoredConnections) - .m(&PXR_NS::UsdAttribute::GetColorSpace) - .m(&PXR_NS::UsdAttribute::SetColorSpace) - .m(&PXR_NS::UsdAttribute::HasColorSpace) - .m(&PXR_NS::UsdAttribute::ClearColorSpace) - .m(&PXR_NS::UsdAttribute::GetTimeSamples) - .m(&PXR_NS::UsdAttribute::GetTimeSamplesInInterval) - .m(&PXR_NS::UsdAttribute::GetNumTimeSamples) - .m(&PXR_NS::UsdAttribute::GetBracketingTimeSamples) - .m(&PXR_NS::UsdAttribute::HasValue) - .m(&PXR_NS::UsdAttribute::HasAuthoredValueOpinion) - .m(&PXR_NS::UsdAttribute::HasAuthoredValue) - .m(&PXR_NS::UsdAttribute::HasFallbackValue) - .m(&PXR_NS::UsdAttribute::ValueMightBeTimeVarying) - .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue*, PXR_NS::UsdTimeCode) const) + .m(&PXR_NS::UsdAttribute::GetVariability) + .m(&PXR_NS::UsdAttribute::SetVariability) + .m(&PXR_NS::UsdAttribute::GetTypeName) + .m(&PXR_NS::UsdAttribute::SetTypeName) + .m(&PXR_NS::UsdAttribute::GetRoleName) + .m(&PXR_NS::UsdAttribute::AddConnection) + .m(&PXR_NS::UsdAttribute::RemoveConnection) + .m(&PXR_NS::UsdAttribute::SetConnections) + .m(&PXR_NS::UsdAttribute::ClearConnections) + .m(&PXR_NS::UsdAttribute::GetConnections) + .m(&PXR_NS::UsdAttribute::HasAuthoredConnections) + .m(&PXR_NS::UsdAttribute::GetColorSpace) + .m(&PXR_NS::UsdAttribute::SetColorSpace) + .m(&PXR_NS::UsdAttribute::HasColorSpace) + .m(&PXR_NS::UsdAttribute::ClearColorSpace) + .m(&PXR_NS::UsdAttribute::GetTimeSamples) + .m(&PXR_NS::UsdAttribute::GetTimeSamplesInInterval) + .m(&PXR_NS::UsdAttribute::GetNumTimeSamples) + .m(&PXR_NS::UsdAttribute::GetBracketingTimeSamples) + .m(&PXR_NS::UsdAttribute::HasValue) + .m(&PXR_NS::UsdAttribute::HasAuthoredValueOpinion) + .m(&PXR_NS::UsdAttribute::HasAuthoredValue) + .m(&PXR_NS::UsdAttribute::HasFallbackValue) + .m(&PXR_NS::UsdAttribute::ValueMightBeTimeVarying) + .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue*, PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::Get - ) - .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)(PXR_NS::UsdTimeCode) const) + ) + .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)(PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::GetResolveInfo, "GetResolveInfo_at_time" ) - .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)() const) + .m((PXR_NS::UsdResolveInfo(PXR_NS::UsdAttribute::*)() const) &PXR_NS::UsdAttribute::GetResolveInfo - ) - .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue const&, PXR_NS::UsdTimeCode) const) + ) + .m((bool(PXR_NS::UsdAttribute::*)(PXR_NS::VtValue const&, PXR_NS::UsdTimeCode) const) &PXR_NS::UsdAttribute::Set - ) - .m(&PXR_NS::UsdAttribute::Clear) - .m(&PXR_NS::UsdAttribute::ClearAtTime) - .m(&PXR_NS::UsdAttribute::ClearDefault) - .m(&PXR_NS::UsdAttribute::Block) - .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamples) + ) + .m(&PXR_NS::UsdAttribute::Clear) + .m(&PXR_NS::UsdAttribute::ClearAtTime) + .m(&PXR_NS::UsdAttribute::ClearDefault) + .m(&PXR_NS::UsdAttribute::Block) + .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamples) .m(&PXR_NS::UsdAttribute::GetUnionedTimeSamplesInInterval) ; @@ -531,65 +531,65 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdObject::As, "As_Relationship") .m(&PXR_NS::UsdObject::As, "As_Property") .m(&PXR_NS::UsdObject::As, "As_Prim") - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue*) const) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue*) const) &PXR_NS::UsdObject::GetMetadata, "GetMetadata_value" ) - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) &PXR_NS::UsdObject::SetMetadata, "SetMetadata_value" ) - .m(&PXR_NS::UsdObject::ClearMetadata) - .m(&PXR_NS::UsdObject::HasMetadata) - .m(&PXR_NS::UsdObject::HasAuthoredMetadata) - .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue*) const) + .m(&PXR_NS::UsdObject::ClearMetadata) + .m(&PXR_NS::UsdObject::HasMetadata) + .m(&PXR_NS::UsdObject::HasAuthoredMetadata) + .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue*) const) &PXR_NS::UsdObject::GetMetadataByDictKey, "GetMetadataByDictKey_value" ) .m((bool(PXR_NS::UsdObject::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::VtValue const&) const) &PXR_NS::UsdObject::SetMetadataByDictKey, "SetMetadataByDictKey_value" - ) - .m(&PXR_NS::UsdObject::ClearMetadataByDictKey) - .m(&PXR_NS::UsdObject::HasMetadataDictKey) - .m(&PXR_NS::UsdObject::HasAuthoredMetadataDictKey) - .m(&PXR_NS::UsdObject::GetAllMetadata) - .m(&PXR_NS::UsdObject::GetAllAuthoredMetadata) - .m(&PXR_NS::UsdObject::IsHidden) - .m(&PXR_NS::UsdObject::SetHidden) - .m(&PXR_NS::UsdObject::ClearHidden) - .m(&PXR_NS::UsdObject::HasAuthoredHidden) - .m(&PXR_NS::UsdObject::GetCustomData) - .m(&PXR_NS::UsdObject::GetCustomDataByKey) - .m(&PXR_NS::UsdObject::SetCustomData) - .m(&PXR_NS::UsdObject::SetCustomDataByKey) - .m(&PXR_NS::UsdObject::ClearCustomData) - .m(&PXR_NS::UsdObject::ClearCustomDataByKey) - .m(&PXR_NS::UsdObject::HasCustomData) - .m(&PXR_NS::UsdObject::HasCustomDataKey) - .m(&PXR_NS::UsdObject::HasAuthoredCustomData) - .m(&PXR_NS::UsdObject::HasAuthoredCustomDataKey) - .m(&PXR_NS::UsdObject::GetAssetInfo) - .m(&PXR_NS::UsdObject::GetAssetInfoByKey) - .m(&PXR_NS::UsdObject::SetAssetInfo) - .m(&PXR_NS::UsdObject::SetAssetInfoByKey) - .m(&PXR_NS::UsdObject::ClearAssetInfo) - .m(&PXR_NS::UsdObject::ClearAssetInfoByKey) - .m(&PXR_NS::UsdObject::HasAssetInfo) - .m(&PXR_NS::UsdObject::HasAssetInfoKey) - .m(&PXR_NS::UsdObject::HasAuthoredAssetInfo) - .m(&PXR_NS::UsdObject::HasAuthoredAssetInfoKey) - .m(&PXR_NS::UsdObject::GetDocumentation) - .m(&PXR_NS::UsdObject::SetDocumentation) - .m(&PXR_NS::UsdObject::ClearDocumentation) - .m(&PXR_NS::UsdObject::HasAuthoredDocumentation) - .m(&PXR_NS::UsdObject::GetDisplayName) - .m(&PXR_NS::UsdObject::SetDisplayName) - .m(&PXR_NS::UsdObject::ClearDisplayName) - .m(&PXR_NS::UsdObject::HasAuthoredDisplayName) - .m(&PXR_NS::UsdObject::IsValid) - .m(&PXR_NS::UsdObject::GetStage) - .m(&PXR_NS::UsdObject::GetPath) - .m(&PXR_NS::UsdObject::GetPrimPath) - .m(&PXR_NS::UsdObject::GetPrim) - .m(&PXR_NS::UsdObject::GetName) - .m(&PXR_NS::UsdObject::GetNamespaceDelimiter) + ) + .m(&PXR_NS::UsdObject::ClearMetadataByDictKey) + .m(&PXR_NS::UsdObject::HasMetadataDictKey) + .m(&PXR_NS::UsdObject::HasAuthoredMetadataDictKey) + .m(&PXR_NS::UsdObject::GetAllMetadata) + .m(&PXR_NS::UsdObject::GetAllAuthoredMetadata) + .m(&PXR_NS::UsdObject::IsHidden) + .m(&PXR_NS::UsdObject::SetHidden) + .m(&PXR_NS::UsdObject::ClearHidden) + .m(&PXR_NS::UsdObject::HasAuthoredHidden) + .m(&PXR_NS::UsdObject::GetCustomData) + .m(&PXR_NS::UsdObject::GetCustomDataByKey) + .m(&PXR_NS::UsdObject::SetCustomData) + .m(&PXR_NS::UsdObject::SetCustomDataByKey) + .m(&PXR_NS::UsdObject::ClearCustomData) + .m(&PXR_NS::UsdObject::ClearCustomDataByKey) + .m(&PXR_NS::UsdObject::HasCustomData) + .m(&PXR_NS::UsdObject::HasCustomDataKey) + .m(&PXR_NS::UsdObject::HasAuthoredCustomData) + .m(&PXR_NS::UsdObject::HasAuthoredCustomDataKey) + .m(&PXR_NS::UsdObject::GetAssetInfo) + .m(&PXR_NS::UsdObject::GetAssetInfoByKey) + .m(&PXR_NS::UsdObject::SetAssetInfo) + .m(&PXR_NS::UsdObject::SetAssetInfoByKey) + .m(&PXR_NS::UsdObject::ClearAssetInfo) + .m(&PXR_NS::UsdObject::ClearAssetInfoByKey) + .m(&PXR_NS::UsdObject::HasAssetInfo) + .m(&PXR_NS::UsdObject::HasAssetInfoKey) + .m(&PXR_NS::UsdObject::HasAuthoredAssetInfo) + .m(&PXR_NS::UsdObject::HasAuthoredAssetInfoKey) + .m(&PXR_NS::UsdObject::GetDocumentation) + .m(&PXR_NS::UsdObject::SetDocumentation) + .m(&PXR_NS::UsdObject::ClearDocumentation) + .m(&PXR_NS::UsdObject::HasAuthoredDocumentation) + .m(&PXR_NS::UsdObject::GetDisplayName) + .m(&PXR_NS::UsdObject::SetDisplayName) + .m(&PXR_NS::UsdObject::ClearDisplayName) + .m(&PXR_NS::UsdObject::HasAuthoredDisplayName) + .m(&PXR_NS::UsdObject::IsValid) + .m(&PXR_NS::UsdObject::GetStage) + .m(&PXR_NS::UsdObject::GetPath) + .m(&PXR_NS::UsdObject::GetPrimPath) + .m(&PXR_NS::UsdObject::GetPrim) + .m(&PXR_NS::UsdObject::GetName) + .m(&PXR_NS::UsdObject::GetNamespaceDelimiter) .m(&PXR_NS::UsdObject::GetDescription) ; @@ -630,10 +630,10 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::GetAuthoredPropertyNames) .m(&PXR_NS::UsdPrim::GetProperties, "GetProperties_matching_predicate") .m(&PXR_NS::UsdPrim::GetAuthoredProperties, "GetAuthoredProperties_matching_predicate") - .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) + .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) &PXR_NS::UsdPrim::GetPropertiesInNamespace ) - .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) + .m((std::vector(PXR_NS::UsdPrim::*)(std::string const&) const) &PXR_NS::UsdPrim::GetAuthoredPropertiesInNamespace ) .m(&PXR_NS::UsdPrim::GetPropertyOrder) @@ -646,55 +646,55 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::RemoveAppliedSchema) // IsA - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::IsA ) // methods can be renamed to give useful names to overloads - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion) const) &PXR_NS::UsdPrim::IsA, "IsA_with_version" ) // IsInFamily - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::IsInFamily ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_policy" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_policy_and_version" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::IsInFamily, "IsInFamily_with_type" ) .m(&PXR_NS::UsdPrim::GetVersionIfIsInFamily) // HasAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::HasAPI ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_instance_name" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_schema_identifier" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPI, "HasAPI_with_instance_name_and_schema_identifier" ) // HasAPIInFamily - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_instance" ) - .m((bool(PXR_NS::UsdPrim::*)( PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) + .m((bool(PXR_NS::UsdPrim::*)( PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_version" ) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy, PXR_NS::TfToken const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion, PXR_NS::UsdSchemaRegistry::VersionPolicy, PXR_NS::TfToken const&) const) &PXR_NS::UsdPrim::HasAPIInFamily, "HasAPIInFamily_with_version_and_instance" ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -716,14 +716,14 @@ BBL_MODULE(usd) { // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, // PXR_NS::UsdSchemaVersion*) const) & // PXR_NS::UsdPrim::GetVersionIfHasAPIInFamily) - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion*) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::TfToken const&, PXR_NS::UsdSchemaVersion*) const) &PXR_NS::UsdPrim::GetVersionIfHasAPIInFamily ) // CanApplyAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, std::string*) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, std::string*) const) &PXR_NS::UsdPrim::CanApplyAPI - ) + ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, // PXR_NS::TfToken const&, std::string*) // const) & @@ -741,7 +741,7 @@ BBL_MODULE(usd) { // PXR_NS::UsdPrim::CanApplyAPI) // ApplyAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::ApplyAPI ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -761,7 +761,7 @@ BBL_MODULE(usd) { // PXR_NS::UsdPrim::ApplyAPI) // RemoveAPI - .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) + .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&) const) &PXR_NS::UsdPrim::RemoveAPI ) // .m((bool(PXR_NS::UsdPrim::*)(PXR_NS::TfType const&, @@ -813,7 +813,7 @@ BBL_MODULE(usd) { // Attributes // We'll only do one of these create methods as the rest are for // convenience, and we should do convenience on the FFI side - .m((PXR_NS::UsdAttribute(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::SdfValueTypeName const&, bool, PXR_NS::SdfVariability) const) + .m((PXR_NS::UsdAttribute(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, PXR_NS::SdfValueTypeName const&, bool, PXR_NS::SdfVariability) const) &PXR_NS::UsdPrim::CreateAttribute ) .m(&PXR_NS::UsdPrim::GetAttributes) @@ -823,7 +823,7 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdPrim::FindAllAttributeConnectionPaths) // Relationships - .m((PXR_NS::UsdRelationship(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, bool) const) + .m((PXR_NS::UsdRelationship(PXR_NS::UsdPrim::*)(PXR_NS::TfToken const&, bool) const) &PXR_NS::UsdPrim::CreateRelationship ) .m(&PXR_NS::UsdPrim::GetRelationships) @@ -891,29 +891,29 @@ BBL_MODULE(usd) { bbl::Class("Property") .ctor(bbl::Class::Ctor<>(), "default") - .m(&PXR_NS::UsdProperty::GetPropertyStack) - .m(&PXR_NS::UsdProperty::GetPropertyStackWithLayerOffsets) - .m(&PXR_NS::UsdProperty::GetBaseName) - .m(&PXR_NS::UsdProperty::GetNamespace) - .m(&PXR_NS::UsdProperty::SplitName) - .m(&PXR_NS::UsdProperty::GetDisplayGroup) - .m(&PXR_NS::UsdProperty::SetDisplayGroup) - .m(&PXR_NS::UsdProperty::ClearDisplayGroup) - .m(&PXR_NS::UsdProperty::HasAuthoredDisplayGroup) - .m(&PXR_NS::UsdProperty::GetNestedDisplayGroups) - .m(&PXR_NS::UsdProperty::SetNestedDisplayGroups) - .m(&PXR_NS::UsdProperty::IsCustom) - .m(&PXR_NS::UsdProperty::SetCustom) - .m(&PXR_NS::UsdProperty::IsDefined) - .m(&PXR_NS::UsdProperty::IsAuthored) - .m(&PXR_NS::UsdProperty::IsAuthoredAt) - .m((PXR_NS::UsdProperty (PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&) const) + .m(&PXR_NS::UsdProperty::GetPropertyStack) + .m(&PXR_NS::UsdProperty::GetPropertyStackWithLayerOffsets) + .m(&PXR_NS::UsdProperty::GetBaseName) + .m(&PXR_NS::UsdProperty::GetNamespace) + .m(&PXR_NS::UsdProperty::SplitName) + .m(&PXR_NS::UsdProperty::GetDisplayGroup) + .m(&PXR_NS::UsdProperty::SetDisplayGroup) + .m(&PXR_NS::UsdProperty::ClearDisplayGroup) + .m(&PXR_NS::UsdProperty::HasAuthoredDisplayGroup) + .m(&PXR_NS::UsdProperty::GetNestedDisplayGroups) + .m(&PXR_NS::UsdProperty::SetNestedDisplayGroups) + .m(&PXR_NS::UsdProperty::IsCustom) + .m(&PXR_NS::UsdProperty::SetCustom) + .m(&PXR_NS::UsdProperty::IsDefined) + .m(&PXR_NS::UsdProperty::IsAuthored) + .m(&PXR_NS::UsdProperty::IsAuthoredAt) + .m((PXR_NS::UsdProperty (PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&) const) &PXR_NS::UsdProperty::FlattenTo, "FlattenTo_prim" - ) + ) .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdPrim const&, PXR_NS::TfToken const&) const) & PXR_NS::UsdProperty::FlattenTo, "FlattenTo_named_property" - ) - .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdProperty const&) const) + ) + .m((PXR_NS::UsdProperty(PXR_NS::UsdProperty::*)(PXR_NS::UsdProperty const&) const) &PXR_NS::UsdProperty::FlattenTo, "FlattenTo_property" ) ; @@ -985,16 +985,16 @@ BBL_MODULE(usd) { // Arc editing .m(&PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingLayer) .m(&PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingPrimPath) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfReferenceEditorProxy*, PXR_NS::SdfReference*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfReferenceEditorProxy*, PXR_NS::SdfReference*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_reference" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfPayloadEditorProxy*, PXR_NS::SdfPayload*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfPayloadEditorProxy*, PXR_NS::SdfPayload*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_payload" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)( PXR_NS::SdfPathEditorProxy*, PXR_NS::SdfPath*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)( PXR_NS::SdfPathEditorProxy*, PXR_NS::SdfPath*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_path" ) - .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfNameEditorProxy*, std::string*) const) + .m((bool(PXR_NS::UsdPrimCompositionQueryArc::*)(PXR_NS::SdfNameEditorProxy*, std::string*) const) &PXR_NS::UsdPrimCompositionQueryArc::GetIntroducingListEditor, "GetIntroducingListEditor_name" ) @@ -1049,13 +1049,13 @@ BBL_MODULE(usd) { // GetPropertyMetadata // GetPropertyMetadataByDictKey .m(&PXR_NS::UsdPrimDefinition::GetPropertyDocumentation) - .m((bool(PXR_NS::UsdPrimDefinition::*)(PXR_NS::SdfLayerHandle const&, PXR_NS::SdfPath const&, PXR_NS::SdfSpecifier) const) + .m((bool(PXR_NS::UsdPrimDefinition::*)(PXR_NS::SdfLayerHandle const&, PXR_NS::SdfPath const&, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo ) - .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::TfToken const& name, PXR_NS::SdfSpecifier) const) + .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::TfToken const& name, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo, "FlattenTo_prim_under_parent" ) - .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::SdfSpecifier) const) + .m((PXR_NS::UsdPrim(PXR_NS::UsdPrimDefinition::*)( PXR_NS::UsdPrim const&, PXR_NS::SdfSpecifier) const) &PXR_NS::UsdPrimDefinition::FlattenTo, "FlattenTo_prim" ) ; @@ -1110,7 +1110,7 @@ BBL_MODULE(usd) { .m((PXR_NS::UsdPrimRange::iterator & (PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&)) &PXR_NS::UsdPrimRange::iterator::operator=, "op_assign" ) - .m((bool(PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&) const) + .m((bool(PXR_NS::UsdPrimRange::iterator::*)(PXR_NS::UsdPrimRange::iterator const&) const) &PXR_NS::UsdPrimRange::iterator::operator==, "op_eq" ) .m(&PXR_NS::UsdPrimRange::iterator::operator*, "deref"); @@ -1332,7 +1332,7 @@ BBL_MODULE(usd) { .m(&PXR_NS::UsdStage::SetLoadRules) .m(&PXR_NS::UsdStage::GetPopulationMask) .m(&PXR_NS::UsdStage::SetPopulationMask) - .m(&PXR_NS::UsdStage::ExpandPopulationMask) + .m(&PXR_NS::UsdStage::ExpandPopulationMask) // Layers and Edit Targets .m(&PXR_NS::UsdStage::GetSessionLayer) @@ -1712,3 +1712,4 @@ BBL_MODULE(usd) { } #endif + diff --git a/bind/usdGeom.cpp b/bind/usdGeom.cpp index 49edfb54..b589d3e9 100644 --- a/bind/usdGeom.cpp +++ b/bind/usdGeom.cpp @@ -187,12 +187,12 @@ BBL_MODULE(usdGeom) { bbl::Class("Curves") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomCurves::GetCurveVertexCountsAttr) - .m(&PXR_NS::UsdGeomCurves::CreateCurveVertexCountsAttr) - .m(&PXR_NS::UsdGeomCurves::GetWidthsAttr) - .m(&PXR_NS::UsdGeomCurves::CreateWidthsAttr) - .m(&PXR_NS::UsdGeomCurves::GetWidthsInterpolation) - .m(&PXR_NS::UsdGeomCurves::SetWidthsInterpolation) + .m(&PXR_NS::UsdGeomCurves::GetCurveVertexCountsAttr) + .m(&PXR_NS::UsdGeomCurves::CreateCurveVertexCountsAttr) + .m(&PXR_NS::UsdGeomCurves::GetWidthsAttr) + .m(&PXR_NS::UsdGeomCurves::CreateWidthsAttr) + .m(&PXR_NS::UsdGeomCurves::GetWidthsInterpolation) + .m(&PXR_NS::UsdGeomCurves::SetWidthsInterpolation) .m(&PXR_NS::UsdGeomCurves::GetCurveCount) ; @@ -209,15 +209,15 @@ BBL_MODULE(usdGeom) { bbl::Class("Gprim") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomGprim::GetDisplayColorAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorAttr) - .m(&PXR_NS::UsdGeomGprim::GetDisplayOpacityAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDisplayOpacityAttr) - .m(&PXR_NS::UsdGeomGprim::GetDoubleSidedAttr) - .m(&PXR_NS::UsdGeomGprim::CreateDoubleSidedAttr) - .m(&PXR_NS::UsdGeomGprim::GetOrientationAttr) - .m(&PXR_NS::UsdGeomGprim::CreateOrientationAttr) - .m(&PXR_NS::UsdGeomGprim::GetDisplayColorPrimvar) + .m(&PXR_NS::UsdGeomGprim::GetDisplayColorAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorAttr) + .m(&PXR_NS::UsdGeomGprim::GetDisplayOpacityAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDisplayOpacityAttr) + .m(&PXR_NS::UsdGeomGprim::GetDoubleSidedAttr) + .m(&PXR_NS::UsdGeomGprim::CreateDoubleSidedAttr) + .m(&PXR_NS::UsdGeomGprim::GetOrientationAttr) + .m(&PXR_NS::UsdGeomGprim::CreateOrientationAttr) + .m(&PXR_NS::UsdGeomGprim::GetDisplayColorPrimvar) .m(&PXR_NS::UsdGeomGprim::CreateDisplayColorPrimvar) ; @@ -230,28 +230,28 @@ BBL_MODULE(usdGeom) { bbl::Class("Imageable") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomImageable::GetVisibilityAttr) - .m(&PXR_NS::UsdGeomImageable::CreateVisibilityAttr) - .m(&PXR_NS::UsdGeomImageable::GetPurposeAttr) - .m(&PXR_NS::UsdGeomImageable::CreatePurposeAttr) - .m(&PXR_NS::UsdGeomImageable::GetProxyPrimRel) - .m(&PXR_NS::UsdGeomImageable::CreateProxyPrimRel) - .m(&PXR_NS::UsdGeomImageable::MakeVisible) - .m(&PXR_NS::UsdGeomImageable::MakeInvisible) - .m(&PXR_NS::UsdGeomImageable::ComputeVisibility) - .m(&PXR_NS::UsdGeomImageable::GetPurposeVisibilityAttr) - .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)() const) - &PXR_NS::UsdGeomImageable::ComputePurposeInfo) - .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdGeomImageable::PurposeInfo const&) const) - &PXR_NS::UsdGeomImageable::ComputePurposeInfo, "ComputePurposeInfo_given_parent") - .m(&PXR_NS::UsdGeomImageable::ComputePurpose) - .m(&PXR_NS::UsdGeomImageable::ComputeProxyPrim) - .m((bool (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdPrim const&) const) - &PXR_NS::UsdGeomImageable::SetProxyPrim) - .m(&PXR_NS::UsdGeomImageable::ComputeWorldBound) - .m(&PXR_NS::UsdGeomImageable::ComputeLocalBound) - .m(&PXR_NS::UsdGeomImageable::ComputeUntransformedBound) - .m(&PXR_NS::UsdGeomImageable::ComputeLocalToWorldTransform) + .m(&PXR_NS::UsdGeomImageable::GetVisibilityAttr) + .m(&PXR_NS::UsdGeomImageable::CreateVisibilityAttr) + .m(&PXR_NS::UsdGeomImageable::GetPurposeAttr) + .m(&PXR_NS::UsdGeomImageable::CreatePurposeAttr) + .m(&PXR_NS::UsdGeomImageable::GetProxyPrimRel) + .m(&PXR_NS::UsdGeomImageable::CreateProxyPrimRel) + .m(&PXR_NS::UsdGeomImageable::MakeVisible) + .m(&PXR_NS::UsdGeomImageable::MakeInvisible) + .m(&PXR_NS::UsdGeomImageable::ComputeVisibility) + .m(&PXR_NS::UsdGeomImageable::GetPurposeVisibilityAttr) + .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)() const) + &PXR_NS::UsdGeomImageable::ComputePurposeInfo) + .m((PXR_NS::UsdGeomImageable::PurposeInfo (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdGeomImageable::PurposeInfo const&) const) + &PXR_NS::UsdGeomImageable::ComputePurposeInfo, "ComputePurposeInfo_given_parent") + .m(&PXR_NS::UsdGeomImageable::ComputePurpose) + .m(&PXR_NS::UsdGeomImageable::ComputeProxyPrim) + .m((bool (PXR_NS::UsdGeomImageable::*)(PXR_NS::UsdPrim const&) const) + &PXR_NS::UsdGeomImageable::SetProxyPrim) + .m(&PXR_NS::UsdGeomImageable::ComputeWorldBound) + .m(&PXR_NS::UsdGeomImageable::ComputeLocalBound) + .m(&PXR_NS::UsdGeomImageable::ComputeUntransformedBound) + .m(&PXR_NS::UsdGeomImageable::ComputeLocalToWorldTransform) .m(&PXR_NS::UsdGeomImageable::ComputeParentToWorldTransform) ; @@ -394,17 +394,17 @@ BBL_MODULE(usdGeom) { bbl::Class("PointBased") .ctor(bbl::Class::Ctor(), "new") - .m(&PXR_NS::UsdGeomPointBased::GetPointsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreatePointsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetVelocitiesAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateVelocitiesAttr) - .m(&PXR_NS::UsdGeomPointBased::GetAccelerationsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateAccelerationsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetNormalsAttr) - .m(&PXR_NS::UsdGeomPointBased::CreateNormalsAttr) - .m(&PXR_NS::UsdGeomPointBased::GetNormalsInterpolation) - .m(&PXR_NS::UsdGeomPointBased::SetNormalsInterpolation) - .m((bool (PXR_NS::UsdGeomPointBased::*)(PXR_NS::VtArray*, PXR_NS::UsdTimeCode const, PXR_NS::UsdTimeCode const) const) + .m(&PXR_NS::UsdGeomPointBased::GetPointsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreatePointsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetVelocitiesAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateVelocitiesAttr) + .m(&PXR_NS::UsdGeomPointBased::GetAccelerationsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateAccelerationsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetNormalsAttr) + .m(&PXR_NS::UsdGeomPointBased::CreateNormalsAttr) + .m(&PXR_NS::UsdGeomPointBased::GetNormalsInterpolation) + .m(&PXR_NS::UsdGeomPointBased::SetNormalsInterpolation) + .m((bool (PXR_NS::UsdGeomPointBased::*)(PXR_NS::VtArray*, PXR_NS::UsdTimeCode const, PXR_NS::UsdTimeCode const) const) &PXR_NS::UsdGeomPointBased::ComputePointsAtTime) ; @@ -442,7 +442,7 @@ BBL_MODULE(usdGeom) { &PXR_NS::UsdGeomPointInstancer::ComputeExtentAtTimes, "ComputeExtentAtTimes_with_transform") .m(&PXR_NS::UsdGeomPointInstancer::GetInstanceCount) ; - + bbl::Enum("ProtoXformInclusion"); bbl::Enum("MaskApplication"); @@ -499,7 +499,7 @@ BBL_MODULE(usdGeom) { bbl::Class>("PrimvarVector") BBL_STD_VECTOR_METHODS(PXR_NS::UsdGeomPrimvar) ; - + bbl::Class("PrimvarsAPI") .ctor(bbl::Class::Ctor(), "new") diff --git a/bind/usdLux.cpp b/bind/usdLux.cpp index 5bf0571a..82574a5c 100644 --- a/bind/usdLux.cpp +++ b/bind/usdLux.cpp @@ -357,3 +357,5 @@ BBL_MODULE(usdLux) { #endif + + diff --git a/bind/usdRender.cpp b/bind/usdRender.cpp index 7cc12fc1..8c49ed92 100644 --- a/bind/usdRender.cpp +++ b/bind/usdRender.cpp @@ -125,3 +125,5 @@ BBL_MODULE(usdRender) { #endif + + diff --git a/bind/usdShade.cpp b/bind/usdShade.cpp index 3a3e52ad..6b77024c 100644 --- a/bind/usdShade.cpp +++ b/bind/usdShade.cpp @@ -619,3 +619,5 @@ BBL_MODULE(usdShade) { #endif + + diff --git a/bind/vt.cpp b/bind/vt.cpp index 267ed398..96c9e7bf 100644 --- a/bind/vt.cpp +++ b/bind/vt.cpp @@ -65,7 +65,7 @@ BBL_MODULE(vt) { ) .m((bool const& (Value::*)() const&) &Value::Get, "Get_bool" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uchar") .m((bool (Value::*)() const) @@ -73,7 +73,7 @@ BBL_MODULE(vt) { ) .m((uint8_t const& (Value::*)() const&) &Value::Get, "Get_uchar" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uint") .m((bool (Value::*)() const) @@ -81,7 +81,7 @@ BBL_MODULE(vt) { ) .m((uint32_t const& (Value::*)() const&) &Value::Get, "Get_uint" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_int") .m((bool (Value::*)() const) @@ -89,7 +89,7 @@ BBL_MODULE(vt) { ) .m((int const& (Value::*)() const&) &Value::Get, "Get_int" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_uint64") .m((bool (Value::*)() const) @@ -97,7 +97,7 @@ BBL_MODULE(vt) { ) .m((uint64_t const& (Value::*)() const&) &Value::Get, "Get_uint64" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_int64") .m((bool (Value::*)() const) @@ -105,7 +105,7 @@ BBL_MODULE(vt) { ) .m((int64_t const& (Value::*)() const&) &Value::Get, "Get_int64" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_float") .m((bool (Value::*)() const) @@ -113,7 +113,7 @@ BBL_MODULE(vt) { ) .m((float const& (Value::*)() const&) &Value::Get, "Get_float" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_double") .m((bool (Value::*)() const) @@ -121,7 +121,7 @@ BBL_MODULE(vt) { ) .m((double const& (Value::*)() const&) &Value::Get, "Get_double" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_TfToken") .m((bool (Value::*)() const) @@ -129,7 +129,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::TfToken const& (Value::*)() const&) &Value::Get, "Get_TfToken" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_SdfAssetPath") .m((bool (Value::*)() const) @@ -137,7 +137,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::SdfAssetPath const& (Value::*)() const&) &Value::Get, "Get_SdfAssetPath" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_SdfTimeCode") .m((bool (Value::*)() const) @@ -145,7 +145,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::SdfTimeCode const& (Value::*)() const&) &Value::Get, "Get_SdfTimeCode" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_string") .m((bool (Value::*)() const) @@ -153,7 +153,7 @@ BBL_MODULE(vt) { ) .m((std::string const& (Value::*)() const&) &Value::Get, "Get_string" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2d") .m((bool (Value::*)() const) @@ -161,7 +161,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2d const& (Value::*)() const&) &Value::Get, "Get_GfVec2d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2h") .m((bool (Value::*)() const) @@ -169,7 +169,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2h const& (Value::*)() const&) &Value::Get, "Get_GfVec2h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2f") .m((bool (Value::*)() const) @@ -177,7 +177,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2f const& (Value::*)() const&) &Value::Get, "Get_GfVec2f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec2i") .m((bool (Value::*)() const) @@ -185,7 +185,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec2i const& (Value::*)() const&) &Value::Get, "Get_GfVec2i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3d") .m((bool (Value::*)() const) @@ -193,7 +193,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3d const& (Value::*)() const&) &Value::Get, "Get_GfVec3d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3h") .m((bool (Value::*)() const) @@ -201,7 +201,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3h const& (Value::*)() const&) &Value::Get, "Get_GfVec3h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3f") .m((bool (Value::*)() const) @@ -209,7 +209,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3f const& (Value::*)() const&) &Value::Get, "Get_GfVec3f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec3i") .m((bool (Value::*)() const) @@ -217,7 +217,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec3i const& (Value::*)() const&) &Value::Get, "Get_GfVec3i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4d") .m((bool (Value::*)() const) @@ -225,7 +225,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4d const& (Value::*)() const&) &Value::Get, "Get_GfVec4d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4h") .m((bool (Value::*)() const) @@ -233,7 +233,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4h const& (Value::*)() const&) &Value::Get, "Get_GfVec4h" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4f") .m((bool (Value::*)() const) @@ -241,7 +241,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4f const& (Value::*)() const&) &Value::Get, "Get_GfVec4f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfVec4i") .m((bool (Value::*)() const) @@ -249,7 +249,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfVec4i const& (Value::*)() const&) &Value::Get, "Get_GfVec4i" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuatd") .m((bool (Value::*)() const) @@ -257,7 +257,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuatd const& (Value::*)() const&) &Value::Get, "Get_GfQuatd" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuatf") .m((bool (Value::*)() const) @@ -265,7 +265,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuatf const& (Value::*)() const&) &Value::Get, "Get_GfQuatf" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfQuath") .m((bool (Value::*)() const) @@ -273,7 +273,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfQuath const& (Value::*)() const&) &Value::Get, "Get_GfQuath" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix2d") .m((bool (Value::*)() const) @@ -281,7 +281,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix2d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix2d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix2f") .m((bool (Value::*)() const) @@ -289,7 +289,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix2f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix2f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix3d") .m((bool (Value::*)() const) @@ -297,7 +297,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix3d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix3d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix3f") .m((bool (Value::*)() const) @@ -305,7 +305,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix3f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix3f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix4d") .m((bool (Value::*)() const) @@ -313,7 +313,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix4d const& (Value::*)() const&) &Value::Get, "Get_GfMatrix4d" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_GfMatrix4f") .m((bool (Value::*)() const) @@ -321,7 +321,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::GfMatrix4f const& (Value::*)() const&) &Value::Get, "Get_GfMatrix4f" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtTokenArray") .m((bool (Value::*)() const) @@ -329,7 +329,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtTokenArray const& (Value::*)() const&) &Value::Get, "Get_VtTokenArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtStringArray") .m((bool (Value::*)() const) @@ -337,7 +337,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtStringArray const& (Value::*)() const&) &Value::Get, "Get_VtStringArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtBoolArray") .m((bool (Value::*)() const) @@ -345,7 +345,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtBoolArray const& (Value::*)() const&) &Value::Get, "Get_VtBoolArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUCharArray") .m((bool (Value::*)() const) @@ -353,7 +353,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUCharArray const& (Value::*)() const&) &Value::Get, "Get_VtUCharArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUIntArray") .m((bool (Value::*)() const) @@ -361,7 +361,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUIntArray const& (Value::*)() const&) &Value::Get, "Get_VtUIntArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtIntArray") .m((bool (Value::*)() const) @@ -369,7 +369,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtIntArray const& (Value::*)() const&) &Value::Get, "Get_VtIntArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtUInt64Array") .m((bool (Value::*)() const) @@ -377,7 +377,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtUInt64Array const& (Value::*)() const&) &Value::Get, "Get_VtUInt64Array" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtInt64Array") .m((bool (Value::*)() const) @@ -385,7 +385,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtInt64Array const& (Value::*)() const&) &Value::Get, "Get_VtInt64Array" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtFloatArray") .m((bool (Value::*)() const) @@ -393,7 +393,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtFloatArray const& (Value::*)() const&) &Value::Get, "Get_VtFloatArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtDoubleArray") .m((bool (Value::*)() const) @@ -401,7 +401,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtDoubleArray const& (Value::*)() const&) &Value::Get, "Get_VtDoubleArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2fArray") .m((bool (Value::*)() const) @@ -409,7 +409,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3fArray") .m((bool (Value::*)() const) @@ -417,7 +417,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4fArray") .m((bool (Value::*)() const) @@ -425,7 +425,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4fArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4fArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2dArray") .m((bool (Value::*)() const) @@ -433,7 +433,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3dArray") .m((bool (Value::*)() const) @@ -441,7 +441,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4dArray") .m((bool (Value::*)() const) @@ -449,7 +449,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4dArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec2hArray") .m((bool (Value::*)() const) @@ -457,7 +457,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec2hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec2hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec3hArray") .m((bool (Value::*)() const) @@ -465,7 +465,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec3hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec3hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtVec4hArray") .m((bool (Value::*)() const) @@ -473,7 +473,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtVec4hArray const& (Value::*)() const&) &Value::Get, "Get_VtVec4hArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuatfArray") .m((bool (Value::*)() const) @@ -481,7 +481,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuatfArray const& (Value::*)() const&) &Value::Get, "Get_VtQuatfArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuatdArray") .m((bool (Value::*)() const) @@ -489,7 +489,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuatdArray const& (Value::*)() const&) &Value::Get, "Get_VtQuatdArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtQuathArray") .m((bool (Value::*)() const) @@ -497,7 +497,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtQuathArray const& (Value::*)() const&) &Value::Get, "Get_VtQuathArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix2dArray") .m((bool (Value::*)() const) @@ -505,7 +505,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix2dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix2dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix3dArray") .m((bool (Value::*)() const) @@ -513,7 +513,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix3dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix3dArray" - ) + ) .ctor(bbl::Class::Ctor("value"), "from_VtMatrix4dArray") .m((bool (Value::*)() const) @@ -521,7 +521,7 @@ BBL_MODULE(vt) { ) .m((PXR_NS::VtMatrix4dArray const& (Value::*)() const&) &Value::Get, "Get_VtMatrix4dArray" - ) + ) ; @@ -576,3 +576,4 @@ BBL_MODULE(vt) { #endif + diff --git a/gen/CMakeLists.txt b/gen/CMakeLists.txt index d2cb402a..0131e415 100644 --- a/gen/CMakeLists.txt +++ b/gen/CMakeLists.txt @@ -12,12 +12,12 @@ bbl_generate_binding( pxrInternal_v0_23__pxrReserved__ COMPILE_ARGS - -DNOMINMAX - -DBOOST_ALL_NO_LIB + -DNOMINMAX + -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H -D_MT -Wno-deprecated-builtins ) target_link_libraries(openusd-gen PUBLIC usd sdf js usdGeom) -target_compile_definitions(openusd-gen PRIVATE -DNOMINMAX -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H) +target_compile_definitions(openusd-gen PRIVATE -DNOMINMAX -DBOOST_ALL_NO_LIB -D__TBB_show_deprecation_message_task_H) \ No newline at end of file