Decouple AssImp from Scene Importer

Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h

@@ -11,6 +11,8 @@
 
 struct aiScene;
 
+struct aiNode;
+
 namespace AZ
 {
     namespace AssImpSDKWrapper

Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.cpp

@@ -8,9 +8,10 @@
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Settings/SettingsRegistry.h>
 #include <AzToolsFramework/Debug/TraceContext.h>
-#include <SceneAPI/SceneCore/Utilities/Reporting.h>
-#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
 #include <SceneAPI/SDKWrapper/AssImpNodeWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpSceneWrapper.h>
+#include <SceneAPI/SDKWrapper/AssImpTypeConverter.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
 #include <assimp/postprocess.h>
 
 #if AZ_TRAIT_COMPILER_SUPPORT_CSIGNAL
@@ -38,11 +39,12 @@ namespace AZ
         }
 
 #if AZ_TRAIT_COMPILER_SUPPORT_CSIGNAL
-        void signal_handler([[maybe_unused]] int signal) 
+        void signal_handler([[maybe_unused]] int signal)
         {
             AZ_TracePrintf(
                 SceneAPI::Utilities::ErrorWindow,
-                "Failed to import scene with Asset Importer library. An %s has occurred in the library, this scene file cannot be parsed by the library.",
+                "Failed to import scene with Asset Importer library. An %s has occurred in the library, this scene file cannot be parsed "
+                "by the library.",
                 signal == SIGABRT ? "assert" : "unknown error");
         }
 #endif // AZ_TRAIT_COMPILER_SUPPORT_CSIGNAL
@@ -58,7 +60,7 @@ namespace AZ
 #ifdef _WRITE_ABORT_MSG
             _set_abort_behavior(0, _WRITE_ABORT_MSG);
 #endif // #ifdef _WRITE_ABORT_MSG
-            // Instead, capture any calls to abort with a signal handler, and report them.
+       // Instead, capture any calls to abort with a signal handler, and report them.
             auto previous_handler = std::signal(SIGABRT, signal_handler);
 #endif // AZ_TRAIT_COMPILER_SUPPORT_CSIGNAL
 
@@ -71,12 +73,11 @@ namespace AZ
             // aiProcess_JoinIdenticalVertices is not enabled because O3DE has a mesh optimizer that also does this,
             // this flag is disabled to keep AssImp output similar to FBX SDK to reduce downstream bugs for the initial AssImp release.
             // There's currently a minimum of properties and flags set to maximize compatibility with the existing node graph.
-            unsigned int importFlags =
-                aiProcess_Triangulate                                               // Triangulates all faces of all meshes
-                | static_cast<unsigned long>(aiProcess_GenBoundingBoxes)            // Generate bounding boxes
-                | aiProcess_GenNormals                                              // Generate normals for meshes
-                | (importSettings.m_optimizeScene ? aiProcess_OptimizeGraph : 0)    // Merge excess scene nodes together
-                | (importSettings.m_optimizeMeshes ? aiProcess_OptimizeMeshes : 0)  // Combines meshes in the scene together
+            unsigned int importFlags = aiProcess_Triangulate // Triangulates all faces of all meshes
+                | static_cast<unsigned long>(aiProcess_GenBoundingBoxes) // Generate bounding boxes
+                | aiProcess_GenNormals // Generate normals for meshes
+                | (importSettings.m_optimizeScene ? aiProcess_OptimizeGraph : 0) // Merge excess scene nodes together
+                | (importSettings.m_optimizeMeshes ? aiProcess_OptimizeMeshes : 0) // Combines meshes in the scene together
                 ;
 
             // aiProcess_LimitBoneWeights is not enabled because it will remove bones which are not associated with a mesh.
@@ -100,7 +101,10 @@ namespace AZ
 
             if (!m_assImpScene)
             {
-                AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "Failed to import Asset Importer Scene. Error returned: %s", m_importer->GetErrorString());
+                AZ_TracePrintf(
+                    SceneAPI::Utilities::ErrorWindow,
+                    "Failed to import Asset Importer Scene. Error returned: %s",
+                    m_importer->GetErrorString());
                 return false;
             }
 
