Skip to content

Commit

Permalink
Bump version, add windows status, docs in readme.
Browse files Browse the repository at this point in the history
Signed-off-by: furby™ <devs@wabi.foundation>
  • Loading branch information
furby-tm committed Oct 31, 2024
1 parent 20308d0 commit 42a1283
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rust-usd"
version = "24.8.3"
version = "24.8.7"
edition = "2021"
publish = []

Expand Down
2 changes: 1 addition & 1 deletion DeclarativePixarUSD.usda
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
(
doc = "SwiftUSD v24.08.3 | Declarative API"
doc = "SwiftUSD v24.08.7 | Declarative API"
)

def "DeclarativeScene"
Expand Down
2 changes: 1 addition & 1 deletion HelloPixarUSD.usda
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
(
doc = "SwiftUSD v24.08.3"
doc = "SwiftUSD v24.08.7"
)

def Xform "Geometry"
Expand Down
35 changes: 24 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
</div>

<h4 align="center">
<a href="https://wabiverse.github.io/SwiftUSD/documentation/pixarusd/">
<img src="https://img.shields.io/badge/v23%2E11%2E43-DocumentationSource?style=flat-square&label=docs&labelColor=F05138&logo=swift&color=gray&logoColor=white">
</a>
<a href="https://github.com/wabiverse/SwiftUSD/actions/workflows/swift-ubuntu.yml">
<img src="https://img.shields.io/github/actions/workflow/status/wabiverse/SwiftUSD/swift-ubuntu.yml?style=flat-square&label=ubuntu%20&labelColor=E95420&logoColor=FFFFFF&logo=ubuntu">
</a>
<a href="https://github.com/wabiverse/SwiftUSD/actions/workflows/swift-macos.yml">
<img src="https://img.shields.io/github/actions/workflow/status/wabiverse/SwiftUSD/swift-macos.yml?style=flat-square&label=macOS&labelColor=000000&logo=apple">
</a>
<a href="https://github.com/wabiverse/SwiftUSD/actions/workflows/swift-debug-windows.yml">
<img src="https://img.shields.io/github/actions/workflow/status/wabiverse/SwiftUSD/swift-debug-windows.yml?style=flat-square&label=windows&labelColor=357EC7&logo=gitforwindows">
</a>
<br>
<a href="https://wabiverse.github.io/SwiftUSD/documentation/pixarusd/">
<img src="https://img.shields.io/badge/v24%2E8%2E7-DocumentationSource?style=flat-square&label=docs&labelColor=F05138&logo=swift&color=gray&logoColor=white">
</a>
<a href="https://github.com/wabiverse/SwiftUSD/graphs/contributors">
<img src="https://img.shields.io/github/contributors-anon/wabiverse/SwiftUSD?color=8A2BE2&style=flat-square" alt="contributors" style="height: 20px;">
</a>
<br>
<a href="https://discord.gg/bfW4NyKpuA">
<img src="https://img.shields.io/badge/discord-7289da.svg?style=flat-square&logo=discord" alt="discord" style="height: 20px;">
</a>
<a href="https://wabi.foundation">
<img src="https://img.shields.io/badge/wabi_foundation-black?style=flat-square&logo=data:image/svg%2bxml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MDAgNTAwIj4KICA8ZGVmcz4KICAgIDxzdHlsZT4KICAgICAgLmNscy0xIHsKICAgICAgICBmaWxsOiAjNDM0MzQzOwogICAgICB9CgogICAgICAuY2xzLTEsIC5jbHMtMiB7CiAgICAgICAgc3Ryb2tlLXdpZHRoOiAwcHg7CiAgICAgIH0KCiAgICAgIC5jbHMtMiB7CiAgICAgICAgZmlsbDogI2ZmZjsKICAgICAgfQogICAgPC9zdHlsZT4KICA8L2RlZnM+CiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMTMyLjQyLDMzOS42NXMtMzQuOS0yOC40OC00NS41Ny05OC42MmMtMy4xMy0yNy4yNS4xMS01My42NywxMC4xNS03OS4yMiwxMS40OS0yOS4yNSwyOS44OC01My4xOCw1NC45OS03Mi4wMyw0Ljk5LTMuNzQsMTAuNDUtNi44OCwxNC42LTExLjc1LDYuMDEtNy4wNiw3LjkxLTE1LjE0LDYuNzctMjQuMTUtLjg3LTYuNzUtMy4zNC0xMy01LjkzLTE5LjItMS42LTMuODUtMy4zNy03LjY2LTMuODktMTEuODgtLjk5LTcuODgsMy4yOS0xNC43NiwxMC43Mi0xNy42NSw3Ljg0LTMuMDcsMTUuODMtMi45NywyMy45Mi0xLjY1LDEyLjYsMi4wOCwyNC43Miw1LjkzLDM2LjY2LDEwLjM3LDIxLjg3LDguMTMsNDIuNjQsMTguNSw2Mi40MiwzMC44NiwyMi45OSwxNC4zNSw0NC4wNiwzMS4wOCw2Mi41Niw1MC45NiwxMy4zNywxNC4zOCwyNS4wOCwyOS45NiwzNC4zOCw0Ny4yNSwxOC4xMSwzMy42NywyNC4wMyw2OS40MiwxNy41OCwxMDcuMTctMi4yNSwxMy4yLTYuMTgsMjUuNzQtMTIuOTgsMzcuMzctMTIuMjMsMjAuODgtMzAuNDYsMzEuMTctNTQuNTUsMzEuNS0xMy4xNC4xNy0yNS41MS0zLjA0LTM3LjQ4LTguMDktMTEuMy00Ljc1LTIyLjA2LTEwLjQ2LTMyLjU3LTE2LjY2LTExLjY5LTYuODktOTguMzQtNjkuNzgtMTIwLjM0LTc0LjYxLTE3Ljk0LDMuMTYtMzMuNTYsNy45Ni00MS4xMSwyNC43LTM0LjU1LDMzLjg2LDE5LjcyLDk1LjM1LDE5LjcyLDk1LjM1aC0uMDNaTTMxMS42NSwyNTYuNjhjLjAzLTguMi05Ljc3LTE2LjE5LTE4LjE5LTE0Ljg0LTYuNTYsMS4wNS05Ljg1LDYuNjctNy41OCwxMi45MywyLjI3LDYuMjksOC43OCwxMC45NywxNS40NSwxMS4wOSw1LjkyLjEzLDEwLjI5LTMuNzksMTAuMzItOS4ydi4wMloiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yOTguNCwzMzMuODZjMi43MS0xLjQ4LTczLjksODYuMTgtMTY2LjIsNS45LTIyLjk2LTE5Ljk3LTY3LjU2LTEyMC42Nyw1LjI0LTEyMi43MSw0Ni4yNy0xLjI5LDExOC4xMyw2NC42OCwxMTguMTMsNjQuNjgtMjguOTItMTkuNTQtODcuMDctNTkuMjktMTIyLjE1LTI3Ljk0LTQ3LjcyLDQyLjY2LDI0LjM2LDE1Ni4zNSwxNjQuOTcsODAuMDdoMFoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMzIuNzEsMzU3LjljMTAuNy0zLjA3LDIwLjYzLTguMDQsMzAuODEtMTIuMzcsMTAuNy00LjU1LDIxLjQzLTkuMDMsMzIuOS0xMS4zOCw3LjExLTEuNDUsMTQuODgtMS40MiwxOS44Ny4xMS01LjYzLDguMTUtMTAuMjcsMTYuODItMTUuNTUsMjUuMTMtMi4xNCwzLjM4LTQuNTUsNi42MS03LjMsOS41Mi0xMS45MywxMi41Ny0yNi40NywxNy44My00Mi43NywxOC4wNi00LjE0LjA2LTguMjksMC0xMy4yLDAsNy4yOSwxLjUzLDEzLjc1LDMuMTMsMjAuMDYsNS40OSwxNS45MSw1Ljk2LDI1LjI3LDE3LjU2LDI5LjExLDMzLjc1LDQuMTksMTcuNjcsNi44NCwzNS42OSwxMS40NCw1My4yOSwxLjQyLDUuNDQsMi42NiwxMC45NSw0LjYxLDE2LjI0LjQ3LDEuMjYuNTIsMS44MS0xLjE2LDEuNTktMTcuNTktMi40MS0zNC42LTYuNjEtNTAuMTUtMTUuNTYtMTMuOTItOC4wMi0yNC43NS0xOS4xNi0zMy4yOC0zMi43LTcuOTYtMTIuNjUtMTMuNTgtMjYuNDctMTkuNy00MC4wMy0zLjIxLTcuMTEtNS4zMi0xMi45LTkuNDYtMTkuMTYtNC41My02LjgzLTEwLjU5LTEyLjUxLTE3LjUtMTYuOTMtMjguMzctMTguMTctNDQuNjUtMzguODgtNDUuMDgtMzkuMzQsMCwwLDI5LjU4LDM1LjczLDg0LjksMzAuMyw3LjMtMS40NSwxNC41NS0zLjA0LDIxLjQxLTYuMDFsLjAyLS4wMloiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMTEuNjMsMjU2LjY4Yy0uMDIsNS40MS00LjQxLDkuMzEtMTAuMzIsOS4yLTYuNjctLjE0LTEzLjE5LTQuODEtMTUuNDUtMTEuMDktMi4yNy02LjI4LDEuMDItMTEuODgsNy41OC0xMi45Myw4LjQyLTEuMzUsMTguMjIsNi42NCwxOC4xOSwxNC44NHYtLjAyWiIvPgo8L3N2Zz4=" alt="wabi foundation" style="height: 20px;">
</a>
<a href="https://openusd.org/release/index.html">
<img src="https://img.shields.io/badge/openusd-blue.svg?style=flat-square&logo=data:image/svg%2bxml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTYuOTQwMzEgMTEuMzU4MlY3LjQ3NzY0VjMuNjU2NzRMMCAxLjI2ODY4VjguOTg1MUw2Ljk0MDMxIDExLjM1ODJaTTEuMjY4NjYgOC4wMTQ5NVYzLjE3OTEzTDUuNjExOTUgNC42NTY3NFY5LjQ5MjU3TDEuMjY4NjYgOC4wMTQ5NVoiIGZpbGw9IiMyMDhFQ0QiLz4KPHBhdGggZD0iTTEuNzc2MTIgNy41OTcwM0w1LjA4OTU2IDguNzMxMzZWNS4wNzQ2NEwxLjc3NjEyIDMuOTQwMzFWNy41OTcwM1oiIGZpbGw9IiM3REQxRjYiLz4KPHBhdGggZD0iTTguOTI1MzQgNS41OTcwMkw5Ljk5OTk3IDUuOTcwMTZWMS4zNTgyMUw2LjA0NDc0IDBWMS4xNjQxOEw4LjkyNTM0IDIuMTY0MThWNS41OTcwMloiIGZpbGw9IiM3REQxRjYiLz4KPHBhdGggZD0iTTIuOTg1MTEgMC41OTcwMTVWMS43NjEyTDcuMzczMTcgMy4yODM1OVY4LjI1Mzc0TDguNDQ3OCA4LjYxMTk1VjIuNDc3NjFMMi45ODUxMSAwLjU5NzAxNVoiIGZpbGw9IiMzNUMzRjEiLz4KPC9zdmc+Cg==" alt="youtube" style="height: 20px;">
</a>
Expand Down Expand Up @@ -78,7 +78,7 @@ For more details, please visit the web site [here](http://openusd.org).
##### To use Pixar's USD in swift, add SwiftUSD as a package dependency in your project's Package.swift file.
```swift
dependencies: [
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.3"),
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.7"),
]
```

Expand Down Expand Up @@ -109,7 +109,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.3")
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.7")
],
targets: [
/* 📕 For library products... */
Expand All @@ -119,8 +119,14 @@ let package = Package(
/* add pixar usd as a library dependency. */
.product(name: "PixarUSD", package: "SwiftUSD"),
],
cxxSettings: [
/* for windows support, add these three defines until swift's clang is updated. */
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("_ALLOW_KEYWORD_MACROS", to: "1", .when(platforms: [.windows])),
.define("static_assert(_conditional, ...)", to: "", .when(platforms: [.windows])),
],
swiftSettings: [
/* needed for SwiftUSD. */
/* enable swift/c++ interop. */
.interoperabilityMode(.Cxx)
]
),
Expand All @@ -132,8 +138,14 @@ let package = Package(
/* add pixar usd as an executable dependency. */
.product(name: "PixarUSD", package: "SwiftUSD"),
],
cxxSettings: [
/* for windows support, add these three defines until swift's clang is updated. */
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("_ALLOW_KEYWORD_MACROS", to: "1", .when(platforms: [.windows])),
.define("static_assert(_conditional, ...)", to: "", .when(platforms: [.windows])),
],
swiftSettings: [
/* needed for SwiftUSD. */
/* enable swift/c++ interop. */
.interoperabilityMode(.Cxx)
],
plugins: [
Expand All @@ -142,6 +154,7 @@ let package = Package(
]
),
],
/* use cxx17 language standard. */
cxxLanguageStandard: .cxx17
)
```
Expand Down
2 changes: 1 addition & 1 deletion Sources/pxr/include/pxr/pxrns.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/* ------ swift usd. ------ */

# define SWIFTUSD_EVOLUTION 3
# define SWIFTUSD_EVOLUTION 7
# define PXR_INTERNAL_NS Pixar

/* ------------------------ */
Expand Down

0 comments on commit 42a1283

Please sign in to comment.