Skip to content

Commit

Permalink
Cleanup Ar, bump MetaverseKit.
Browse files Browse the repository at this point in the history
Signed-off-by: furby™ <[email protected]>
  • Loading branch information
furby-tm committed Sep 3, 2024
1 parent 334c644 commit f2c4242
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 491 deletions.
33 changes: 3 additions & 30 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "d32fd9c511216b338177b37fe2e21979e475f0fc36e6a510fef9673bf8be52f2",
"originHash" : "e4e06ebc65ac5b519ab5d704432f88e17051eda32260f2845a0d6affe5566af1",
"pins" : [
{
"identity" : "galah",
Expand All @@ -15,35 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaverseKit",
"state" : {
"revision" : "73fcb0d3b3e83e9e1b83d54338cf1d58251053a4",
"version" : "1.8.1"
}
},
{
"identity" : "metaversepythonframework",
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaversePythonFramework",
"state" : {
"revision" : "e2f4ba867b7e287a283a27a0005ab64deef14279",
"version" : "3.11.7"
}
},
{
"identity" : "metaversevulkanframework",
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaverseVulkanFramework",
"state" : {
"revision" : "13c7061599c61a4959c558d8ec1836e5b32b640b",
"version" : "1.26.2"
}
},
{
"identity" : "pythonkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pvieito/PythonKit.git",
"state" : {
"revision" : "43647b36cacb99558e57ef98e97ef598f91d1164",
"version" : "0.5.0"
"revision" : "d4f1ef5ef4ed6dfdbbb8b7fc64cb201b0c356d92",
"version" : "1.8.3"
}
},
{
Expand Down
36 changes: 2 additions & 34 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ let package = Package(
// ------------ Pixar.Usd -----
.library(
name: "Ar",
targets: ["ArTypes", "ArPrototypes", "Ar"]
targets: ["Ar"]
),
.library(
name: "Kind",
Expand Down Expand Up @@ -255,7 +255,7 @@ let package = Package(
dependencies: [
// prepare for SwiftCrossUI, for a cross-platform UsdView.
// .package(url: "https://github.com/stackotter/swift-cross-ui", revision: "5c5d8c8"),
.package(url: "https://github.com/wabiverse/MetaverseKit", from: "1.8.1"),
.package(url: "https://github.com/wabiverse/MetaverseKit", from: "1.8.3"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.3"),
.package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.3"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.4.0"),
Expand Down Expand Up @@ -459,39 +459,9 @@ let package = Package(
]
),

.target(
name: "ArTypes",
dependencies: [
.target(name: "Arch"),
.target(name: "Tf"),
.target(name: "Js"),
.target(name: "Plug"),
.target(name: "Vt"),
],
cxxSettings: [
.define("MFB_PACKAGE_NAME", to: "Ar"),
.define("MFB_ALT_PACKAGE_NAME", to: "Ar"),
.define("MFB_PACKAGE_MODULE", to: "Ar"),
.define("AR_EXPORTS", to: "1"),
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
]
),

.target(
name: "ArPrototypes",
dependencies: [
.target(name: "ArTypes")
],
swiftSettings: [
.interoperabilityMode(.Cxx)
]
),

.target(
name: "Ar",
dependencies: [
.target(name: "ArPrototypes"),
.target(name: "ArTypes"),
.target(name: "Arch"),
.target(name: "Tf"),
.target(name: "Js"),
Expand Down Expand Up @@ -1495,8 +1465,6 @@ let package = Package(
.target(name: "Pegtl"),
.target(name: "Plug"),
// ----------- usd. ------
.target(name: "ArPrototypes"),
.target(name: "ArTypes"),
.target(name: "Ar"),
.target(name: "Kind"),
.target(name: "Sdf"),
Expand Down
8 changes: 6 additions & 2 deletions Sources/Ar/include/Ar/pyResolverContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
/// Macros for creating Python bindings for objects used with
/// ArResolverContext.

#include <boost/python/implicit.hpp>

#include "Ar/resolverContext.h"
#include "pxr/pxrns.h"

#if defined(PXR_PYTHON_SUPPORT_ENABLED) && PXR_PYTHON_SUPPORT_ENABLED

#include <boost/python/implicit.hpp>

PXR_NAMESPACE_OPEN_SCOPE

/// Register the specified type as a context object that may be converted from
Expand All @@ -35,4 +37,6 @@ template<class Context> void ArWrapResolverContextForPython()

PXR_NAMESPACE_CLOSE_SCOPE

#endif // defined(PXR_PYTHON_SUPPORT_ENABLED) && PXR_PYTHON_SUPPORT_ENABLED

#endif
2 changes: 1 addition & 1 deletion Sources/Ar/include/Ar/resolver.h
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ class ArResolver {
// been bound via BindContext in their implementations.
AR_API
const ArResolverContext *_GetInternallyManagedCurrentContext() const;
} SWIFT_CONFORMS_TO_PROTOCOL(ArPrototypes.ArResolvable) SWIFT_IMMORTAL_REFERENCE;
} SWIFT_IMMORTAL_REFERENCE;

/// Returns the configured asset resolver.
///
Expand Down
112 changes: 0 additions & 112 deletions Sources/ArPrototypes/ArPrototypes.swift

This file was deleted.

30 changes: 0 additions & 30 deletions Sources/ArTypes/include/ArTypes/ArTypes.h

This file was deleted.

47 changes: 0 additions & 47 deletions Sources/ArTypes/include/ArTypes/api.h

This file was deleted.

Loading

0 comments on commit f2c4242

Please sign in to comment.