@@ -153,7 +157,7 @@ namespace AZ
 
         void AssImpSceneWrapper::Clear()
         {
-            if(m_importer)
+            if (m_importer)
             {
                 m_importer->FreeScene();
                 m_importer = AZStd::make_unique<Assimp::Importer>();
@@ -184,6 +188,37 @@ namespace AZ
             result.first = static_cast<AssImpSceneWrapper::AxisVector>(frontVectorRead);
             return result;
         }
-    }//namespace AssImpSDKWrapper
+
+        float AssImpSceneWrapper::GetUnitSizeInMeters() const
+        {
+            float unitSizeInMeters;
+            float originalUnitSizeInMeters;
+            /* Check if metadata has information about "UnitScaleFactor" or "OriginalUnitScaleFactor".
+             * This particular metadata is FBX format only. */
+            if (m_assImpScene->mMetaData->HasKey("UnitScaleFactor") || m_assImpScene->mMetaData->HasKey("OriginalUnitScaleFactor"))
+            {
+                // If either metadata piece is not available, the default of 1 will be used.
+                m_assImpScene->mMetaData->Get("UnitScaleFactor", unitSizeInMeters);
+                m_assImpScene->mMetaData->Get("OriginalUnitScaleFactor", originalUnitSizeInMeters);
+
+                /* Conversion factor for converting from centimeters to meters.
+                 * This applies to an FBX format in which the default unit is a centimeter. */
+                unitSizeInMeters = unitSizeInMeters * .01f;
+            }
+            else
+            {
+                // Some file formats (like DAE) embed the scale in the root transformation, so extract that scale from here.
+                auto rootTransform = AssImpSDKWrapper::AssImpTypeConverter::ToTransform(m_assImpScene->mRootNode->mTransformation);
+                unitSizeInMeters = rootTransform.ExtractScale().GetMaxElement();
+            }
+            return unitSizeInMeters;
+        }
+
+        AZ::Aabb AssImpSceneWrapper::GetAABB() const
+        {
+            return AZ::Aabb::CreateFromMinMaxValues(
+                m_aabb.mMin.x, m_aabb.mMin.y, m_aabb.mMin.z, m_aabb.mMax.x, m_aabb.mMax.y, m_aabb.mMax.z);
+        }
+    } // namespace AssImpSDKWrapper
 
 } // namespace AZ

Code/Tools/SceneAPI/SDKWrapper/AssImpSceneWrapper.h

@@ -34,20 +34,13 @@ namespace AZ
             void Clear() override;
             void CalculateAABBandVertices(const aiScene* scene, aiAABB& aabb, uint32_t& vertices);
 
-            enum class AxisVector
-            {
-                X = 0,
-                Y = 1,
-                Z = 2,
-                Unknown
-            };
-
-            AZStd::pair<AxisVector, int32_t> GetUpVectorAndSign() const;
-            AZStd::pair<AxisVector, int32_t> GetFrontVectorAndSign() const;
+            AZStd::pair<AxisVector, int32_t> GetUpVectorAndSign() const override;
+            AZStd::pair<AxisVector, int32_t> GetFrontVectorAndSign() const override;
+            float GetUnitSizeInMeters() const override;
 
             AZStd::string GetSceneFileName() const { return m_sceneFileName; }
-            aiAABB GetAABB() const { return m_aabb; }
-            uint32_t GetVertices() const { return m_vertices; }
+            AZ::Aabb GetAABB() const override;
+            uint32_t GetVerticesCount() const override { return m_vertices; }
         protected:
             const aiScene* m_assImpScene = nullptr;
             AZStd::unique_ptr<Assimp::Importer> m_importer;

Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.cpp

@@ -34,20 +34,6 @@ namespace AZ
             return transform;
         }
 
