Extend Usd.References, Stage, Prim, Sdf, swift apis.

* Use enum classes for UsdListPosition and UsdLoadPolicy for syntactically clean swift cases. * Also bump darwin platform CI so that visionOS can build. Signed-off-by: furby™ <[email protected]>
wabiverse · Dec 1, 2024 · a445a7b · a445a7b
1 parent 5dd6c3d
commit a445a7b
Show file tree

Hide file tree

Showing 40 changed files with 344 additions and 136 deletions.
diff --git a/.github/workflows/swift-debug-macos.yml b/.github/workflows/swift-debug-macos.yml
@@ -7,8 +7,8 @@ jobs:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest]
-        swift: ["5.10"]
+        os: [macos-15]
+        swift: ["6.0.2"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/swift-ios.yml b/.github/workflows/swift-ios.yml
@@ -7,8 +7,8 @@ jobs:
     name: Swift ${{ matrix.swift }} on iOS
     strategy:
       matrix:
-        os: [macos-latest]
-        swift: ["5.10"]
+        os: [macos-15]
+        swift: ["6.0.2"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/swift-macos.yml b/.github/workflows/swift-macos.yml
@@ -7,8 +7,8 @@ jobs:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest]
-        swift: ["5.10"]
+        os: [macos-15]
+        swift: ["6.0.2"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/swift-visionos.yml b/.github/workflows/swift-visionos.yml
@@ -7,8 +7,8 @@ jobs:
     name: Swift ${{ matrix.swift }} on visionOS
     strategy:
       matrix:
-        os: [macos-latest]
-        swift: ["5.10"]
+        os: [macos-15]
+        swift: ["6.0.2"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust-usd"
-version = "24.8.11"
+version = "24.8.12"
 edition = "2021"
 publish = []
 

diff --git a/DeclarativePixarUSD.usda b/DeclarativePixarUSD.usda
@@ -1,6 +1,6 @@
 #usda 1.0
 (
-    doc = "SwiftUSD v24.08.11 | Declarative API"
+    doc = "SwiftUSD v24.08.12 | Declarative API"
 )
 
 def "DeclarativeScene"

diff --git a/HelloPixarUSD.usda b/HelloPixarUSD.usda
@@ -1,6 +1,6 @@
 #usda 1.0
 (
-    doc = "SwiftUSD v24.08.11"
+    doc = "SwiftUSD v24.08.12"
 )
 
 def Xform "Geometry"

diff --git a/Python/PyUsd/wrapAttribute.cpp b/Python/PyUsd/wrapAttribute.cpp
@@ -164,7 +164,7 @@ void wrapUsdAttribute()
 
       .def("AddConnection",
            &UsdAttribute::AddConnection,
-           (arg("source"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("source"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("RemoveConnection", &UsdAttribute::RemoveConnection, arg("source"))
       .def("SetConnections", &UsdAttribute::SetConnections, arg("sources"))
       .def("ClearConnections", &UsdAttribute::ClearConnections)

diff --git a/Python/PyUsd/wrapInherits.cpp b/Python/PyUsd/wrapInherits.cpp
@@ -22,7 +22,7 @@ void wrapUsdInherits()
   class_<UsdInherits>("Inherits", no_init)
       .def("AddInherit",
            &UsdInherits::AddInherit,
-           (arg("primPath"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("primPath"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("RemoveInherit", &UsdInherits::RemoveInherit, arg("primPath"))
       .def("ClearInherits", &UsdInherits::ClearInherits)
       .def("SetInherits", &UsdInherits::SetInherits)

diff --git a/Python/PyUsd/wrapPayloads.cpp b/Python/PyUsd/wrapPayloads.cpp
@@ -21,26 +21,26 @@ void wrapUsdPayloads()
   class_<UsdPayloads>("Payloads", no_init)
       .def("AddPayload",
            (bool(UsdPayloads::*)(const SdfPayload &, UsdListPosition)) & UsdPayloads::AddPayload,
-           (arg("payload"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("payload"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddPayload",
            (bool(UsdPayloads::*)(
                const string &, const SdfPath &, const SdfLayerOffset &, UsdListPosition)) &
                UsdPayloads::AddPayload,
            (arg("assetPath"),
             arg("primPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddPayload",
            (bool(UsdPayloads::*)(const string &, const SdfLayerOffset &, UsdListPosition)) &
                UsdPayloads::AddPayload,
            (arg("assetPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddInternalPayload",
            &UsdPayloads::AddInternalPayload,
            (arg("primPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
 
       .def("RemovePayload", &UsdPayloads::RemovePayload, arg("payload"))
       .def("ClearPayloads", &UsdPayloads::ClearPayloads)

diff --git a/Python/PyUsd/wrapPrim.cpp b/Python/PyUsd/wrapPrim.cpp
@@ -492,10 +492,10 @@ void wrapUsdPrim()
       .def("ClearChildrenReorder", &UsdPrim::ClearChildrenReorder)
 
       .def("GetParent", &UsdPrim::GetParent)
-      .def("GetNextSibling", (UsdPrim(UsdPrim::*)() const) & UsdPrim::GetNextSibling)
+      .def("GetNextSibling", (UsdPrim(UsdPrim::*)() const)&UsdPrim::GetNextSibling)
       .def("GetFilteredNextSibling",
-           (UsdPrim(UsdPrim::*)(const Usd_PrimFlagsPredicate &) const) &
-               UsdPrim::GetFilteredNextSibling)
+           (UsdPrim(UsdPrim::*)(const Usd_PrimFlagsPredicate &)
+                const)&UsdPrim::GetFilteredNextSibling)
       .def("IsPseudoRoot", &UsdPrim::IsPseudoRoot)
 
       .def("HasVariantSets", &UsdPrim::HasVariantSets)
@@ -508,17 +508,17 @@ void wrapUsdPrim()
 
       .def("CreateAttribute",
            (UsdAttribute(UsdPrim::*)(
-               const TfToken &, const SdfValueTypeName &, bool, SdfVariability) const) &
-               UsdPrim::CreateAttribute,
+               const TfToken &, const SdfValueTypeName &, bool, SdfVariability)
+                const)&UsdPrim::CreateAttribute,
            (arg("name"),
             arg("typeName"),
             arg("custom") = true,
             arg("variability") = SdfVariabilityVarying))
 
       .def("CreateAttribute",
            (UsdAttribute(UsdPrim::*)(
-               const vector<string> &, const SdfValueTypeName &, bool, SdfVariability) const) &
-               UsdPrim::CreateAttribute,
+               const vector<string> &, const SdfValueTypeName &, bool, SdfVariability)
+                const)&UsdPrim::CreateAttribute,
            (arg("nameElts"),
             arg("typeName"),
             arg("custom") = true,
@@ -543,13 +543,12 @@ void wrapUsdPrim()
             arg("recurseOnSources") = false))
 
       .def("CreateRelationship",
-           (UsdRelationship(UsdPrim::*)(const TfToken &, bool) const) &
-               UsdPrim::CreateRelationship,
+           (UsdRelationship(UsdPrim::*)(const TfToken &, bool) const)&UsdPrim::CreateRelationship,
            (arg("name"), arg("custom") = true))
 
       .def("CreateRelationship",
-           (UsdRelationship(UsdPrim::*)(const vector<string> &, bool) const) &
-               UsdPrim::CreateRelationship,
+           (UsdRelationship(UsdPrim::*)(const vector<string> &, bool)
+                const)&UsdPrim::CreateRelationship,
            (arg("nameElts"), arg("custom") = true))
 
       .def("GetRelationships",
@@ -587,7 +586,7 @@ void wrapUsdPrim()
       .def("GetPayloads", &UsdPrim::GetPayloads)
       .def("HasAuthoredPayloads", &UsdPrim::HasAuthoredPayloads)
 
-      .def("Load", &UsdPrim::Load, (arg("policy") = UsdLoadWithDescendants))
+      .def("Load", &UsdPrim::Load, (arg("policy") = UsdLoadPolicy::UsdLoadPolicyWithDescendants))
       .def("Unload", &UsdPrim::Unload)
 
       .def("GetReferences", &UsdPrim::GetReferences)

diff --git a/Python/PyUsd/wrapReferences.cpp b/Python/PyUsd/wrapReferences.cpp
@@ -22,26 +22,26 @@ void wrapUsdReferences()
       .def("AddReference",
            (bool(UsdReferences::*)(const SdfReference &, UsdListPosition)) &
                UsdReferences::AddReference,
-           (arg("ref"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("ref"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddReference",
            (bool(UsdReferences::*)(
                const string &, const SdfPath &, const SdfLayerOffset &, UsdListPosition)) &
                UsdReferences::AddReference,
            (arg("assetPath"),
             arg("primPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddReference",
            (bool(UsdReferences::*)(const string &, const SdfLayerOffset &, UsdListPosition)) &
                UsdReferences::AddReference,
            (arg("assetPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("AddInternalReference",
            &UsdReferences::AddInternalReference,
            (arg("primPath"),
             arg("layerOffset") = SdfLayerOffset(),
-            arg("position") = UsdListPositionBackOfPrependList))
+            arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
 
       .def("RemoveReference", &UsdReferences::RemoveReference, arg("ref"))
       .def("ClearReferences", &UsdReferences::ClearReferences)

diff --git a/Python/PyUsd/wrapRelationship.cpp b/Python/PyUsd/wrapRelationship.cpp
@@ -58,7 +58,7 @@ void wrapUsdRelationship()
       .def("__repr__", __repr__)
       .def("AddTarget",
            &UsdRelationship::AddTarget,
-           (arg("target"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("target"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("RemoveTarget", &UsdRelationship::RemoveTarget, arg("target"))
       .def("SetTargets", &UsdRelationship::SetTargets, arg("targets"))
       .def("ClearTargets", &UsdRelationship::ClearTargets, arg("removeSpec"))

diff --git a/Python/PyUsd/wrapSpecializes.cpp b/Python/PyUsd/wrapSpecializes.cpp
@@ -21,7 +21,7 @@ void wrapUsdSpecializes()
   class_<UsdSpecializes>("Specializes", no_init)
       .def("AddSpecialize",
            &UsdSpecializes::AddSpecialize,
-           (arg("primPath"), arg("position") = UsdListPositionBackOfPrependList))
+           (arg("primPath"), arg("position") = UsdListPosition::UsdListPositionBackOfPrependList))
       .def("RemoveSpecialize", &UsdSpecializes::RemoveSpecialize, arg("primPath"))
       .def("ClearSpecializes", &UsdSpecializes::ClearSpecializes)
       .def("SetSpecializes", &UsdSpecializes::SetSpecializes)