Implemented model material/texture import and reuse on model/scene load

Sources/OvCore/include/OvCore/ECS/Components/CMaterialRenderer.h

@@ -86,6 +86,13 @@ namespace OvCore::ECS::Components
 		*/
 		void UpdateMaterialList();
 
+		/**
+		* Fill material entries using the embedded materials of the current model
+		* @param p_overwriteExisting
+		* @param p_fallbackMaterial
+		*/
+		void FillWithEmbeddedMaterials(bool p_overwriteExisting, OvCore::Resources::Material* p_fallbackMaterial = nullptr);
+
 		/**
 		* Defines an element of the user matrix
 		* @param p_row
@@ -162,4 +169,4 @@ namespace OvCore::ECS::Components
 	{
 		static constexpr std::string_view Name = "class OvCore::ECS::Components::CMaterialRenderer";
 	};
-}
+}

Sources/OvCore/include/OvCore/ResourceManagement/MaterialManager.h

@@ -6,6 +6,9 @@
 
 #pragma once
 
+#include <optional>
+#include <string>
+
 #include "OvCore/Resources/Loaders/MaterialLoader.h"
 #include "OvCore/ResourceManagement/AResourceManager.h"
 
@@ -17,6 +20,37 @@ namespace OvCore::ResourceManagement
 	class MaterialManager : public AResourceManager<OvCore::Resources::Material>
 	{
 	public:
+		struct StandardShaderDefinition
+		{
+			std::string shaderPath;
+			std::string albedoUniform = "u_Albedo";
+			std::string metallicUniform = "u_Metallic";
+			std::string roughnessUniform = "u_Roughness";
+			std::string emissiveColorUniform = "u_EmissiveColor";
+			std::string emissiveIntensityUniform = "u_EmissiveIntensity";
+			std::string normalMapUniform = "u_NormalMap";
+			std::string heightMapUniform = "u_HeightMap";
+			std::string albedoMapUniform = "u_AlbedoMap";
+			std::string metallicMapUniform = "u_MetallicMap";
+			std::string roughnessMapUniform = "u_RoughnessMap";
+			std::string ambientOcclusionMapUniform = "u_AmbientOcclusionMap";
+			std::string emissiveMapUniform = "u_EmissiveMap";
+			std::string opacityMapUniform = "u_MaskMap";
+			std::string normalMappingFeature = "NORMAL_MAPPING";
+			std::string parallaxMappingFeature = "PARALLAX_MAPPING";
+		};
+
+		/**
+		* Provide the shader definition used to create embedded materials
+		* @param p_definition
+		*/
+		void ProvideStandardShaderDefinition(StandardShaderDefinition p_definition);
+
+		/**
+		* Returns the current shader definition used for embedded materials
+		*/
+		const std::optional<StandardShaderDefinition>& GetStandardShaderDefinition() const;
+
 		/**
 		* Create the resource identified by the given path
 		* @param p_path
@@ -35,5 +69,8 @@ namespace OvCore::ResourceManagement
 		* @param p_path
 		*/
 		virtual void ReloadResource(OvCore::Resources::Material* p_resource, const std::filesystem::path& p_path) override;
+
+	private:
+		std::optional<StandardShaderDefinition> m_standardShaderDefinition;
 	};
-}
+}

Sources/OvCore/src/OvCore/ECS/Components/CMaterialRenderer.cpp

@@ -4,6 +4,7 @@
 * @licence: MIT
 */
 
+#include <algorithm>
 #include <format>
 #include <tinyxml2.h>
 
@@ -13,8 +14,10 @@
 #include <OvCore/Global/ServiceLocator.h>
 #include <OvCore/Helpers/GUIDrawer.h>
 #include <OvCore/ResourceManagement/MaterialManager.h>
+#include <OvRendering/Resources/Parsers/EmbeddedAssetPath.h>
 
 #include <OvUI/Widgets/Layout/Dummy.h>
+#include <OvUI/Widgets/InputFields/AssetField.h>
 #include <OvUI/Widgets/Texts/Text.h>
 #include <OvUI/Widgets/Visual/Separator.h>
 
@@ -226,6 +229,76 @@ void OvCore::ECS::Components::CMaterialRenderer::UpdateMaterialList()
 			m_materialFields[i][1]->enabled = enabled;
 			static_cast<OvUI::Widgets::Texts::Text*>(m_materialFields[i][0])->content =
 				std::format("Material [{}]: <{}>", i, m_materialNames[i]);
