Skip to content

Commit

Permalink
Bump USD, register usd files to Kraken by default.
Browse files Browse the repository at this point in the history
  • Loading branch information
furby-tm committed Aug 8, 2024
1 parent 78332f1 commit 1ba3254
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 14 deletions.
3 changes: 2 additions & 1 deletion Bundler.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ format_version = 2
[apps.Kraken]
identifier = 'foundation.wabi.Kraken'
product = 'Kraken'
version = '1.0.0'
version = '1.1.0'
category = 'public.app-category.graphics-design'
icon = "kraken.png"

[apps.Kraken.plist]
commit = '$(COMMIT_HASH)'
CFBundleURLTypes = [ { type = "dict", value = { CFBundleTypeRole = 'Viewer', CFBundleURLName = 'Kraken', CFBundleURLSchemes = [ 'kraken' ] } } ]
CFBundleDocumentTypes = [ { type = "dict", value = { CFBundleTypeExtensions = [ 'usd', 'usda', 'usdc', 'usdz' ], CFBundleTypeIconFile = 'AppIcon.icns', CFBundleTypeName = 'Universal Scene Description File', CFBundleTypeRole = 'Editor', LSIsAppleDefaultForType = true, LSItemContentTypes = [ 'com.pixar.universal-scene-description', 'com.pixar.universal-scene-description-mobile', 'com.pixar.usd.ascii', 'com.pixar.usd.crate' ], CFBundleTypeIconSystemGenerated = true } } ]
61 changes: 53 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"originHash" : "b5c41ecafe2bba971ba777399bfa246022d949ec1523346d9c63bb089437c382",
"originHash" : "921dba52a8c494676d11c4dd9440867fd2ee6b3d86ea02c679523d82c4edf548",
"pins" : [
{
"identity" : "galah",
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/galah.git",
"state" : {
"revision" : "a90d086184e8e0fb3d32803b051acf75ff50d66d",
"version" : "1.0.0"
}
},
{
"identity" : "mainoffender",
"kind" : "remoteSourceControl",
Expand All @@ -15,8 +24,35 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaverseKit.git",
"state" : {
"revision" : "1532e878d0b27d756d06432586d577cb2351a268",
"version" : "1.7.5"
"revision" : "52fa7685761b1c5f7691b15de6bc96da79befe47",
"version" : "1.7.7"
}
},
{
"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" : "6fd4817e33c31a57760e285228ef8f81cd359062",
"version" : "0.4.2"
}
},
{
Expand Down Expand Up @@ -64,13 +100,22 @@
"version" : "1.5.4"
}
},
{
"identity" : "swift-macro-toolkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/stackotter/swift-macro-toolkit",
"state" : {
"revision" : "106daeb38eb3f52b1540aed981fc63fa22274576",
"version" : "0.3.1"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
"revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
"version" : "509.0.0"
}
},
{
Expand All @@ -87,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/SwiftUSD",
"state" : {
"revision" : "187488950e215af85ca3ae21e38651c5d48eb3c4",
"version" : "23.11.42"
"revision" : "8097f5e7e2a4126e39e50ba5a0e967273b615fa8",
"version" : "24.8.0"
}
},
{
Expand Down Expand Up @@ -129,4 +174,4 @@
}
],
"version" : 3
}
}
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let package = Package(
// --- 🦄 Package Dependencies. ---
dependencies: [
// .package(url: "https://github.com/stackotter/swift-cross-ui", revision: "f57f7ab"),
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "23.11.42"),
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.0"),
.package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", revision: "96ad58b"),
.package(url: "https://github.com/ChimeHQ/TextFormation.git", from: "0.8.2"),
.package(url: "https://github.com/ChimeHQ/TextStory.git", from: "0.8.0"),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kraken/KR/KR.Kraken.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public struct Kraken: SwiftUI.App
Button
{} label:
{
Image("wabi.hexagon.fill", bundle: .module)
Image("wabi.hexagon.fill", bundle: .kraken)
}
.buttonStyle(.borderless)
.font(.system(size: 12, weight: .medium))
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kraken/KR/KR.Version.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public extension Kraken
{
/**
* The current version of Kraken. */
static let version = ".".join(array: Pixar.GfVec3i(1, 0, 9))
static let version = ".".join(array: Pixar.GfVec3i(1, 1, 0))

/**
* Returns version information for Kraken and USD. */
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kraken/UI/Splash/KUI.SplashBadge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public extension Kraken.UI
{
VStack
{
Image(logo, bundle: .module)
Image(logo, bundle: .kraken)
#if !os(Linux)
.aspectRatio(contentMode: .fit)
.foregroundStyle(.secondary, .ultraThinMaterial)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kraken/UI/Splash/KUI.SplashImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public extension Kraken.UI

public var body: some View
{
Image(image, bundle: .module)
Image(image, bundle: .kraken)
#if !os(Linux)
.resizable()
.aspectRatio(contentMode: .fill)
Expand Down

0 comments on commit 1ba3254

Please sign in to comment.