Skip to content

fixed mesh async loading for skeleton component #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untoldengine merged 1 commit into from
Jan 9, 2026
Merged

fixed mesh async loading for skeleton component #930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 60 additions & 14 deletions Sources/UntoldEngine/Scenes/SceneSerializer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,12 +637,38 @@ public func deserializeScene(sceneData: SceneData, meshLoadingMode: MeshLoadingM
setEntityMesh(entityId: entityId, filename: filename, withExtension: withExtension, assetName: nil)
// Apply overrides synchronously after import
applyAssetInstanceOverrides(entityId: entityId, overrides: assetInstance.overrides)

// Setup animations (skeleton is now available)
if sceneDataEntity.hasAnimationComponent == true {
for animations in sceneDataEntity.animations {
let animationFilename = animations.deletingPathExtension().lastPathComponent
let animationFilenameExt = animations.pathExtension
setEntityAnimations(entityId: entityId, filename: animationFilename, withExtension: animationFilenameExt, name: animationFilename)
changeAnimation(entityId: entityId, name: animationFilename)
}
if let animationComponent = scene.get(component: AnimationComponent.self, for: entityId) {
animationComponent.animationsFilenames = sceneDataEntity.animations
}
}
case .asyncDefault:
setEntityMeshAsync(entityId: entityId, filename: filename, withExtension: withExtension, assetName: nil) { success in
if success {
Logger.log(message: "✅ Asset instance '\(sceneDataEntity.name)' loaded")
// Apply overrides after async import completes
applyAssetInstanceOverrides(entityId: entityId, overrides: assetInstance.overrides)

// Setup animations (skeleton is now available)
if sceneDataEntity.hasAnimationComponent == true {
for animations in sceneDataEntity.animations {
let animationFilename = animations.deletingPathExtension().lastPathComponent
let animationFilenameExt = animations.pathExtension
setEntityAnimations(entityId: entityId, filename: animationFilename, withExtension: animationFilenameExt, name: animationFilename)
changeAnimation(entityId: entityId, name: animationFilename)
}
if let animationComponent = scene.get(component: AnimationComponent.self, for: entityId) {
animationComponent.animationsFilenames = sceneDataEntity.animations
}
}
} else {
Logger.logWarning(message: "❌ Asset instance '\(sceneDataEntity.name)' failed to load")
}
Expand All @@ -656,13 +682,39 @@ public func deserializeScene(sceneData: SceneData, meshLoadingMode: MeshLoadingM
case .sync:
setEntityMesh(entityId: entityId, filename: filename, withExtension: withExtension, assetName: sceneDataEntity.assetName)
applyLocalTransform()

// Setup animations (skeleton is now available)
if sceneDataEntity.hasAnimationComponent == true {
for animations in sceneDataEntity.animations {
let animationFilename = animations.deletingPathExtension().lastPathComponent
let animationFilenameExt = animations.pathExtension
setEntityAnimations(entityId: entityId, filename: animationFilename, withExtension: animationFilenameExt, name: animationFilename)
changeAnimation(entityId: entityId, name: animationFilename)
}
if let animationComponent = scene.get(component: AnimationComponent.self, for: entityId) {
animationComponent.animationsFilenames = sceneDataEntity.animations
}
}
case .asyncDefault:
let fallbackLabel = withExtension.isEmpty ? filename : "\(filename).\(withExtension)"
let meshLabel = sceneDataEntity.name.isEmpty ? fallbackLabel : sceneDataEntity.name
setEntityMeshAsync(entityId: entityId, filename: filename, withExtension: withExtension, assetName: sceneDataEntity.assetName) { success in
applyLocalTransform()
if success {
Logger.log(message: "✅ Mesh loaded for \(meshLabel)")

// Setup animations (skeleton is now available)
if sceneDataEntity.hasAnimationComponent == true {
for animations in sceneDataEntity.animations {
let animationFilename = animations.deletingPathExtension().lastPathComponent
let animationFilenameExt = animations.pathExtension
setEntityAnimations(entityId: entityId, filename: animationFilename, withExtension: animationFilenameExt, name: animationFilename)
changeAnimation(entityId: entityId, name: animationFilename)
}
if let animationComponent = scene.get(component: AnimationComponent.self, for: entityId) {
animationComponent.animationsFilenames = sceneDataEntity.animations
}
}
} else {
Logger.logWarning(message: "❌ Mesh failed for \(meshLabel)")
}
Expand Down Expand Up @@ -698,20 +750,14 @@ public func deserializeScene(sceneData: SceneData, meshLoadingMode: MeshLoadingM
}
}

if sceneDataEntity.hasAnimationComponent == true {
for animations in sceneDataEntity.animations {
let animationFilename = animations.deletingPathExtension().lastPathComponent
let animationFilenameExt = animations.pathExtension

setEntityAnimations(entityId: entityId, filename: animationFilename, withExtension: animationFilenameExt, name: animationFilename)

changeAnimation(entityId: entityId, name: animationFilename)
}

if let animationComponent = scene.get(component: AnimationComponent.self, for: entityId) {
animationComponent.animationsFilenames = sceneDataEntity.animations
}
}
// Animation setup is now handled inside mesh loading completion handlers
// (for asset instances and rendering components) to ensure skeleton component is available.
// For entities without meshes (cameras, lights, empty parents), animations wouldn't apply anyway
// since they require a skeleton, which comes from mesh loading.
//
// Note: For multi-mesh assets, the skeleton is on child entities, not the parent.
// If sceneDataEntity has hasAnimationComponent but is a multi-mesh parent, the animations
// should actually be applied to the specific child entity that has the skeleton.

if sceneDataEntity.hasKineticComponent == true {
setEntityKinetics(entityId: entityId)
Expand Down
Loading