feat: Add DisplayParameter and related file management utilities; update dependencies for VRMKit

Author: tattn

app/xcode/Package.resolved

@@ -17,6 +17,9 @@ let package = Package(
 
         .library(name: "VCamStub", targets: ["VCamStub"]),
     ],
+    dependencies: [
+        .package(url: "https://github.com/tattn/VRMKit", branch: "main"),
+    ],
     targets: [
         .target(name: "VCamUI", dependencies: [
             "VCamUIFoundation", "VCamTracking", "VCamCamera", "VCamData", "VCamLocalization", "VCamBridge", "VCamWorkaround",
@@ -48,10 +51,31 @@ let package = Package(
     swiftLanguageModes: [.v5]
 )
 
+let isThree = true
+
 for target in package.targets {
-    target.swiftSettings = (target.swiftSettings ?? []) + [
+    var swiftSettings = (target.swiftSettings ?? []) + [
         .enableUpcomingFeature("ExistentialAny", .when(configuration: .debug)),
         .define("ENABLE_MOCOPI"),
-        .define("FEATURE_3"),
     ]
+
+    if isThree {
+        swiftSettings.append(contentsOf: [
+            .define("FEATURE_3"),
+        ])
+    } else {
+        swiftSettings.append(contentsOf: [
+            .define("ENABLE_ACCOUNT"),
+        ])
+    }
+
+    target.swiftSettings = swiftSettings
+}
+
+if isThree {
+    if let vcamDataTarget = package.targets.first(where: { $0.name == "VCamData" }) {
+        vcamDataTarget.dependencies.append(contentsOf: [
+            .product(name: "VRMKit", package: "VRMKit"),
+        ])
+    }
 }

app/xcode/Package.swift

@@ -1,10 +1,3 @@
-//
-//  DisplayParameter.swift
-//
-//
-//  Created by Tatsuya Tanaka on 2022/03/22.
-//
-
 import Foundation
 import SwiftUI
 import AppKit
@@ -125,7 +118,7 @@ public final class DisplayParameterPresets {
             let file = DisplayParameterPresetsFile(parameters: parameters)
             let data = try JSONEncoder().encode(file)
             let directory = Self.fileURL.deletingLastPathComponent()
-            try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
+            try FileManager.default.createDirectoryIfNeeded(at: directory)
             try data.write(to: Self.fileURL)
         } catch {
             print("Failed to save display parameters: \(error)")

…ources/VCamBridge/DisplayParameter.swift …/Sources/VCamData/DisplayParameter.swiftapp/xcode/Sources/VCamBridge/DisplayParameter.swift renamed to app/xcode/Sources/VCamData/DisplayParameter.swift app/xcode/Sources/VCamBridge/DisplayParameter.swift renamed to app/xcode/Sources/VCamData/DisplayParameter.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+extension FileManager {
+    public func createDirectoryIfNeeded(at url: URL) throws {
+        if !fileExists(atPath: url.path) {
+            try createDirectory(at: url, withIntermediateDirectories: true)
+        }
+    }
+}

app/xcode/Sources/VCamData/FileManager+.swift

@@ -1,23 +1,16 @@
-//
-//  URL+Data.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2022/05/08.
-//
-
 import Foundation
 
 public extension URL {
-    static var applicationSupportDirectory: URL {
-        FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!.appendingPathComponent(Bundle.main.bundleIdentifier!)
+    static var applicationSupportDirectoryWithBundleID: URL {
+        URL.applicationSupportDirectory.appendingPathComponent(Bundle.main.bundleIdentifier!)
     }
 
     static var sceneMetadata: URL {
-        applicationSupportDirectory.appendingPathComponent("scenes.json")
+        applicationSupportDirectoryWithBundleID.appendingPathComponent("scenes.json")
     }
 
     static var scenesDirectory: URL {
-        applicationSupportDirectory.appendingPathComponent("scenes")
+        applicationSupportDirectoryWithBundleID.appendingPathComponent("scenes")
     }
 
     static func sceneRoot(sceneId id: Int32) -> URL {
@@ -29,11 +22,11 @@ public extension URL {
     }
 
     static var shortcutMetadata: URL {
-        applicationSupportDirectory.appendingPathComponent("shortcuts.json")
+        applicationSupportDirectoryWithBundleID.appendingPathComponent("shortcuts.json")
     }
 
     static var shortcutRootDirectory: URL {
-        applicationSupportDirectory.appendingPathComponent("shortcuts")
+        applicationSupportDirectoryWithBundleID.appendingPathComponent("shortcuts")
     }
 
     static func shortcutDirectory(id: UUID) -> URL {

app/xcode/Sources/VCamData/URL+Data.swift

@@ -1,10 +1,3 @@
-//
-//  VCamSceneDataStore.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2023/03/29.
-//
-
 import Foundation
 import VCamEntity
 import VCamLocalization
@@ -32,7 +25,7 @@ public struct VCamSceneDataStore {
     }
 
     public func save(_ scene: VCamScene) throws {
-        try? FileManager.default.createDirectory(at: sceneRootURL, withIntermediateDirectories: true)
+        try? FileManager.default.createDirectoryIfNeeded(at: sceneRootURL)
 
         let url = sceneURL
         let encoder = JSONEncoder()
@@ -50,7 +43,7 @@ public struct VCamSceneDataStore {
             destination = dataURL(id: newUUID)
             uniDebugLog(destination.path)
 
-            try? FileManager.default.createDirectory(at: sceneRootURL, withIntermediateDirectories: true)
+            try? FileManager.default.createDirectoryIfNeeded(at: sceneRootURL)
             do {
                 try FileManager.default.copyItem(at: url, to: destination)
             } catch {

app/xcode/Sources/VCamData/VCamSceneDataStore.swift

@@ -1,10 +1,3 @@
-//
-//  VCamShortcutDataStore.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2023/03/29.
-//
-
 import Foundation
 import VCamEntity
 
@@ -28,7 +21,7 @@ public struct VCamShortcutDataStore {
         let encoder = JSONEncoder()
         let data = try encoder.encode(shortcut)
 
-        try? FileManager.default.createDirectory(at: .shortcutDirectory(id: shortcut.id), withIntermediateDirectories: true)
+        try? FileManager.default.createDirectoryIfNeeded(at: .shortcutDirectory(id: shortcut.id))
 
         let url = URL.shortcutData(id: shortcut.id)
         try data.write(to: url)

app/xcode/Sources/VCamData/VCamShortcutDataStore.swift

@@ -0,0 +1,17 @@
+public enum ModelType: String, Codable, Hashable, Sendable {
+#if FEATURE_3
+    case vrm
+#else
+    case live2d
+#endif
+
+    public var displayName: String {
+        switch self {
+#if FEATURE_3
+        case .vrm: return "VRM"
+#else
+        case .live2d: return "Live2D"
+#endif
+        }
+    }
+}

app/xcode/Sources/VCamEntity/ModelType.swift

@@ -1,10 +1,3 @@
-//
-//  VCamActionEditorCodeEditor.swift
-//  
-//
-//  Created by Tatsuya Tanaka on 2023/04/16.
-//
-
 import SwiftUI
 import VCamEntity
 
@@ -49,7 +42,7 @@ struct VCamActionEditorCodeEditor: View {
 
     private func openScript() {
         if !FileManager.default.fileExists(atPath: url.path) {
-            try? FileManager.default.createDirectory(at: .shortcutResourceActionDirectory(id: id, actionId: actionId), withIntermediateDirectories: true)
+            try? FileManager.default.createDirectoryIfNeeded(at: .shortcutResourceActionDirectory(id: id, actionId: actionId))
             try? "".write(to: url, atomically: true, encoding: .utf8)
         }
         NSWorkspace.shared.open(url)