Skip to content
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

Jump to bottom

fix: AssImp orientation, imported material color fallback, and set default animation preview model #2291

Merged
merged 13 commits into from
Jun 18, 2024
Merged

fix: AssImp orientation, imported material color fallback, and set default animation preview model #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2dcba92
ported https://github.com/assimp/assimp/pull/5494/files
Doprez May 27, 2024
7e5362a
Cleanup
Eideren Jun 4, 2024
df679a5
Potential fix to investigate further
Eideren Jun 4, 2024
45c6279
Merge pull request #15 from Eideren/fix-incorrect-axis-on-import
Doprez Jun 4, 2024
2a8bacf
Fallback to BaseColor when diffuse is not available
Eideren Jun 4, 2024
e2636c4
Automatically set preview model on import for animations
Eideren Jun 4, 2024
d766dd4
Use BaseColor as Diffuse if Diffuse is not defined
Eideren Jun 4, 2024
f3abffa
Document pivot todo
Eideren Jun 5, 2024
9d4e1bd
Rollback transformations related logic
Eideren Jun 5, 2024
9ae194e
More cleanup
Eideren Jun 5, 2024
6edb63d
Fix issue when trying to import animation from an fbx without animations
Eideren Jun 5, 2024
02af13e
Merge pull request #16 from Eideren/fix-incorrect-axis-on-import
Doprez Jun 5, 2024
347538b
Merge branch 'master' into fix-incorrect-axis-on-import
Doprez Jun 8, 2024
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
60 changes: 22 additions & 38 deletions sources/engine/Stride.Assets.Models/ModelAssetImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Stride.Core;
using Stride.Core.Assets;
using Stride.Core.Assets.Analysis;
Expand Down Expand Up @@ -97,33 +98,29 @@ public override IEnumerable<AssetItem> Import(UFile localPath, AssetImporterPara
skeletonAsset = ImportSkeleton(rawAssetReferences, localPath, localPath, entityInfo);
}

// 3. Animation
if (importParameters.IsTypeSelectedForOutput<AnimationAsset>())
{
int _iAnimIndex = 0;
entityInfo?.AnimationNodes?.ForEach(c =>
{
TimeSpan startTime, endTime;
GetAnimationDuration(localPath, importParameters.Logger, importParameters, _iAnimIndex, out startTime, out endTime);

ImportAnimation(rawAssetReferences, localPath, entityInfo.AnimationNodes[_iAnimIndex], _iAnimIndex, skeletonAsset, startTime, endTime);

_iAnimIndex++;
});


}

// 4. Materials
// 3. Materials
if (isImportingMaterial)
{
ImportMaterials(rawAssetReferences, entityInfo.Materials);
}

// 5. Model
ModelAsset modelAsset = null;
// 4. Model
if (isImportingModel)
{
ImportModel(rawAssetReferences, localPath, localPath, entityInfo, false, skeletonAsset);
modelAsset = ImportModel(rawAssetReferences, localPath, localPath, entityInfo, false, skeletonAsset);
}

// 5. Animation
if (importParameters.IsTypeSelectedForOutput<AnimationAsset>())
{
for (int i = 0; i < entityInfo.AnimationNodes.Count; i++)
{
TimeSpan startTime, endTime;
GetAnimationDuration(localPath, importParameters.Logger, importParameters, i, out startTime, out endTime);

ImportAnimation(rawAssetReferences, localPath, entityInfo.AnimationNodes[i], i, skeletonAsset, modelAsset, startTime, endTime);
}
}

return rawAssetReferences;
Expand Down Expand Up @@ -151,23 +148,7 @@ private static AssetItem ImportSkeleton(List<AssetItem> assetReferences, UFile a
return assetItem;
}

private static void ImportAnimation(List<AssetItem> assetReferences, UFile localPath, List<string> animationNodes, bool shouldPostFixName, AssetItem skeletonAsset, TimeSpan animationStartTime, TimeSpan animationEndTime)
{
if (animationNodes != null && animationNodes.Count > 0)
{
var assetSource = localPath;

var asset = new AnimationAsset { Source = assetSource, AnimationTimeMaximum = animationEndTime, AnimationTimeMinimum = animationStartTime };
var animUrl = localPath.GetFileNameWithoutExtension() + (shouldPostFixName ? " Animation" : "");

if (skeletonAsset != null)
asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);

assetReferences.Add(new AssetItem(animUrl, asset));
}
}

private static void ImportAnimation(List<AssetItem> assetReferences, UFile localPath, string animationNodeName, int animationNodeIndex, AssetItem skeletonAsset, TimeSpan animationStartTime, TimeSpan animationEndTime)
private static void ImportAnimation(List<AssetItem> assetReferences, UFile localPath, string animationNodeName, int animationNodeIndex, [MaybeNull]AssetItem skeletonAsset, [MaybeNull]ModelAsset modelAsset, TimeSpan animationStartTime, TimeSpan animationEndTime)
{
var assetSource = localPath;
var asset = new AnimationAsset { Source = assetSource, AnimationTimeMaximum = animationEndTime, AnimationTimeMinimum = animationStartTime };
Expand All @@ -189,11 +170,13 @@ private static void ImportAnimation(List<AssetItem> assetReferences, UFile local
asset.AnimationStack = animationNodeIndex;
if (skeletonAsset != null)
asset.Skeleton = AttachedReferenceManager.CreateProxyObject<Skeleton>(skeletonAsset.Id, skeletonAsset.Location);
if (modelAsset != null)
asset.PreviewModel = AttachedReferenceManager.CreateProxyObject<Model>(modelAsset.Id, modelAsset.Source);

assetReferences.Add(new AssetItem(animUrl, asset));
}

private static void ImportModel(List<AssetItem> assetReferences, UFile assetSource, UFile localPath, EntityInfo entityInfo, bool shouldPostFixName, AssetItem skeletonAsset)
private static ModelAsset ImportModel(List<AssetItem> assetReferences, UFile assetSource, UFile localPath, EntityInfo entityInfo, bool shouldPostFixName, AssetItem skeletonAsset)
{
var asset = new ModelAsset { Source = assetSource };

Expand Down Expand Up @@ -229,6 +212,7 @@ private static void ImportModel(List<AssetItem> assetReferences, UFile assetSour
var modelUrl = new UFile(localPath.GetFileNameWithoutExtension() + (shouldPostFixName?" Model": ""));
var assetItem = new AssetItem(modelUrl, asset);
assetReferences.Add(assetItem);
return asset;
}

private static void ImportMaterials(List<AssetItem> assetReferences, Dictionary<string, MaterialAsset> materials)
Expand Down
Loading