-        SceneAPI::DataTypes::MatrixType AssImpTypeConverter::ToTransform(const AZ::Matrix4x4& matrix)
-        {
-            SceneAPI::DataTypes::MatrixType transform;
-            for (int row = 0; row < 3; ++row)
-            {
-                for (int column = 0; column < 4; ++column)
-                {
-                    transform.SetElement(row, column, matrix.GetElement(row, column));
-                }
-            }
-
-            return transform;
-        }
-
         SceneAPI::DataTypes::Color AssImpTypeConverter::ToColor(const aiColor4D& color)
         {
             return AZ::SceneAPI::DataTypes::Color(color.r, color.g, color.b, color.a);

Code/Tools/SceneAPI/SDKWrapper/AssImpTypeConverter.h

@@ -27,7 +27,6 @@ namespace AZ
         {
         public:
             static SceneAPI::DataTypes::MatrixType ToTransform(const aiMatrix4x4& matrix);
-            static SceneAPI::DataTypes::MatrixType ToTransform(const AZ::Matrix4x4& matrix);
             static SceneAPI::DataTypes::Color ToColor(const aiColor4D& color);
             static AZ::Vector3 ToVector3(const aiVector3D& vector3);
         };

Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h

@@ -11,8 +11,6 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/Math/Vector3.h>
 
-struct aiMaterial;
-
 namespace AZ
 {
     namespace SDKMaterial

Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h

@@ -9,8 +9,6 @@
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 
-struct aiNode;
-
 namespace AZ
 {
     namespace SDKNode

Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp

@@ -5,6 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
+#include <AzCore/Math/Aabb.h>
 #include <SceneAPI/SDKWrapper/SceneWrapper.h>
 
 namespace AZ
@@ -36,5 +37,47 @@ namespace AZ
         void SceneWrapperBase::Clear()
         {
         }
+
+        AZStd::pair<SceneWrapperBase::AxisVector, int32_t> SceneWrapperBase::GetUpVectorAndSign() const
+        {
+            return {AxisVector::Z, 1};
+        }
+
+        AZStd::pair<SceneWrapperBase::AxisVector, int32_t> SceneWrapperBase::GetFrontVectorAndSign() const
+        {
+            return { AxisVector::X, 1};
+        }
+
+        float SceneWrapperBase::GetUnitSizeInMeters() const
+        {
+            return 1.0f;
+        }
+
+        AZ::Aabb SceneWrapperBase::GetAABB() const
+        {
+            return AZ::Aabb::CreateNull();
+        }
+
+        uint32_t SceneWrapperBase::GetVerticesCount() const
+        {
+            return 0u;
+        }
+
+
+        SceneAPI::DataTypes::MatrixType SceneTypeConverter::ToTransform(const AZ::Matrix4x4& matrix)
+        {
+            SceneAPI::DataTypes::MatrixType transform;
+            for (int row = 0; row < 3; ++row)
+            {
+                for (int column = 0; column < 4; ++column)
+                {
+                    transform.SetElement(row, column, matrix.GetElement(row, column));
+                }
+            }
+
+            return transform;
+        }
+
+
     } //namespace SDKScene
 }// namespace AZ

Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h

@@ -8,11 +8,11 @@
 #pragma once
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/string/string.h>
+#include <AzCore/Math/Aabb.h>
 #include <SceneAPI/SDKWrapper/NodeWrapper.h>
+#include <SceneAPI/SceneCore/DataTypes/MatrixType.h>
 #include <SceneAPI/SceneCore/Import/SceneImportSettings.h>
 
-struct aiScene;
-
 namespace AZ
 {
     namespace SDKScene
@@ -31,8 +31,28 @@ namespace AZ
 
             virtual void Clear();
 
+            enum class AxisVector
+            {
+                X = 0,
+                Y = 1,
+                Z = 2,
+                Unknown
+            };
+
+            virtual AZStd::pair<AxisVector, int32_t> GetUpVectorAndSign() const;
+            virtual AZStd::pair<AxisVector, int32_t> GetFrontVectorAndSign() const;
+            virtual float GetUnitSizeInMeters() const;
+            virtual AZ::Aabb GetAABB() const;
+            virtual uint32_t GetVerticesCount() const;
+
             static const char* s_defaultSceneName;
         };
 
-    } //namespace Scene
-} //namespace AZ
+        class SceneTypeConverter
+        {
+        public:
+            static SceneAPI::DataTypes::MatrixType ToTransform(const AZ::Matrix4x4& matrix);
+        };
+
+    } // namespace SDKScene
+} // namespace AZ

Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp

@@ -8,26 +8,30 @@
 
 #if !defined(AZ_MONOLITHIC_BUILD)
 
+#include "ImportContexts/AssImpImportContextProvider.h"
+#include "SceneBuilderSystemComponent.h"
+
 #include <AzCore/Component/Component.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
-#include <AzCore/std/containers/vector.h>
 #include <AzCore/Module/Environment.h>
+#include <AzCore/std/containers/vector.h>
+#include <SceneAPI/SceneBuilder/ImportContextRegistry.h>
 #include <SceneAPI/SceneBuilder/SceneImportRequestHandler.h>
 
-#include <SceneAPI/SceneBuilder/SceneImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpCustomPropertyImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h>
+#include <SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h>
 #include <SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h>
-#include <SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h>
-#include <SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h>
-#include <SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h>
-#include <SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h>
-#include <SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h>
+#include <SceneAPI/SceneBuilder/SceneImporter.h>
 
 namespace AZ
 {
@@ -50,6 +54,9 @@ namespace AZ
                     g_componentDescriptors.push_back(SceneBuilder::SceneImporter::CreateDescriptor());
                     g_componentDescriptors.push_back(SceneImportRequestHandler::CreateDescriptor());
 
+                    // ImportContextProviderRegistry
+                    g_componentDescriptors.push_back(SceneBuilderSystemComponent::CreateDescriptor());
+
                     // Node and attribute importers
                     g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
                     g_componentDescriptors.push_back(AssImpColorStreamImporter::CreateDescriptor());
@@ -103,6 +110,8 @@ namespace AZ
 
 extern "C" AZ_DLL_EXPORT void InitializeDynamicModule()
 {
+    // Scott-Meyers singleton as no clear way how to add SystemComponent to module
+    AZ::SceneAPI::SceneBuilder::ImportContextRegistryManager::GetInstance();
 }
 extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
 {