[Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) #2163

Eideren · 2024-02-20T17:51:09Z

PR Details

Replaces the C++/CLI FBX importer with a managed c# one using Assimp
https://opencollective.com/stride3d/projects/fbx-import-cpp-to-c-sharp
Fix #1923

Types of changes

Docs change / refactoring / dependency upgrade
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist

My change requires a change to the documentation.
I have added tests to cover my changes.
All new and existing tests passed.
I have built and run the editor to try this change out.

Kryptos-FR

Some files not needed, like the workspace.db (couldn't add a comment to that binary file).

sources/Directory.Packages.props

Kryptos-FR · 2024-02-20T18:44:14Z

sources/core/Stride.Core.CompilerServices/Common/DiagnosticCategory.cs

@@ -3,4 +3,5 @@ public static class DiagnosticCategory
 {
    public const string Serialization = "Serialization";
    public const string LinkFormat = "https://doc.stride3d.net/latest/en/diagnostics/{0}.html";
+


Unnecessary change.

Kryptos-FR · 2024-02-20T18:44:45Z

sources/editor/Stride.Assets.Presentation/Templates/ModelFromFileTemplateGenerator.cs

+         /*   var showFbxDedupeNotSupportedWarning = showDeduplicateMaterialsCheckBox && files.Any(x => ImportFbxCommand.IsSupportingExtensions(x.GetFileExtension()));
+          */


Remove code instead of commenting it out.

sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor_5yobaqbr_wpftmp.csproj

sources/engine/Stride.Assets.Models/Stride.Assets.Models.csproj

build/Stride.sln

Eideren · 2024-02-20T19:00:34Z

Thanks again @Noah7071 - didn't go too deep into the review yet, just did a quick test using the animation sample.
It mostly works, just a couple of things to iron out;
Looks like right now the fbx scale and or axis is not taken into account, here's the scale as is with the PR:

And what it should be:

Running the sample makes the character run sideways, likely because of the custom axis of rotation / coordinate basis embedded in that particular fbx:

sources/tools/Stride.Importer.3D/Utils.cs

sources/engine/Stride.Assets.Models/ImportModelCommand.cs

sources/engine/Stride.Assets.Models/Stride.Assets.Models.csproj

sources/Directory.Packages.props

build/_workspaces.db

Noah7071 · 2024-02-21T12:29:51Z

Some files not needed, like the workspace.db (couldn't add a comment to that binary file).

Done, Reverted.

sources/editor/Stride.GameStudio/Stride.GameStudio.csproj

* Remove docs, has been moved to Stride docs repo * [OpenXR] Fixes build on graphics APIs other than D3D11 This build regression was introduced by previous commit d72aef5 * Update samples to Stride 4.2 (stride3d#2132) * [Samples] Update to 4.2 * [Samples] Remove Newtonsoft.Json dependency in CSharpIntermediate * [Tests] Fixes random test failures (stride3d#2133) * [Tests] Fixes random test failures Some of the tests in Stride.GameStudio.Tests must not run in parallel as they access a shared class which is not thread safe. * Sets wait time in TestFileVersionManager to 500ms (from 200) Should make it less likely that unit tests on teamcity fail. * Repair projectwatcher (stride3d#2106) * use positive 77 * repair projectwatcher * remove unused line * undo -77 change * undo -77 * order usings * fix formatting * remove unused solution * remove unused async * use previous cancelation method * remove extra task * add check to not throw assembly changes away * rework distribution of assemblychanges * remove unused using * add broadcast back in * remove assembly broadcast * add cancelation * replace cancelation location * improve if nesting * improve naming, fix reload on new references * fix loading chain of assets * refactor * [Editor] Refactor initialization of CodeViewModel --------- Co-authored-by: IXLLEGACYIXL <[email protected]> Co-authored-by: Nicolas Musset <[email protected]> * [OpenVR] Adds a minimal API to request and control Passthrough (supported by OpenXR) https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#XR_FB_passthrough * [OpenXR] Makes device construction internal and improves exception messages of new StartPassthrough method * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] * [Assets] Prevent crash of the assets compiler when an assembly cannot be fully loaded. (stride3d#2144) Fixes stride3d#2140 * [Build] Remove stylecop (stride3d#2105) Co-authored-by: IXLLEGACYIXL <[email protected]> * [Presentation] Rework AssetViewModelAttribute * [Editor] Cleanup * [Assets] Mark Editor as obsolete on AssetViewModel * [Editor] Make Asset property public on all editors * [Editor] Make IAssetEditorsManager a service * [Editor] Keep track of asset/editor association in AssetEditorsManager * [Editor] Add a method to find an opened editor * [Editor] Change binding logic in editor views The default DataContext is now the editor instead of the asset * [Editor] Update sprite editor bindings * [Editor] Update UI editor bindings * [Editor] Update entity hierarchy editor bindings * [Editor] Update script editor bindings * [Editor] Update graphics compositor editor bindings * [Editor] Removed pointless constraint on column width Which is also spamming the console with binding errors. * [Editor] Remove editor-related properties from AssetViewModel * [Editor] Rework AssetEditorViewModelAttribute - add AssetEditorViewAttribute - rework view creation and initialization * [Editor] Make AssetEditorViewModel.Asset property virtual C# has covariant return types since version 9 * [Editor] Rework plugins initialization * [Editor] Rework AssetPreviewViewModelAttribute & AssetPreviewAttribute - add AssetPreviewViewAttribute to break the dependency between a preview and its UI-dependent view * [Editor] Fix initialization of SpriteSheetEditorViewModel returning false * [Editor] Make Stride.Core.Presentation.Quantum cross-platform * [Editor] Make Stride.Core.Assets.Quantum cross-platform * [Editor] Do not load StrideDefaultAssetsPlugin from module. It currently hardcodes loading the templates from a package which causes some tests to fail. Partially reverts c98c72e * feat: Release.yml added for PR categorisation (stride3d#2137) * feat: Release.yml added for PR categorisation * Categories updated * [Editor] Fix scene editor loading screen * [VR] feat: Add haptic support to OpenVR and Oculus runtimes (stride3d#2169) Co-authored-by: Eideren <[email protected]> * [Audio] Audio emitter multiple references to same asset bugfix (stride3d#2176) Co-authored-by: Eideren <[email protected]> * Use correct destination path in asset import overwrite dialog * Use GetFullPath to correct directory seperator for display * fix: File GraphicsResourceMap.cs without references removed (stride3d#2181) * feat: Update samples/template to top-level statements (stride3d#2187) * Update README.md (prerequisites) * Update README.md (VSIX prerequisites) * [VSPackage] Revert a few package upgrades so that VSIX builds properly * [Presentation] Fix issue with binding quantum nodes when associated name is not found (stride3d#2195) Note: the solution is rather hackish at the moment. To be revisited once we have an Avalonia version. Should we then introduce a service for setting/retrieving the Unset value * fix: [Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) (stride3d#2163) Co-authored-by: noa7 <[email protected]> Co-authored-by: noa7707 <[email protected]> Co-authored-by: Noah7071 <[email protected]> --------- Co-authored-by: JornosDesktop <[email protected]> Co-authored-by: Elias Holzer <[email protected]> Co-authored-by: Nicolas Musset <[email protected]> Co-authored-by: IXLLEGACYIXL <[email protected]> Co-authored-by: IXLLEGACYIXL <[email protected]> Co-authored-by: Nicolas Musset <[email protected]> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Jorn Theunissen <[email protected]> Co-authored-by: Marian Dziubiak <[email protected]> Co-authored-by: Vaclav Elias <[email protected]> Co-authored-by: Addison Schmidt <[email protected]> Co-authored-by: Eideren <[email protected]> Co-authored-by: Tim Conner <[email protected]> Co-authored-by: Jakub Ławreszuk <[email protected]> Co-authored-by: xen2 <[email protected]> Co-authored-by: noa7 <[email protected]> Co-authored-by: noa7707 <[email protected]> Co-authored-by: Noah7071 <[email protected]>

noa7 and others added 15 commits January 30, 2024 07:38

BASE COMM

ed0e939

Updates on Shader and resource marshaling

a3f044a

Update- cleanup

8a3c13f

Updates- clean up

a679906

Updates

afe10c0

Updates as by Eidren & IXLLEGACYIXL on Github PR review

0a516fd

Update shader- remove commented test code

6649b09

Update: Clean up to effect class & shader

6ed75b6

Scale Factor moved to Importer

5db94d9

Removed extra class Vec4

c04c84d

Fix to update scale factor in impoter

e66c0c8

Normal fix on blendshapes

36c3daf

Normal fix

06c130b

IMPORTER CKECIIN

1751b13

Importer

af97e33

Kryptos-FR reviewed Feb 20, 2024

View reviewed changes

Doprez reviewed Feb 20, 2024

View reviewed changes

sources/engine/Stride.Assets.Models/Stride.Assets.Models.csproj Outdated Show resolved Hide resolved

Eideren commented Feb 20, 2024

View reviewed changes

build/Stride.sln Outdated Show resolved Hide resolved

Noah7071 added 2 commits February 20, 2024 20:54

Incorporating Kryptos feedback on PR

b479aac

Incorporating doprez feedback

f492fc5

IXLLEGACYIXL reviewed Feb 20, 2024

View reviewed changes

sources/tools/Stride.Importer.3D/Utils.cs Outdated Show resolved Hide resolved

Jklawreszuk reviewed Feb 21, 2024

View reviewed changes

Noah7071 added 3 commits February 21, 2024 13:03

Updated .props to remove Assimp from Runtime refs

52bb440

Feedback from Jklawreszuk

67fe225

Removed workspace file, Jklawreszuk

396b3e3

Noah7071 added 2 commits February 21, 2024 13:40

Feedback from IXLLEGACYIXL

d8bed82

Account for default scaling

7cbd671

Wolffy101 reviewed Feb 21, 2024

View reviewed changes

sources/editor/Stride.GameStudio/Stride.GameStudio.csproj Outdated Show resolved Hide resolved

Noah7071 added 16 commits April 2, 2024 21:38

Duplicate line

ead5eee

Duplicate line

b56c555

Removed Impoter.Assimp

82720dd

Shift keys

9b54db5

Removed namespace

1c1b85f

Mannaquin bones fix

4a78465

Animation pivots

cfe2466

Anim fix

774d286

Anim Importer Debone Fix

98095c8

spacing and comm code

a68e883

Hashset for list bone name

23535bf

extra parameter

55e2d25

UV coords fixed

2128a92

Spacings removaal

b260e77

more spacing

ef3ef1f

spacing

dd4ba9f

Eideren marked this pull request as ready for review April 3, 2024 21:27

Eideren changed the title ~~[WIP][Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071)~~ [Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) Apr 3, 2024

Eideren added 5 commits April 3, 2024 23:54

Fix line ending for Directory.Packages.props

e8209e3

Fix spacing

e86da5d

Rollback analyzer change

5ad2373

Fix spacing

20815cd

Merge branch 'master' into Unified_ThreeD_Importer

5d7522c

Eideren added the area-Asset label Apr 4, 2024

Eideren merged commit 0e053a3 into stride3d:master Apr 4, 2024
13 checks passed

This was referenced Apr 4, 2024

[Asset] Handle assets containing multiple animations per file #328

Closed

Animation Import with .fbx file leads to permanent asset loading #1584

Closed

Noah7071 mentioned this pull request Apr 6, 2024

Model importer regression in master #2213

Closed

Doprez mentioned this pull request May 28, 2024

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

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) #2163

[Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) #2163

Eideren commented Feb 20, 2024 •

edited

Loading

Kryptos-FR left a comment

Kryptos-FR Feb 20, 2024

Noah7071 Feb 20, 2024

Kryptos-FR Feb 20, 2024

Noah7071 Feb 20, 2024

Eideren commented Feb 20, 2024 •

edited

Loading

Noah7071 commented Feb 21, 2024

		/* var showFbxDedupeNotSupportedWarning = showDeduplicateMaterialsCheckBox && files.Any(x => ImportFbxCommand.IsSupportingExtensions(x.GetFileExtension()));
		*/

[Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) #2163

[Asset] Unified 3D asset importer (on behalf of Noa7/Noah7071) #2163

Conversation

Eideren commented Feb 20, 2024 • edited Loading

PR Details

Types of changes

Checklist

Kryptos-FR left a comment

Choose a reason for hiding this comment

Kryptos-FR Feb 20, 2024

Choose a reason for hiding this comment

Noah7071 Feb 20, 2024

Choose a reason for hiding this comment

Kryptos-FR Feb 20, 2024

Choose a reason for hiding this comment

Noah7071 Feb 20, 2024

Choose a reason for hiding this comment

Eideren commented Feb 20, 2024 • edited Loading

Noah7071 commented Feb 21, 2024

Eideren commented Feb 20, 2024 •

edited

Loading

Eideren commented Feb 20, 2024 •

edited

Loading