Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Sources/UntoldEngine/Scenes/SceneSerializer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ struct AssetOverrideData: Codable {
var transform: LocalTransformOverrideData?
var material: MaterialData?
var visibility: Bool?
var name: String?
}

struct AssetInstanceData: Codable {
Expand Down Expand Up @@ -408,11 +409,14 @@ public func serializeScene() -> SceneData {

let visibilityOverride: Bool? = nil // TODO: track visibility if needed

let entityName = getEntityName(entityId: childId)

let override = AssetOverrideData(
nodePath: derivedComp.nodePath,
transform: transformOverride,
material: materialOverride,
visibility: visibilityOverride
visibility: visibilityOverride,
name: entityName
)
overrides.append(override)
}
Expand Down Expand Up @@ -1041,6 +1045,11 @@ private func applyAssetInstanceOverrides(entityId: EntityID, overrides: [AssetOv
}
}

// apply entity name override
if let entityName = override.name {
setEntityName(entityId: derivedEntityId, name: entityName)
}

appliedCount += 1
}

Expand Down
42 changes: 42 additions & 0 deletions Tests/UntoldEngineTests/SceneSerializerTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,48 @@ final class SceneSerializerTests: XCTestCase {
SSAOParams.shared.intensity = 0.0
}

// MARK: - Asset Instance Override Tests

func testSerializeSceneStoresDerivedNodeNameOverride() {
let rootId = createEntity()
setEntityName(entityId: rootId, name: "AssetRoot")

registerComponent(entityId: rootId, componentType: AssetInstanceComponent.self)
guard let assetInstance = scene.get(component: AssetInstanceComponent.self, for: rootId) else {
XCTFail("AssetInstanceComponent should exist on root entity")
return
}
assetInstance.assetURL = URL(fileURLWithPath: "/tmp/test.usdz")
assetInstance.assetName = "test"
assetInstance.importMode = "preserveHierarchy"
assetInstance.rootPrimPath = nil

let childId = createEntity()
setEntityName(entityId: childId, name: "RenamedChild")
setParent(childId: childId, parentId: rootId)

registerComponent(entityId: childId, componentType: DerivedAssetNodeComponent.self)
guard let derivedComp = scene.get(component: DerivedAssetNodeComponent.self, for: childId) else {
XCTFail("DerivedAssetNodeComponent should exist on child entity")
return
}
derivedComp.assetRootEntityId = rootId
derivedComp.nodePath = "Root/Child#0"

let sceneData = serializeScene()

XCTAssertEqual(sceneData.entities.count, 1, "Only the asset root should be serialized")
guard let serializedRoot = sceneData.entities.first else {
XCTFail("Serialized root entity should exist")
return
}
XCTAssertEqual(serializedRoot.name, "AssetRoot", "Root entity name should match")
XCTAssertNotNil(serializedRoot.assetInstance, "Asset instance data should be serialized")
XCTAssertEqual(serializedRoot.assetInstance?.overrides.count, 1, "Should serialize one derived override")
XCTAssertEqual(serializedRoot.assetInstance?.overrides.first?.nodePath, "Root/Child#0", "Override nodePath should match")
XCTAssertEqual(serializedRoot.assetInstance?.overrides.first?.name, "RenamedChild", "Override name should match")
}

// MARK: - Deserialization Tests

func testDeserializeEmptyScene() {
Expand Down
Loading