+			static_cast<OvUI::Widgets::InputFields::AssetField*>(m_materialFields[i][1])->content =
+				m_materials[i] ? m_materials[i]->path : std::string{};
+		}
+	}
+}
+
+void OvCore::ECS::Components::CMaterialRenderer::FillWithEmbeddedMaterials(bool p_overwriteExisting, OvCore::Resources::Material* p_fallbackMaterial)
+{
+	auto* modelRenderer = owner.GetComponent<CModelRenderer>();
+	if (!modelRenderer)
+	{
+		return;
+	}
+
+	const auto* model = modelRenderer->GetModel();
+	if (!model)
+	{
+		return;
+	}
+
+	auto& materialManager = Global::ServiceLocator::Get<ResourceManagement::MaterialManager>();
+
+	const uint8_t materialCount = static_cast<uint8_t>(std::min(
+		model->GetMaterialNames().size(),
+		static_cast<size_t>(kMaxMaterialCount)
+	));
+	const size_t embeddedMaterialCount = model->GetEmbeddedMaterials().size();
+
+	for (uint8_t i = 0; i < materialCount; ++i)
+	{
+		auto* currentMaterial = GetMaterialAtIndex(i);
+		const bool shouldOverride = p_overwriteExisting || !currentMaterial;
+		if (!shouldOverride)
+		{
+			continue;
+		}
+
+		if (i >= embeddedMaterialCount)
+		{
+			if (p_fallbackMaterial)
+			{
+				SetMaterialAtIndex(i, *p_fallbackMaterial);
+			}
+			else if (p_overwriteExisting)
+			{
+				RemoveMaterialAtIndex(i);
+			}
+			continue;
+		}
+
+		const auto embeddedMaterialPath = OvRendering::Resources::Parsers::MakeEmbeddedMaterialPath(model->path, i);
+		if (auto* embeddedMaterial = materialManager.GetResource(embeddedMaterialPath))
+		{
+			SetMaterialAtIndex(i, *embeddedMaterial);
+		}
+		else if (p_fallbackMaterial)
+		{
+			SetMaterialAtIndex(i, *p_fallbackMaterial);
+		}
+		else if (p_overwriteExisting)
+		{
+			RemoveMaterialAtIndex(i);
+		}
+	}
+
+	if (p_overwriteExisting)
+	{
+		for (uint8_t i = materialCount; i < kMaxMaterialCount; ++i)
+		{
+			RemoveMaterialAtIndex(i);
 		}
 	}
 }

Sources/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp

@@ -8,10 +8,6 @@
 #include <OvCore/ECS/Components/CModelRenderer.h>
 #include <OvCore/ECS/Components/CMaterialRenderer.h>
 #include <OvCore/ECS/Components/CSkinnedMeshRenderer.h>
-#include <OvCore/Global/ServiceLocator.h>
-#include <OvCore/ResourceManagement/ModelManager.h>
-#include <OvCore/ResourceManagement/ShaderManager.h>
-#include <OvCore/ResourceManagement/TextureManager.h>
 
 #include <OvUI/Plugins/DDTarget.h>
 #include <OvUI/Widgets/Drags/DragFloat.h>
@@ -23,10 +19,12 @@
 
 OvCore::ECS::Components::CModelRenderer::CModelRenderer(ECS::Actor& p_owner) : AComponent(p_owner)
 {
-	m_modelChangedEvent += [this]
+	m_modelChangedEvent += [this]()
 	{
 		if (auto materialRenderer = owner.GetComponent<CMaterialRenderer>())
+		{
 			materialRenderer->UpdateMaterialList();
+		}
 
 		if (auto skinnedMeshRenderer = owner.GetComponent<CSkinnedMeshRenderer>())
 			skinnedMeshRenderer->NotifyModelChanged();
@@ -87,6 +85,7 @@ void OvCore::ECS::Components::CModelRenderer::OnDeserialize(tinyxml2::XMLDocumen
 	OvRendering::Resources::Model* model = nullptr;
 	OvCore::Helpers::Serializer::DeserializeModel(p_doc, p_node, "model", model);
 	SetModel(model);
+
 	OvCore::Helpers::Serializer::DeserializeInt(p_doc, p_node, "frustum_behaviour", reinterpret_cast<int&>(m_frustumBehaviour));
 	OvCore::Helpers::Serializer::DeserializeVec3(p_doc, p_node, "custom_bounding_sphere_position", m_customBoundingSphere.position);
 	OvCore::Helpers::Serializer::DeserializeFloat(p_doc, p_node, "custom_bounding_sphere_radius", m_customBoundingSphere.radius);