diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp index 33f5f43962..28d1850b40 100644 --- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp @@ -446,7 +446,7 @@ void ApplicationManager::PopulateApplicationDependencies() // any of those should cause AP to drop. for (const QString& pathName : { "CrySystem", "SceneCore", "SceneData", - "FbxSceneBuilder", "AzQtComponents" + "SceneBuilder", "AzQtComponents" }) { QString pathWithPlatformExtension = pathName + QString(AZ_DYNAMIC_LIBRARY_EXTENSION); diff --git a/Code/Tools/SceneAPI/CMakeLists.txt b/Code/Tools/SceneAPI/CMakeLists.txt index 6085b7a691..f86fd71e28 100644 --- a/Code/Tools/SceneAPI/CMakeLists.txt +++ b/Code/Tools/SceneAPI/CMakeLists.txt @@ -5,7 +5,7 @@ # # -add_subdirectory(FbxSceneBuilder) +add_subdirectory(SceneBuilder) add_subdirectory(SceneCore) add_subdirectory(SceneData) add_subdirectory(SceneUI) diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp deleted file mode 100644 index 8df2ca71c2..0000000000 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace AZ -{ - namespace SceneAPI - { - namespace FbxSceneImporter - { - void SceneImporterSettings::Reflect(AZ::ReflectContext* context) - { - if (auto serializeContext = azrtti_cast(context); serializeContext) - { - serializeContext->Class() - ->Version(2) - ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions); - } - } - - void FbxImportRequestHandler::Activate() - { - if (auto* settingsRegistry = AZ::SettingsRegistry::Get()) - { - settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter"); - } - - BusConnect(); - } - - void FbxImportRequestHandler::Deactivate() - { - BusDisconnect(); - } - - void FbxImportRequestHandler::Reflect(ReflectContext* context) - { - SceneImporterSettings::Reflect(context); - - SerializeContext* serializeContext = azrtti_cast(context); - if (serializeContext) - { - serializeContext->Class()->Version(1)->Attribute( - AZ::Edit::Attributes::SystemComponentTags, - AZStd::vector( - {AssetBuilderSDK::ComponentTags::AssetBuilder, - AssetImportRequest::GetAssetImportRequestComponentTag()})); - - } - } - - void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set& extensions) - { - extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end()); - } - - Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester) - { - AZStd::string extension; - StringFunc::Path::GetExtension(path.c_str(), extension); - AZStd::to_lower(extension.begin(), extension.end()); - - if (!m_settings.m_supportedFileTypeExtensions.contains(extension)) - { - return Events::LoadingResult::Ignored; - } - - scene.SetSource(path, guid); - - // Push contexts - Events::ProcessingResultCombiner contextResult; - contextResult += Events::Process(path); - contextResult += Events::Process(path, scene); - contextResult += Events::Process(scene); - - if (contextResult.GetResult() == Events::ProcessingResult::Success) - { - return Events::LoadingResult::AssetLoaded; - } - else - { - return Events::LoadingResult::AssetFailure; - } - } - - void FbxImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) - { - provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler")); - } - } // namespace Import - } // namespace SceneAPI -} // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h deleted file mode 100644 index 88c7322807..0000000000 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include - -namespace AZ -{ - namespace SceneAPI - { - namespace FbxSceneImporter - { - struct SceneImporterSettings - { - AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}"); - - static void Reflect(AZ::ReflectContext* context); - - AZStd::unordered_set m_supportedFileTypeExtensions; - }; - - class FbxImportRequestHandler - : public AZ::Component - , public Events::AssetImportRequestBus::Handler - { - public: - AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}"); - - ~FbxImportRequestHandler() override = default; - - void Activate() override; - void Deactivate() override; - static void Reflect(ReflectContext* context); - - void GetSupportedFileExtensions(AZStd::unordered_set& extensions) override; - Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, - RequestingApplication requester) override; - - static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided); - - private: - - SceneImporterSettings m_settings; - - static constexpr const char* SettingsFilename = "AssetImporterSettings.json"; - }; - } // namespace FbxSceneImporter - } // namespace SceneAPI -} // namespace AZ diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp index 8819053152..f1ae433bca 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp +++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp @@ -15,8 +15,8 @@ namespace AZ { namespace AssImpSDKWrapper { - AssImpNodeWrapper::AssImpNodeWrapper(aiNode* fbxNode) - :SDKNode::NodeWrapper(fbxNode) + AssImpNodeWrapper::AssImpNodeWrapper(aiNode* sourceNode) + :SDKNode::NodeWrapper(sourceNode) { AZ_Assert(m_assImpNode, "Asset Importer Node cannot be null"); } diff --git a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h index 203f0a5fa5..a2345b09a8 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h +++ b/Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h @@ -18,7 +18,7 @@ namespace AZ { public: AZ_RTTI(AssImpNodeWrapper, "{1043260B-9076-49B7-AD38-EF62E85F7C1D}", SDKNode::NodeWrapper); - AssImpNodeWrapper(aiNode* fbxNode); + AssImpNodeWrapper(aiNode* sourceNode); ~AssImpNodeWrapper() override; const char* GetName() const override; AZ::u64 GetUniqueId() const override; diff --git a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp index efcab5cc2c..9adc9b414e 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp +++ b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp @@ -11,29 +11,16 @@ namespace AZ { namespace SDKMaterial { - MaterialWrapper::MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial) - :m_fbxMaterial(fbxMaterial) - , m_assImpMaterial(nullptr) - { - } - MaterialWrapper::MaterialWrapper(aiMaterial* assImpMaterial) - :m_fbxMaterial(nullptr) - , m_assImpMaterial(assImpMaterial) + : m_assImpMaterial(assImpMaterial) { } MaterialWrapper::~MaterialWrapper() { - m_fbxMaterial = nullptr; m_assImpMaterial = nullptr; } - fbxsdk::FbxSurfaceMaterial* MaterialWrapper::GetFbxMaterial() - { - return m_fbxMaterial; - } - aiMaterial* MaterialWrapper::GetAssImpMaterial() { return m_assImpMaterial; diff --git a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h index 7ad4148ad8..4cdcd5a627 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h +++ b/Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h @@ -10,14 +10,8 @@ #include #include -namespace fbxsdk -{ - class FbxSurfaceMaterial; -} - struct aiMaterial; - namespace AZ { namespace SDKMaterial @@ -39,11 +33,9 @@ namespace AZ BaseColor }; - MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial); MaterialWrapper(aiMaterial* assImpmaterial); virtual ~MaterialWrapper(); - fbxsdk::FbxSurfaceMaterial* GetFbxMaterial(); aiMaterial* GetAssImpMaterial(); virtual AZStd::string GetName() const; @@ -56,7 +48,6 @@ namespace AZ virtual float GetShininess() const; protected: - fbxsdk::FbxSurfaceMaterial* m_fbxMaterial = nullptr; aiMaterial* m_assImpMaterial = nullptr; }; } // namespace SDKMaterial diff --git a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp index 9adc93ff69..bdc428840c 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp +++ b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp @@ -11,29 +11,16 @@ namespace AZ { namespace SDKNode { - NodeWrapper::NodeWrapper(fbxsdk::FbxNode* fbxNode) - :m_fbxNode(fbxNode) - , m_assImpNode(nullptr) - { - } - NodeWrapper::NodeWrapper(aiNode* aiNode) - :m_fbxNode(nullptr) - , m_assImpNode(aiNode) + : m_assImpNode(aiNode) { } NodeWrapper::~NodeWrapper() { - m_fbxNode = nullptr; m_assImpNode = nullptr; } - fbxsdk::FbxNode* NodeWrapper::GetFbxNode() - { - return m_fbxNode; - } - aiNode* NodeWrapper::GetAssImpNode() { return m_assImpNode; diff --git a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h index 1863bc3751..abda330b10 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h +++ b/Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h @@ -6,10 +6,6 @@ */ #pragma once #include -namespace fbxsdk -{ - class FbxNode; -} struct aiNode; @@ -23,7 +19,6 @@ namespace AZ AZ_RTTI(NodeWrapper, "{5EB0897B-9728-44B7-B056-BA34AAF14715}"); NodeWrapper() = default; - NodeWrapper(fbxsdk::FbxNode* fbxNode); NodeWrapper(aiNode* aiNode); virtual ~NodeWrapper(); @@ -34,7 +29,6 @@ namespace AZ Component_Z }; - fbxsdk::FbxNode* GetFbxNode(); aiNode* GetAssImpNode(); virtual const char* GetName() const; @@ -44,8 +38,6 @@ namespace AZ virtual int GetChildCount()const; virtual const std::shared_ptr GetChild(int childIndex) const; - - fbxsdk::FbxNode* m_fbxNode = nullptr; aiNode* m_assImpNode = nullptr; }; } //namespace Node diff --git a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp index 2329221a2c..e14173c163 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp +++ b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp @@ -12,15 +12,8 @@ namespace AZ { const char* SceneWrapperBase::s_defaultSceneName = "myScene"; - SceneWrapperBase::SceneWrapperBase(fbxsdk::FbxScene* fbxScene) - :m_fbxScene(fbxScene) - , m_assImpScene(nullptr) - { - } - SceneWrapperBase::SceneWrapperBase(aiScene* aiScene) - :m_fbxScene(nullptr) - , m_assImpScene(aiScene) + : m_assImpScene(aiScene) { } @@ -47,11 +40,6 @@ namespace AZ { } - fbxsdk::FbxScene* SceneWrapperBase::GetFbxScene() const - { - return m_fbxScene; - } - const aiScene* SceneWrapperBase::GetAssImpScene() const { return m_assImpScene; diff --git a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h index f5dcc0d862..2a8c6d6c14 100644 --- a/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h +++ b/Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h @@ -8,14 +8,9 @@ #include #include #include -namespace fbxsdk -{ - class FbxScene; -} struct aiScene; - namespace AZ { namespace SDKScene @@ -25,7 +20,6 @@ namespace AZ public: AZ_RTTI(SceneWrapperBase, "{703CD344-2C75-4F30-8CE2-6BDEF2511AFD}"); SceneWrapperBase() = default; - SceneWrapperBase(fbxsdk::FbxScene* fbxScene); virtual ~SceneWrapperBase() = default; SceneWrapperBase(aiScene* aiScene); @@ -37,10 +31,8 @@ namespace AZ virtual void Clear(); - virtual fbxsdk::FbxScene* GetFbxScene() const; virtual const aiScene* GetAssImpScene() const; - fbxsdk::FbxScene* m_fbxScene = nullptr; const aiScene* m_assImpScene = nullptr; static const char* s_defaultSceneName; diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt b/Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt similarity index 70% rename from Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt rename to Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt index 5df1777048..029a254527 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/CMakeLists.txt +++ b/Code/Tools/SceneAPI/SceneBuilder/CMakeLists.txt @@ -10,14 +10,14 @@ if (NOT PAL_TRAIT_BUILD_HOST_TOOLS) endif() ly_add_target( - NAME FbxSceneBuilder.Static STATIC + NAME SceneBuilder.Static STATIC NAMESPACE AZ FILES_CMAKE - fbxscenebuilder_files.cmake + scenebuilder_files.cmake Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake COMPILE_DEFINITIONS PRIVATE - FBX_SCENE_BUILDER_EXPORTS + SCENE_BUILDER_EXPORTS INCLUDE_DIRECTORIES PUBLIC ../.. @@ -33,40 +33,40 @@ ly_add_target( ) ly_add_target( - NAME FbxSceneBuilder MODULE + NAME SceneBuilder MODULE NAMESPACE AZ FILES_CMAKE - fbxscenebuilder_shared_files.cmake + scenebuilder_shared_files.cmake COMPILE_DEFINITIONS PRIVATE - FBX_SCENE_BUILDER_EXPORTS + SCENE_BUILDER_EXPORTS INCLUDE_DIRECTORIES PUBLIC ../.. BUILD_DEPENDENCIES PUBLIC - AZ::FbxSceneBuilder.Static + AZ::SceneBuilder.Static PRIVATE AZ::AzCore ) -ly_add_dependencies(AssetBuilder AZ::FbxSceneBuilder) +ly_add_dependencies(AssetBuilder AZ::SceneBuilder) if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) ly_add_target( - NAME FbxSceneBuilder.Tests ${PAL_TRAIT_TEST_TARGET_TYPE} + NAME SceneBuilder.Tests ${PAL_TRAIT_TEST_TARGET_TYPE} NAMESPACE AZ FILES_CMAKE - fbxscenebuilder_testing_files.cmake + scenebuilder_testing_files.cmake INCLUDE_DIRECTORIES PRIVATE Tests BUILD_DEPENDENCIES PRIVATE AZ::AzTest - AZ::FbxSceneBuilder + AZ::SceneBuilder ) ly_add_googletest( - NAME AZ::FbxSceneBuilder.Tests + NAME AZ::SceneBuilder.Tests ) endif() diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp b/Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp similarity index 71% rename from Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp rename to Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp index a9ff537910..2f6e0e1d07 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/DllMain.cpp @@ -11,27 +11,27 @@ #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { static AZStd::vector g_componentDescriptors; @@ -40,13 +40,13 @@ namespace AZ // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before // there's an application. using namespace AZ::SceneAPI; - using namespace AZ::SceneAPI::FbxSceneBuilder; + using namespace AZ::SceneAPI::SceneBuilder; if (g_componentDescriptors.empty()) { // Global importer and behavior - g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor()); - g_componentDescriptors.push_back(FbxSceneImporter::FbxImportRequestHandler::CreateDescriptor()); + g_componentDescriptors.push_back(SceneBuilder::SceneImporter::CreateDescriptor()); + g_componentDescriptors.push_back(SceneImportRequestHandler::CreateDescriptor()); // Node and attribute importers g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor()); @@ -94,7 +94,7 @@ namespace AZ g_componentDescriptors.shrink_to_fit(); } } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ @@ -104,15 +104,15 @@ extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env) } extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context) { - AZ::SceneAPI::FbxSceneBuilder::Reflect(context); + AZ::SceneAPI::SceneBuilder::Reflect(context); } extern "C" AZ_DLL_EXPORT void ReflectBehavior(AZ::BehaviorContext* context) { - AZ::SceneAPI::FbxSceneBuilder::ReflectBehavior(context); + AZ::SceneAPI::SceneBuilder::ReflectBehavior(context); } extern "C" AZ_DLL_EXPORT void UninitializeDynamicModule() { - AZ::SceneAPI::FbxSceneBuilder::Uninitialize(); + AZ::SceneAPI::SceneBuilder::Uninitialize(); AZ::Environment::Detach(); } diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp similarity index 92% rename from Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp rename to Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp index a3ba23065d..eea929f2f1 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.cpp @@ -5,7 +5,7 @@ * */ -#include +#include #include #include @@ -13,10 +13,10 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpImportContext::AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode) : m_sourceScene(sourceScene) , m_sourceSceneSystem(sourceSceneSystem) @@ -27,7 +27,7 @@ namespace AZ AssImpNodeEncounteredContext::AssImpNodeEncounteredContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode) : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode) @@ -39,7 +39,7 @@ namespace AZ Events::ImportEventContext& parent, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode) : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode) @@ -57,7 +57,7 @@ namespace AZ AssImpSceneDataPopulatedContext::AssImpSceneDataPopulatedContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode, const AZStd::shared_ptr& nodeData, const AZStd::string& dataName) @@ -76,7 +76,7 @@ namespace AZ AssImpSceneNodeAppendedContext::AssImpSceneNodeAppendedContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode) : AssImpImportContext(sourceScene, sourceSceneSystem, sourceNode) , SceneNodeAppendedContextBase(scene, currentGraphPosition, nodeNameMap) @@ -111,7 +111,7 @@ namespace AZ AssImpFinalizeSceneContext::AssImpFinalizeSceneContext(Containers::Scene& scene, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap) : FinalizeSceneContextBase(scene, nodeNameMap) , m_sourceScene(sourceScene) @@ -120,5 +120,5 @@ namespace AZ } } // namespace SceneAPI - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h similarity index 91% rename from Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h rename to Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h index 99002d1528..c620a8ced2 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/AssImpImportContexts.h +++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/AssImpImportContexts.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include namespace AZ @@ -22,8 +22,8 @@ namespace AZ namespace SceneAPI { - class FbxSceneSystem; - namespace FbxSceneBuilder + class SceneSystem; + namespace SceneBuilder { class RenamedNodesMap; @@ -36,12 +36,12 @@ namespace AZ AZ_RTTI(AssImpImportContext, "{B1076AFF-991B-423C-8D3E-D5C9230434AB}"); AssImpImportContext(const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode); const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene; AssImpSDKWrapper::AssImpNodeWrapper& m_sourceNode; - const FbxSceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion + const SceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion }; // AssImpNodeEncounteredContext @@ -56,14 +56,14 @@ namespace AZ AssImpNodeEncounteredContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode); AssImpNodeEncounteredContext(Events::ImportEventContext& parent, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode); }; @@ -85,7 +85,7 @@ namespace AZ AssImpSceneDataPopulatedContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode, const AZStd::shared_ptr& nodeData, @@ -106,7 +106,7 @@ namespace AZ AssImpSceneNodeAppendedContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap, AssImpSDKWrapper::AssImpNodeWrapper& sourceNode); }; @@ -170,13 +170,13 @@ namespace AZ AssImpFinalizeSceneContext( Containers::Scene& scene, const AssImpSDKWrapper::AssImpSceneWrapper& sourceScene, - const FbxSceneSystem& sourceSceneSystem, + const SceneSystem& sourceSceneSystem, RenamedNodesMap& nodeNameMap); const AssImpSDKWrapper::AssImpSceneWrapper& m_sourceScene; - const FbxSceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion + const SceneSystem& m_sourceSceneSystem; // Needed for unit and axis conversion }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp similarity index 97% rename from Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp rename to Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp index 130501533d..ae57ad5b9f 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.cpp @@ -5,14 +5,14 @@ * */ -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { ImportContext::ImportContext(Containers::Scene& scene, Containers::SceneGraph::NodeIndex currentGraphPosition, @@ -103,5 +103,5 @@ namespace AZ { } } // namespace SceneAPI - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h similarity index 99% rename from Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h rename to Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h index 590b585661..db873f5eae 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/ImportContexts/ImportContexts.h +++ b/Code/Tools/SceneAPI/SceneBuilder/ImportContexts/ImportContexts.h @@ -33,7 +33,7 @@ namespace AZ class ImportEventContext; } - namespace FbxSceneBuilder + namespace SceneBuilder { class RenamedNodesMap; @@ -173,7 +173,7 @@ namespace AZ FinalizeSceneContextBase(Containers::Scene& scene, RenamedNodesMap& nodeNameMap); }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp similarity index 98% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp index 071f17a687..e7726de502 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpAnimationImporter::s_animationNodeName = "animation"; @@ -670,6 +670,6 @@ namespace AZ return Events::ProcessingResult::Success; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h similarity index 90% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h index 07a4fe362f..c8e7415378 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpAnimationImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include struct aiAnimation; struct aiMesh; @@ -18,7 +18,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpAnimationImporter : public SceneCore::LoadingComponent @@ -43,6 +43,6 @@ namespace AZ protected: static const char* s_animationNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp index 214ced0dc3..d822ee148e 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.cpp @@ -8,9 +8,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -24,7 +24,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpBitangentStreamImporter::m_defaultNodeName = "Bitangent"; @@ -125,6 +125,6 @@ namespace AZ return bitangentResults; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h index 363beabcf6..a5359ab7db 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBitangentStreamImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBitangentStreamImporter.h @@ -6,14 +6,14 @@ */ -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpBitangentStreamImporter : public SceneCore::LoadingComponent { @@ -30,6 +30,6 @@ namespace AZ protected: static const char* m_defaultNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp similarity index 96% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp index dbf431a50a..efd5744378 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.cpp @@ -9,11 +9,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpBlendShapeImporter::AssImpBlendShapeImporter() { @@ -234,6 +234,6 @@ namespace AZ return combinedBlendShapeResult.GetResult(); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h similarity index 86% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h index fd1b18f812..a5fbd1b817 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBlendShapeImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBlendShapeImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpBlendShapeImporter : public SceneCore::LoadingComponent @@ -29,6 +29,6 @@ namespace AZ Events::ProcessingResult ImportBlendShapes(AssImpSceneNodeAppendedContext& context); }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp index 58da14ca58..1e46485f1d 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.cpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -24,7 +24,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpBoneImporter::AssImpBoneImporter() { @@ -170,6 +170,6 @@ namespace AZ return Events::ProcessingResult::Success; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h similarity index 86% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h index 9b1fc6c390..10b5964cdf 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpBoneImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpBoneImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpBoneImporter : public SceneCore::LoadingComponent @@ -29,6 +29,6 @@ namespace AZ Events::ProcessingResult ImportBone(AssImpNodeEncounteredContext& context); }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp index f220f861e3..c1720ec362 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.cpp @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpColorStreamImporter::m_defaultNodeName = "Col"; @@ -126,6 +126,6 @@ namespace AZ return combinedVertexColorResults.GetResult(); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h index 6551f6434c..c871a93c63 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpColorStreamImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpColorStreamImporter.h @@ -6,14 +6,14 @@ */ -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpColorStreamImporter : public SceneCore::LoadingComponent { @@ -30,6 +30,6 @@ namespace AZ protected: static const char* m_defaultNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp index 706f0bda29..929fde19eb 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.cpp @@ -5,7 +5,7 @@ * */ -#include +#include #include #include @@ -16,7 +16,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { bool IsSkinnedMesh(const aiNode& node, const aiScene& scene) { @@ -84,6 +84,6 @@ namespace AZ return combinedTransform; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h similarity index 96% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h index a7bb2d3c7c..deba1b0279 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpImporterUtilities.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpImporterUtilities.h @@ -15,7 +15,7 @@ struct aiScene; struct aiString; -namespace AZ::SceneAPI::FbxSceneBuilder +namespace AZ::SceneAPI::SceneBuilder { inline constexpr char PivotNodeMarker[] = "_$AssimpFbx$_"; diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp similarity index 94% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp index 57ae04cc19..f2194c352b 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.cpp @@ -5,16 +5,16 @@ * */ -#include +#include #include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpMaterialImporter::AssImpMaterialImporter() { @@ -164,7 +164,7 @@ namespace AZ if (materialResult != Events::ProcessingResult::Failure) { - materialResult = SceneAPI::FbxSceneBuilder::AddAttributeDataNodeWithContexts(dataPopulated); + materialResult = SceneAPI::SceneBuilder::AddAttributeDataNodeWithContexts(dataPopulated); } combinedMaterialImportResults += materialResult; @@ -186,7 +186,7 @@ namespace AZ AZ::StringFunc::Path::StripFullName(cleanedUpSceneFilePath); AZ::StringFunc::Path::Join(cleanedUpSceneFilePath.c_str(), textureFilePath.c_str(), texturePathRelativeToScene); - // If the texture did start with marker to change directories upward, then it's relative to the FBX file, + // If the texture did start with marker to change directories upward, then it's relative to the scene file, // and that path needs to be resolved. It can't be resolved later. This was handled internally by FBX SDK, // but is not handled by AssImp. if (textureFilePath.starts_with("..")) @@ -196,7 +196,7 @@ namespace AZ } // The engine only supports relative paths to scan folders. - // FBX files may have paths to textures, relative to the FBX file. Check for those, first. + // Scene files may have paths to textures, relative to the scene file. Check for those, first. if (AZ::IO::FileIOBase::GetInstance()->Exists(texturePathRelativeToScene.c_str())) { return texturePathRelativeToScene; @@ -205,6 +205,6 @@ namespace AZ return textureFilePath; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h similarity index 88% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h index 1879159432..e4e75eff3c 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMaterialImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMaterialImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpMaterialImporter : public SceneCore::LoadingComponent @@ -32,6 +32,6 @@ namespace AZ private: AZStd::string ResolveTexturePath(const AZStd::string& sceneFilePath, const AZStd::string& textureFilePath) const; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp index 1f1f2c3567..b3c4cf68db 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.cpp @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpMeshImporter::AssImpMeshImporter() { @@ -57,6 +57,6 @@ namespace AZ return Events::ProcessingResult::Failure; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h similarity index 86% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h index b7da6e375f..2337400d13 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpMeshImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpMeshImporter : public SceneCore::LoadingComponent @@ -29,6 +29,6 @@ namespace AZ Events::ProcessingResult ImportMesh(AssImpNodeEncounteredContext& context); }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp index a8e954cf35..5dff07aae7 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.cpp @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -20,7 +20,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { AssImpSkinImporter::AssImpSkinImporter() { @@ -57,6 +57,6 @@ namespace AZ return Events::ProcessingResult::Failure; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h similarity index 86% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h index 3183acb665..31548d670d 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpSkinImporter : public SceneCore::LoadingComponent @@ -29,6 +29,6 @@ namespace AZ Events::ProcessingResult ImportSkin(AssImpNodeEncounteredContext& context); }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp similarity index 94% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp index b83ec3872e..532a397f88 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.cpp @@ -9,10 +9,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -23,7 +23,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const AZStd::string AssImpSkinWeightsImporter::s_skinWeightName = "SkinWeight_"; @@ -142,6 +142,6 @@ namespace AZ m_pendingSkinWeights.clear(); return result; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h similarity index 91% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h index 76b196b8e2..be54db5530 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpSkinWeightsImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpSkinWeightsImporter.h @@ -9,17 +9,12 @@ #include #include -#include +#include #include #include namespace AZ { - namespace FbxSDKWrapper - { - class FbxMeshWrapper; - } - namespace SceneData { namespace GraphData @@ -35,7 +30,7 @@ namespace AZ class PostImportEventContext; } - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpSkinWeightsImporter : public SceneCore::LoadingComponent @@ -68,6 +63,6 @@ namespace AZ static const AZStd::string s_skinWeightName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp index e4a85b15b9..97c9c6c004 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.cpp @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpTangentStreamImporter::m_defaultNodeName = "Tangent"; @@ -127,6 +127,6 @@ namespace AZ return tangentResults; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h index 91a479f341..6cd830a8b5 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTangentStreamImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTangentStreamImporter.h @@ -6,14 +6,14 @@ */ -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpTangentStreamImporter : public SceneCore::LoadingComponent { @@ -30,6 +30,6 @@ namespace AZ protected: static const char* m_defaultNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp index 1a7d0e5e8a..09f8575351 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.cpp @@ -4,27 +4,27 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpTransformImporter::s_transformNodeName = "transform"; @@ -198,6 +198,6 @@ namespace AZ return Events::ProcessingResult::Ignored; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h index 418c673dd4..f6afa4742c 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpTransformImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpTransformImporter : public SceneCore::LoadingComponent @@ -30,6 +30,6 @@ namespace AZ Events::ProcessingResult ImportTransform(AssImpSceneNodeAppendedContext& context); static const char* s_transformNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp index 7c3569a159..f8319330ac 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.cpp @@ -11,10 +11,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -28,7 +28,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { const char* AssImpUvMapImporter::m_defaultNodeName = "UV"; @@ -141,7 +141,7 @@ namespace AZ { AZ::Vector2 vertexUV( mesh->mTextureCoords[texCoordIndex][v].x, - // The engine's V coordinate is reverse of how it's stored in the FBX file. + // The engine's V coordinate is reverse of how it's coming in from the SDK. 1.0f - mesh->mTextureCoords[texCoordIndex][v].y); uvMap->AppendUV(vertexUV); } @@ -175,6 +175,6 @@ namespace AZ return combinedUvMapResults.GetResult(); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h similarity index 87% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h index 21ef69c8bc..249e305a50 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpUvMapImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpUvMapImporter.h @@ -7,14 +7,14 @@ #pragma once -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class AssImpUvMapImporter : public SceneCore::LoadingComponent @@ -32,6 +32,6 @@ namespace AZ protected: static const char* m_defaultNodeName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp similarity index 98% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp index 89ec1142d8..48c00f5114 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -25,7 +25,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { static const float g_sceneUtilityEqualityEpsilon = 0.001f; @@ -429,6 +429,6 @@ namespace AZ return true; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.h similarity index 88% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.h index 2f6ce68561..c85812b420 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include @@ -19,9 +19,9 @@ namespace AZ namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { - struct FbxImportContext; + struct SceneImportContext; using CoreScene = Containers::Scene; using CoreSceneGraph = Containers::SceneGraph; @@ -41,8 +41,8 @@ namespace AZ bool IsGraphDataEqual(const AZStd::shared_ptr& lhs, const AZStd::shared_ptr& rhs); - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ -#include +#include diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl similarity index 94% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl rename to Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl index aede722b0b..3cbade4c98 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/ImporterUtilities.inl +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/ImporterUtilities.inl @@ -5,7 +5,7 @@ * */ -#include +#include #include #include @@ -13,7 +13,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { bool NodeIsOfType(const CoreSceneGraph& sceneGraph, CoreGraphNodeIndex nodeIndex, const AZ::Uuid& uuid) { @@ -63,6 +63,6 @@ namespace AZ return true; } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp similarity index 93% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp index 9ced6af005..5c42122056 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.cpp @@ -10,17 +10,17 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -namespace AZ::SceneAPI::FbxSceneBuilder +namespace AZ::SceneAPI::SceneBuilder { - bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const FbxSceneSystem& sceneSystem, AZStd::vector>& meshes, + bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const SceneSystem& sceneSystem, AZStd::vector>& meshes, const AZStd::function()>& makeMeshFunc) { AZStd::unordered_map assImpMatIndexToLYIndex; diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h similarity index 84% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h index a57fbb98ae..b04777134f 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/AssImpMeshImporterUtilities.h @@ -14,11 +14,6 @@ struct aiScene; namespace AZ { - namespace FbxSDKWrapper - { - class FbxMeshWrapper; - } - namespace SceneData { namespace GraphData @@ -35,11 +30,11 @@ namespace AZ class IGraphObject; } struct AssImpSceneNodeAppendedContext; - class FbxSceneSystem; + class SceneSystem; - namespace FbxSceneBuilder + namespace SceneBuilder { - bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const FbxSceneSystem& sceneSystem, AZStd::vector>& meshes, + bool BuildSceneMeshFromAssImpMesh(const aiNode* currentNode, const aiScene* scene, const SceneSystem& sceneSystem, AZStd::vector>& meshes, const AZStd::function()>& makeMeshFunc); typedef AZ::Outcome GetMeshDataFromParentResult; diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp similarity index 97% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp index d87c81bcb6..a85e3686de 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.cpp @@ -9,14 +9,14 @@ #include #include #include -#include +#include #include namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { bool RenamedNodesMap::SanitizeNodeName(AZStd::string& name, const Containers::SceneGraph& graph, Containers::SceneGraph::NodeIndex parentNode, const char* defaultName) @@ -94,7 +94,7 @@ namespace AZ { AZ_TraceContext("New node name", name); - // Only register if the name is updated, otherwise the name in the fbx node can be returned. + // Only register if the name is updated, otherwise the name in the source scene's node can be returned. auto entry = m_idToName.find(node.GetUniqueId()); if (entry == m_idToName.end()) { @@ -153,6 +153,6 @@ namespace AZ return node.GetName(); } } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h rename to Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h index 8bbba5c8c8..1428731469 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/Utilities/RenamedNodesMap.h +++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/Utilities/RenamedNodesMap.h @@ -15,14 +15,9 @@ namespace AZ { - namespace FbxSDKWrapper - { - class FbxNodeWrapper; - } - namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { class RenamedNodesMap { @@ -60,6 +55,6 @@ namespace AZ AZStd::unordered_map m_idToName; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Linux/platform_linux_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Linux/platform_linux_files.cmake similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Linux/platform_linux_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/Platform/Linux/platform_linux_files.cmake diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Mac/platform_mac_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Mac/platform_mac_files.cmake similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Mac/platform_mac_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/Platform/Mac/platform_mac_files.cmake diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Windows/platform_windows_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/Platform/Windows/platform_windows_files.cmake similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Platform/Windows/platform_windows_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/Platform/Windows/platform_windows_files.cmake diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h b/Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h similarity index 67% rename from Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h rename to Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h index 6f1bed9665..aee0ed7f47 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneBuilderConfiguration.h +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneBuilderConfiguration.h @@ -10,11 +10,11 @@ #include #if defined(AZ_MONOLITHIC_BUILD) - #define FBX_SCENE_BUILDER_API + #define SCENE_BUILDER_API #else - #ifdef FBX_SCENE_BUILDER_EXPORTS - #define FBX_SCENE_BUILDER_API AZ_DLL_EXPORT + #ifdef SCENE_BUILDER_EXPORTS + #define SCENE_BUILDER_API AZ_DLL_EXPORT #else - #define FBX_SCENE_BUILDER_API AZ_DLL_IMPORT + #define SCENE_BUILDER_API AZ_DLL_IMPORT #endif #endif // AZ_MONOLITHIC_BUILD diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp new file mode 100644 index 0000000000..2881b355cd --- /dev/null +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.cpp @@ -0,0 +1,103 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace AZ +{ + namespace SceneAPI + { + void SceneImporterSettings::Reflect(AZ::ReflectContext* context) + { + if (auto serializeContext = azrtti_cast(context); serializeContext) + { + serializeContext->Class() + ->Version(2) + ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions); + } + } + + void SceneImportRequestHandler::Activate() + { + if (auto* settingsRegistry = AZ::SettingsRegistry::Get()) + { + settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter"); + } + + BusConnect(); + } + + void SceneImportRequestHandler::Deactivate() + { + BusDisconnect(); + } + + void SceneImportRequestHandler::Reflect(ReflectContext* context) + { + SceneImporterSettings::Reflect(context); + + SerializeContext* serializeContext = azrtti_cast(context); + if (serializeContext) + { + serializeContext->Class()->Version(1)->Attribute( + AZ::Edit::Attributes::SystemComponentTags, + AZStd::vector( + {AssetBuilderSDK::ComponentTags::AssetBuilder, + AssetImportRequest::GetAssetImportRequestComponentTag()})); + + } + } + + void SceneImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set& extensions) + { + extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end()); + } + + Events::LoadingResult SceneImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester) + { + AZStd::string extension; + StringFunc::Path::GetExtension(path.c_str(), extension); + AZStd::to_lower(extension.begin(), extension.end()); + + if (!m_settings.m_supportedFileTypeExtensions.contains(extension)) + { + return Events::LoadingResult::Ignored; + } + + scene.SetSource(path, guid); + + // Push contexts + Events::ProcessingResultCombiner contextResult; + contextResult += Events::Process(path); + contextResult += Events::Process(path, scene); + contextResult += Events::Process(scene); + + if (contextResult.GetResult() == Events::ProcessingResult::Success) + { + return Events::LoadingResult::AssetLoaded; + } + else + { + return Events::LoadingResult::AssetFailure; + } + } + + void SceneImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) + { + provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler")); + } + } // namespace SceneAPI +} // namespace AZ diff --git a/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h new file mode 100644 index 0000000000..f59f197683 --- /dev/null +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImportRequestHandler.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#pragma once + +#include +#include + +namespace AZ +{ + namespace SceneAPI + { + struct SceneImporterSettings + { + AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}"); + + static void Reflect(AZ::ReflectContext* context); + + AZStd::unordered_set m_supportedFileTypeExtensions; + }; + + class SceneImportRequestHandler + : public AZ::Component + , public Events::AssetImportRequestBus::Handler + { + public: + AZ_COMPONENT(SceneImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}"); + + ~SceneImportRequestHandler() override = default; + + void Activate() override; + void Deactivate() override; + static void Reflect(ReflectContext* context); + + void GetSupportedFileExtensions(AZStd::unordered_set& extensions) override; + Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, + RequestingApplication requester) override; + + static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided); + + private: + + SceneImporterSettings m_settings; + + static constexpr const char* SettingsFilename = "AssetImporterSettings.json"; + }; + } // namespace SceneAPI +} // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp similarity index 88% rename from Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp rename to Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp index 0a2df783f1..cd6ffb8b29 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.cpp @@ -14,11 +14,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -29,7 +29,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { struct QueueNode { @@ -44,23 +44,23 @@ namespace AZ } }; - FbxImporter::FbxImporter() - : m_sceneSystem(new FbxSceneSystem()) + SceneImporter::SceneImporter() + : m_sceneSystem(new SceneSystem()) { m_sceneWrapper = AZStd::make_unique(); - BindToCall(&FbxImporter::ImportProcessing); + BindToCall(&SceneImporter::ImportProcessing); } - void FbxImporter::Reflect(ReflectContext* context) + void SceneImporter::Reflect(ReflectContext* context) { SerializeContext* serializeContext = azrtti_cast(context); if (serializeContext) { - serializeContext->Class()->Version(2); // SPEC-5776 + serializeContext->Class()->Version(2); // SPEC-5776 } } - Events::ProcessingResult FbxImporter::ImportProcessing(Events::ImportEventContext& context) + Events::ProcessingResult SceneImporter::ImportProcessing(Events::ImportEventContext& context) { m_sceneWrapper->Clear(); @@ -77,7 +77,7 @@ namespace AZ return Events::ProcessingResult::Failure; } - convertFunc = AZStd::bind(&FbxImporter::ConvertFbxScene, this, AZStd::placeholders::_1); + convertFunc = AZStd::bind(&SceneImporter::ConvertScene, this, AZStd::placeholders::_1); if (convertFunc(context.GetScene())) { @@ -89,10 +89,10 @@ namespace AZ } } - bool FbxImporter::ConvertFbxScene(Containers::Scene& scene) const + bool SceneImporter::ConvertScene(Containers::Scene& scene) const { - std::shared_ptr fbxRoot = m_sceneWrapper->GetRootNode(); - if (!fbxRoot) + std::shared_ptr sceneRoot = m_sceneWrapper->GetRootNode(); + if (!sceneRoot) { return false; } @@ -123,13 +123,13 @@ namespace AZ break; } - AZStd::queue nodes; - nodes.emplace(AZStd::move(fbxRoot), scene.GetGraph().GetRoot()); + AZStd::queue nodes; + nodes.emplace(AZStd::move(sceneRoot), scene.GetGraph().GetRoot()); RenamedNodesMap nodeNameMap; while (!nodes.empty()) { - FbxSceneBuilder::QueueNode& node = nodes.front(); + SceneBuilder::QueueNode& node = nodes.front(); AZ_Assert(node.m_node, "Empty asset importer node queued"); if (!nodeNameMap.RegisterNode(node.m_node, scene.GetGraph(), node.m_parent)) { @@ -240,12 +240,12 @@ namespace AZ return true; } - void FbxImporter::SanitizeNodeName(AZStd::string& nodeName) const + void SceneImporter::SanitizeNodeName(AZStd::string& nodeName) const { // Replace % with something else so it is safe for use in printfs. AZStd::replace(nodeName.begin(), nodeName.end(), '%', '_'); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h similarity index 70% rename from Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h rename to Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h index 9eb85e4f2d..669ae7abdd 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImporter.h +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneImporter.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace AZ @@ -24,28 +24,28 @@ namespace AZ class Scene; } - namespace FbxSceneBuilder + namespace SceneBuilder { - class FbxImporter + class SceneImporter : public SceneCore::LoadingComponent { public: - AZ_COMPONENT(FbxImporter, "{D5EE21B6-8B73-45BF-B711-31346E0BEDB3}", SceneCore::LoadingComponent); + AZ_COMPONENT(SceneImporter, "{D5EE21B6-8B73-45BF-B711-31346E0BEDB3}", SceneCore::LoadingComponent); - FbxImporter(); - ~FbxImporter() override = default; + SceneImporter(); + ~SceneImporter() override = default; static void Reflect(ReflectContext* context); Events::ProcessingResult ImportProcessing(Events::ImportEventContext& context); protected: - bool ConvertFbxScene(Containers::Scene& scene) const; + bool ConvertScene(Containers::Scene& scene) const; void SanitizeNodeName(AZStd::string& nodeName) const; AZStd::unique_ptr m_sceneWrapper; - AZStd::shared_ptr m_sceneSystem; + AZStd::shared_ptr m_sceneSystem; }; - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp similarity index 89% rename from Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp rename to Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp index bb1f0e71b1..8adb0ac0c0 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace AZ { namespace SceneAPI { - FbxSceneSystem::FbxSceneSystem() : + SceneSystem::SceneSystem() : m_unitSizeInMeters(1.0f), m_originalUnitSizeInMeters(1.0f), m_adjustTransform(nullptr), @@ -25,15 +25,15 @@ namespace AZ { } - void FbxSceneSystem::Set(const SDKScene::SceneWrapperBase* fbxScene) + void SceneSystem::Set(const SDKScene::SceneWrapperBase* scene) { // Get unit conversion factor to meter. - if (!azrtti_istypeof(fbxScene)) + if (!azrtti_istypeof(scene)) { return; } - const AssImpSDKWrapper::AssImpSceneWrapper* assImpScene = azrtti_cast(fbxScene); + const AssImpSDKWrapper::AssImpSceneWrapper* assImpScene = azrtti_cast(scene); // If either meta data piece is not available, the default of 1 will be used. assImpScene->GetAssImpScene()->mMetaData->Get("UnitScaleFactor", m_unitSizeInMeters); @@ -111,7 +111,7 @@ namespace AZ } } - void FbxSceneSystem::SwapVec3ForUpAxis(Vector3& swapVector) const + void SceneSystem::SwapVec3ForUpAxis(Vector3& swapVector) const { if (m_adjustTransform) { @@ -119,7 +119,7 @@ namespace AZ } } - void FbxSceneSystem::SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const + void SceneSystem::SwapTransformForUpAxis(DataTypes::MatrixType& inOutTransform) const { if (m_adjustTransform) { @@ -127,19 +127,19 @@ namespace AZ } } - void FbxSceneSystem::ConvertUnit(Vector3& scaleVector) const + void SceneSystem::ConvertUnit(Vector3& scaleVector) const { scaleVector *= m_unitSizeInMeters; } - void FbxSceneSystem::ConvertUnit(DataTypes::MatrixType& inOutTransform) const + void SceneSystem::ConvertUnit(DataTypes::MatrixType& inOutTransform) const { Vector3 translation = inOutTransform.GetTranslation(); translation *= m_unitSizeInMeters; inOutTransform.SetTranslation(translation); } - void FbxSceneSystem::ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const + void SceneSystem::ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const { diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h similarity index 81% rename from Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h rename to Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h index 0667b9969e..48c5dd152c 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxSceneSystem.h +++ b/Code/Tools/SceneAPI/SceneBuilder/SceneSystem.h @@ -8,7 +8,7 @@ */ #include -#include +#include #include namespace AZ @@ -22,10 +22,10 @@ namespace AZ namespace SceneAPI { - class FBX_SCENE_BUILDER_API FbxSceneSystem + class SCENE_BUILDER_API SceneSystem { public: - FbxSceneSystem(); + SceneSystem(); void Set(const SDKScene::SceneWrapperBase* sceneWrapper); void SwapVec3ForUpAxis(Vector3& swapVector) const; @@ -34,11 +34,11 @@ namespace AZ void ConvertUnit(DataTypes::MatrixType& inOutTransform) const; void ConvertBoneUnit(DataTypes::MatrixType& inOutTransform) const; - //! Get effect unit size in meters of this Fbx Scene, internally FBX saves it in the following manner + //! Get effect unit size in meters of this scene, internally FBX saves it in the following manner //! GlobalSettings: { //! P : "UnitScaleFactor", "double", "Number", "", 2.54 float GetUnitSizeInMeters() const { return m_unitSizeInMeters; } - //! Get original unit size in meters of this Fbx Scene, internally FBX saves it in the following manner + //! Get original unit size in meters of this scene, internally FBX saves it in the following manner //! GlobalSettings: { //! P : "OriginalUnitScaleFactor", "double", "Number", "", 2.54 float GetOriginalUnitSizeInMeters() const { return m_originalUnitSizeInMeters; } diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp similarity index 83% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp index ed606e32b1..f26ae4f5e3 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/FbxImporterUtilitiesTests.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/SceneImporterUtilitiesTests.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -18,9 +18,9 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_EmptySceneGraphs_ReturnsTrue) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_EmptySceneGraphs_ReturnsTrue) { Containers::SceneGraph lhsGraph; Containers::SceneGraph rhsGraph; @@ -31,7 +31,7 @@ namespace AZ EXPECT_TRUE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeBothNull_ReturnsTrue) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeBothNull_ReturnsTrue) { Containers::SceneGraph lhsGraph; lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild"); @@ -44,7 +44,7 @@ namespace AZ EXPECT_TRUE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeSameType_ReturnsTrue) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeSameType_ReturnsTrue) { Containers::SceneGraph lhsGraph; AZStd::shared_ptr lhsData = AZStd::make_shared(); @@ -59,7 +59,7 @@ namespace AZ EXPECT_TRUE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeOneNull_ReturnsFalse) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeOneNull_ReturnsFalse) { Containers::SceneGraph lhsGraph; AZStd::shared_ptr lhsData = AZStd::make_shared(); @@ -73,7 +73,7 @@ namespace AZ EXPECT_FALSE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeDifferentTypes_ReturnsFalse) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameSingleNodeDifferentTypes_ReturnsFalse) { Containers::SceneGraph lhsGraph; AZStd::shared_ptr lhsData = AZStd::make_shared(); @@ -88,7 +88,7 @@ namespace AZ EXPECT_FALSE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SameNameOneEmptyOneSingleNode_ReturnsFalse) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SameNameOneEmptyOneSingleNode_ReturnsFalse) { Containers::SceneGraph lhsGraph; AZStd::shared_ptr lhsData = AZStd::make_shared(); @@ -101,7 +101,7 @@ namespace AZ EXPECT_FALSE(sceneGraphsEqual); } - TEST(FbxImpoterUtilityTests, AreSceneGraphsEqual_DifferentNamesSingleNodeBothNull_ReturnsFalse) + TEST(SceneImpoterUtilityTests, AreSceneGraphsEqual_DifferentNamesSingleNodeBothNull_ReturnsFalse) { Containers::SceneGraph lhsGraph; lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild"); @@ -114,7 +114,7 @@ namespace AZ EXPECT_FALSE(sceneGraphsEqual); } - TEST(FbxImporterUtilityTests, AreSceneGraphsEqual_SecondGraphExtraChild_ReturnsFalse) + TEST(SceneImporterUtilityTests, AreSceneGraphsEqual_SecondGraphExtraChild_ReturnsFalse) { Containers::SceneGraph lhsGraph; lhsGraph.AddChild(lhsGraph.GetRoot(), "testChild"); @@ -127,6 +127,6 @@ namespace AZ EXPECT_FALSE(sceneGraphsEqual); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp similarity index 95% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp index 7f25508b5d..6b1279cccc 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/Importers/Utilities/RenamedNodesMapTests.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace AZ { namespace SceneAPI { - namespace FbxSceneBuilder + namespace SceneBuilder { TEST(RenamedNodesMapTests, SanitizeNodeName_ValidNameProvided_ReturnsFalseAndNameUnchanged) { @@ -79,6 +79,6 @@ namespace AZ EXPECT_TRUE(result); EXPECT_STREQ("Child_2", name.c_str()); } - } // namespace FbxSceneBuilder + } // namespace SceneBuilder } // namespace SceneAPI } // namespace AZ diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.cpp similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.cpp diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.h similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxMesh.h rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxMesh.h diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.cpp similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.cpp diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.h similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxNode.h rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxNode.h diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.cpp similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.cpp diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.h similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestFbxSkin.h rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestFbxSkin.h diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp similarity index 67% rename from Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp rename to Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp index 841e76da4c..4b49c0ead8 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/Tests/TestsMain.cpp +++ b/Code/Tools/SceneAPI/SceneBuilder/Tests/TestsMain.cpp @@ -10,11 +10,11 @@ #include #include -class FbxSceneBuilderTestEnvironment +class SceneBuilderTestEnvironment : public AZ::Test::ITestEnvironment { public: - virtual ~FbxSceneBuilderTestEnvironment() + virtual ~SceneBuilderTestEnvironment() {} protected: @@ -23,31 +23,31 @@ protected: AZ::AllocatorInstance::Create(); sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore"); - AZ_Assert(sceneCoreModule, "FbxSceneBuilder unit tests failed to create SceneCore module."); + AZ_Assert(sceneCoreModule, "SceneBuilder unit tests failed to create SceneCore module."); bool loaded = sceneCoreModule->Load(false); - AZ_Assert(loaded, "FbxSceneBuilder unit tests failed to load SceneCore module."); + AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneCore module."); auto init = sceneCoreModule->GetFunction(AZ::InitializeDynamicModuleFunctionName); - AZ_Assert(init, "FbxSceneBuilder unit tests failed to find the initialization function the SceneCore module."); + AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneCore module."); (*init)(AZ::Environment::GetInstance()); sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData"); AZ_Assert(sceneDataModule, "SceneData unit tests failed to create SceneData module."); loaded = sceneDataModule->Load(false); - AZ_Assert(loaded, "FbxSceneBuilder unit tests failed to load SceneData module."); + AZ_Assert(loaded, "SceneBuilder unit tests failed to load SceneData module."); init = sceneDataModule->GetFunction(AZ::InitializeDynamicModuleFunctionName); - AZ_Assert(init, "FbxSceneBuilder unit tests failed to find the initialization function the SceneData module."); + AZ_Assert(init, "SceneBuilder unit tests failed to find the initialization function the SceneData module."); (*init)(AZ::Environment::GetInstance()); } void TeardownEnvironment() override { auto uninit = sceneDataModule->GetFunction(AZ::UninitializeDynamicModuleFunctionName); - AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneData module."); + AZ_Assert(uninit, "SceneBuilder unit tests failed to find the uninitialization function the SceneData module."); (*uninit)(); sceneDataModule.reset(); uninit = sceneCoreModule->GetFunction(AZ::UninitializeDynamicModuleFunctionName); - AZ_Assert(uninit, "FbxSceneBuilder unit tests failed to find the uninitialization function the SceneCore module."); + AZ_Assert(uninit, "SceneBuilder unit tests failed to find the uninitialization function the SceneCore module."); (*uninit)(); sceneCoreModule.reset(); @@ -59,5 +59,5 @@ private: AZStd::unique_ptr sceneDataModule; }; -AZ_UNIT_TEST_HOOK(new FbxSceneBuilderTestEnvironment); +AZ_UNIT_TEST_HOOK(new SceneBuilderTestEnvironment); diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake similarity index 91% rename from Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake index 0e3a793af1..5bd6748399 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_files.cmake +++ b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_files.cmake @@ -6,13 +6,13 @@ # set(FILES - FbxSceneBuilderConfiguration.h - FbxImportRequestHandler.h - FbxImportRequestHandler.cpp - FbxImporter.h - FbxImporter.cpp - FbxSceneSystem.h - FbxSceneSystem.cpp + SceneBuilderConfiguration.h + SceneImportRequestHandler.h + SceneImportRequestHandler.cpp + SceneImporter.h + SceneImporter.cpp + SceneSystem.h + SceneSystem.cpp ImportContexts/ImportContexts.h ImportContexts/ImportContexts.cpp ImportContexts/AssImpImportContexts.h diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_shared_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_shared_files.cmake similarity index 100% rename from Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_shared_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/scenebuilder_shared_files.cmake diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_files.cmake similarity index 85% rename from Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake rename to Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_files.cmake index 8f84805438..c4d970e4e3 100644 --- a/Code/Tools/SceneAPI/FbxSceneBuilder/fbxscenebuilder_testing_files.cmake +++ b/Code/Tools/SceneAPI/SceneBuilder/scenebuilder_testing_files.cmake @@ -7,6 +7,6 @@ set(FILES Tests/TestsMain.cpp - Tests/Importers/FbxImporterUtilitiesTests.cpp + Tests/Importers/SceneImporterUtilitiesTests.cpp Tests/Importers/Utilities/RenamedNodesMapTests.cpp ) diff --git a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h index 2b0cb968a8..3b62341dce 100644 --- a/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h +++ b/Code/Tools/SceneAPI/SceneCore/Containers/SceneGraph.h @@ -27,7 +27,7 @@ namespace AZ { class IGraphObject; } - namespace FbxSceneBuilder + namespace SceneBuilder { struct QueueNode; struct ImportContext; @@ -58,8 +58,8 @@ namespace AZ class NodeIndex { friend class SceneGraph; - friend struct FbxSceneBuilder::QueueNode; - friend struct FbxSceneBuilder::ImportContext; + friend struct SceneBuilder::QueueNode; + friend struct SceneBuilder::ImportContext; public: // Type needs to be able to store an index in a NodeHeader (currently 21-bits). using IndexType = uint32_t; diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h index 16a5f509e0..7b8ea30c3c 100644 --- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h +++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshData.h @@ -80,11 +80,11 @@ namespace AZ virtual unsigned int GetVertexIndex(int faceIndex, int vertexIndexInFace) const = 0; static const int s_invalidMaterialId = 0; - // Set the unit size of the mesh, from the point of FBX SDK + // Set the unit size of the mesh, from the point of the source SDK void SetUnitSizeInMeters(float size) { m_unitSizeInMeters = size; } float GetUnitSizeInMeters() const { return m_unitSizeInMeters; } - // Set the original unit size of the mesh, from the point of FBX SDK + // Set the original unit size of the mesh, from the point of the source SDK void SetOriginalUnitSizeInMeters(float size) { m_originalUnitSizeInMeters = size; } float GetOriginalUnitSizeInMeters() const { return m_originalUnitSizeInMeters; } diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp index c2b80051fe..8f4b3d9c63 100644 --- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp +++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp @@ -144,10 +144,10 @@ namespace PhysX namespace Utils { - // Utility function doing look-up in fbxMaterialNames and inserting the name if it's not found + // Utility function doing look-up in sourceSceneMaterialNames and inserting the name if it's not found AZ::u16 InsertMaterialIndexByName(const AZStd::string& materialName, AssetMaterialsData& materials) { - AZStd::vector& fbxMaterialNames = materials.m_fbxMaterialNames; + AZStd::vector& sourceSceneMaterialNames = materials.m_sourceSceneMaterialNames; AZStd::unordered_map& materialIndexByName = materials.m_materialIndexByName; // Check if we have this material in the list @@ -159,9 +159,9 @@ namespace PhysX } // Add it to the list otherwise - fbxMaterialNames.push_back(materialName); + sourceSceneMaterialNames.push_back(materialName); - AZ::u16 newIndex = fbxMaterialNames.size() - 1; + AZ::u16 newIndex = sourceSceneMaterialNames.size() - 1; materialIndexByName[materialName] = newIndex; return newIndex; @@ -284,8 +284,8 @@ namespace PhysX AZStd::string_view nodeName = sceneGraph.GetNodeName(nodeIndex).GetName(); - const AZStd::vector localFbxMaterialsList = GenerateLocalNodeMaterialMap(sceneGraph, nodeIndex); - if (localFbxMaterialsList.empty()) + const AZStd::vector localSourceSceneMaterialsList = GenerateLocalNodeMaterialMap(sceneGraph, nodeIndex); + if (localSourceSceneMaterialsList.empty()) { AZ_TracePrintf( AZ::SceneAPI::Utilities::WarningWindow, @@ -304,26 +304,26 @@ namespace PhysX for (AZ::u32 faceIndex = 0; faceIndex < faceCount; ++faceIndex) { AZStd::string materialName = DefaultMaterialName; - if (!localFbxMaterialsList.empty()) + if (!localSourceSceneMaterialsList.empty()) { const int materialId = nodeMesh->GetFaceMaterialId(faceIndex); - if (materialId >= localFbxMaterialsList.size()) + if (materialId >= localSourceSceneMaterialsList.size()) { AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, - "materialId %d for face %d is out of bound for localFbxMaterialsList (size %d).", - materialId, faceIndex, localFbxMaterialsList.size()); + "materialId %d for face %d is out of bound for localSourceSceneMaterialsList (size %d).", + materialId, faceIndex, localSourceSceneMaterialsList.size()); return AZStd::nullopt; } - materialName = localFbxMaterialsList[materialId]; + materialName = localSourceSceneMaterialsList[materialId]; // Keep using the first material when it has to be limited to one. if (limitToOneMaterial && - assetMaterialData.m_fbxMaterialNames.size() == 1 && - assetMaterialData.m_fbxMaterialNames[0] != materialName) + assetMaterialData.m_sourceSceneMaterialNames.size() == 1 && + assetMaterialData.m_sourceSceneMaterialNames[0] != materialName) { - materialName = assetMaterialData.m_fbxMaterialNames[0]; + materialName = assetMaterialData.m_sourceSceneMaterialNames[0]; } } @@ -504,7 +504,7 @@ namespace PhysX // because this exporter runs when the source scene is being processed, which // could have a different content from when the mesh group info was // entered in Scene Settings Editor. - if (!Utils::UpdateAssetPhysicsMaterials(assetMaterialsData.m_fbxMaterialNames, assetData.m_materialNames, assetData.m_physicsMaterialNames)) + if (!Utils::UpdateAssetPhysicsMaterials(assetMaterialsData.m_sourceSceneMaterialNames, assetData.m_materialNames, assetData.m_physicsMaterialNames)) { return SceneEvents::ProcessingResult::Failure; } diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h index 3bb6bea456..fa12eb6f56 100644 --- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h +++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.h @@ -60,9 +60,9 @@ namespace PhysX struct AssetMaterialsData { //! Material names coming from the source scene file. - AZStd::vector m_fbxMaterialNames; + AZStd::vector m_sourceSceneMaterialNames; - //! Look-up table for fbxMaterialNames. + //! Look-up table for sourceSceneMaterialNames. AZStd::unordered_map m_materialIndexByName; //! Map of mesh nodes to their list of material indices associated to each face. diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp index 9fe9256019..e0d9eb1e96 100644 --- a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp +++ b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp @@ -763,7 +763,7 @@ namespace PhysX return; } - Utils::UpdateAssetPhysicsMaterials(assetMaterialData->m_fbxMaterialNames, m_materialSlots, m_physicsMaterials); + Utils::UpdateAssetPhysicsMaterials(assetMaterialData->m_sourceSceneMaterialNames, m_materialSlots, m_physicsMaterials); } AZ::SceneAPI::Containers::RuleContainer& MeshGroup::GetRuleContainer() diff --git a/Gems/SceneLoggingExample/ReadMe.txt b/Gems/SceneLoggingExample/ReadMe.txt index f7c398c78d..62fe755ddf 100644 --- a/Gems/SceneLoggingExample/ReadMe.txt +++ b/Gems/SceneLoggingExample/ReadMe.txt @@ -2,7 +2,7 @@ The Scene Logging Example demonstrates how to extend the SceneAPI by adding addi a collection of libraries that handle loading scene files and converting content to data that the Open 3D Engine and its editor can load. The following approach is used: - 1. The FbxSceneBuilder and SceneData load and convert the scene file (for example, .fbx) into a graph that is stored in memory. + 1. The SceneBuilder and SceneData load and convert the scene file (for example, .fbx) into a graph that is stored in memory. 2. SceneCore and SceneData are used to create a manifest with instructions about how to export the file. 3. SceneData analyzes the manifest and memory graph and creates defaults. 4. Scene Settings allows updates to the manifest through a UI. diff --git a/Gems/SceneProcessing/Code/CMakeLists.txt b/Gems/SceneProcessing/Code/CMakeLists.txt index 02603a57a3..9aa5bc6763 100644 --- a/Gems/SceneProcessing/Code/CMakeLists.txt +++ b/Gems/SceneProcessing/Code/CMakeLists.txt @@ -39,7 +39,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) AZ::SceneCore AZ::SceneData AZ::AzFramework - AZ::FbxSceneBuilder + AZ::SceneBuilder AZ::AssetBuilderSDK ) diff --git a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp index 747253d5b1..72513b509f 100644 --- a/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp +++ b/Gems/SceneProcessing/Code/Source/Config/Components/SceneProcessingConfigSystemComponent.cpp @@ -31,7 +31,7 @@ namespace AZ ActivateSceneModule(SceneProcessing::s_sceneCoreModule); ActivateSceneModule(SceneProcessing::s_sceneDataModule); - ActivateSceneModule(SceneProcessing::s_fbxSceneBuilderModule); + ActivateSceneModule(SceneProcessing::s_sceneBuilderModule); // Defaults in case there's no config setup in the Project Configurator. m_softNames.push_back(aznew NodeSoftNameSetting("^.*_[Ll][Oo][Dd]1(_optimized)?$", PatternMatcher::MatchApproach::Regex, "LODMesh1", true)); @@ -65,7 +65,7 @@ namespace AZ SceneProcessingConfigSystemComponent::~SceneProcessingConfigSystemComponent() { - DeactivateSceneModule(SceneProcessing::s_fbxSceneBuilderModule); + DeactivateSceneModule(SceneProcessing::s_sceneBuilderModule); DeactivateSceneModule(SceneProcessing::s_sceneDataModule); DeactivateSceneModule(SceneProcessing::s_sceneCoreModule); } @@ -140,7 +140,7 @@ namespace AZ { ReflectSceneModule(context, SceneProcessing::s_sceneCoreModule); ReflectSceneModule(context, SceneProcessing::s_sceneDataModule); - ReflectSceneModule(context, SceneProcessing::s_fbxSceneBuilderModule); + ReflectSceneModule(context, SceneProcessing::s_sceneBuilderModule); SoftNameSetting::Reflect(context); NodeSoftNameSetting::Reflect(context); diff --git a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp index 2839c8037d..bff43b9518 100644 --- a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp +++ b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.cpp @@ -33,7 +33,7 @@ namespace AZ { LoadSceneModule(s_sceneCoreModule, "SceneCore"); LoadSceneModule(s_sceneDataModule, "SceneData"); - LoadSceneModule(s_fbxSceneBuilderModule, "FbxSceneBuilder"); + LoadSceneModule(s_sceneBuilderModule, "SceneBuilder"); m_descriptors.insert(m_descriptors.end(), { @@ -59,7 +59,7 @@ namespace AZ ~SceneProcessingModule() { - UnloadModule(s_fbxSceneBuilderModule); + UnloadModule(s_sceneBuilderModule); UnloadModule(s_sceneDataModule); UnloadModule(s_sceneCoreModule); } diff --git a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h index 674d3b449b..3491d1a702 100644 --- a/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h +++ b/Gems/SceneProcessing/Code/Source/SceneProcessingModule.h @@ -12,5 +12,5 @@ namespace AZ::SceneProcessing { inline AZStd::unique_ptr s_sceneCoreModule; inline AZStd::unique_ptr s_sceneDataModule; - inline AZStd::unique_ptr s_fbxSceneBuilderModule; + inline AZStd::unique_ptr s_sceneBuilderModule; } // namespace AZ::SceneProcessing