update

meta4d-me · Sep 23, 2023 · 03c46ba · 03c46ba
1 parent 00c520a
commit 03c46ba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 32 deletions.
diff --git a/Engine/Source/Editor/UILayers/AssetBrowser.cpp b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
@@ -348,7 +348,7 @@ void AssetBrowser::UpdateAssetFolderTree()
 			//m_pImportFileBrowser->SetTypeFilters({ ".dds", "*.exr", "*.hdr", "*.ktx", ".tga" });
 			m_pImportFileBrowser->Open();
 
-			CD_INFO("Import asset type: {}", GetIOAssetTypeName(m_importOptions.AssetType));
+			CD_INFO("Import asset type: {}", nameof::nameof_enum(m_importOptions.AssetType));
 		}
 
 		else if (ImGui::Selectable("Shader"))
@@ -358,7 +358,7 @@ void AssetBrowser::UpdateAssetFolderTree()
 			//m_pImportFileBrowser->SetTypeFilters({ ".sc" }); // ".hlsl"
 			m_pImportFileBrowser->Open();
 
-			CD_INFO("Import asset type: {}", GetIOAssetTypeName(m_importOptions.AssetType));
+			CD_INFO("Import asset type: {}", nameof::nameof_enum(m_importOptions.AssetType));
 		}
 		else if (ImGui::Selectable("Model"))
 		{
@@ -367,7 +367,7 @@ void AssetBrowser::UpdateAssetFolderTree()
 			//m_pImportFileBrowser->SetTypeFilters({ ".fbx", ".gltf" }); // ".obj", ".dae", ".ogex"
 			m_pImportFileBrowser->Open();
 
-			CD_INFO("Import asset type: {}", GetIOAssetTypeName(m_importOptions.AssetType));
+			CD_INFO("Import asset type: {}", nameof::nameof_enum(m_importOptions.AssetType));
 		}
 
 #ifdef ENABLE_DDGI
@@ -402,7 +402,7 @@ void AssetBrowser::UpdateAssetFolderTree()
 			m_pExportFileBrowser->SetTitle("ExportAssets - SceneDatabase");
 			m_pExportFileBrowser->Open();
 
-			CD_INFO("Export asset type: {}", GetIOAssetTypeName(m_exportOptions.AssetType));
+			CD_INFO("Export asset type: {}", nameof::nameof_enum(m_exportOptions.AssetType));
 		}
 
 		ImGui::EndPopup();
@@ -875,7 +875,7 @@ void AssetBrowser::ProcessSceneDatabase(cd::SceneDatabase* pSceneDatabase, bool
 		pSceneDatabase->GetTextures().clear();
 		for (auto& material : pSceneDatabase->GetMaterials())
 		{
-			for (int textureTypeIndex = 0; textureTypeIndex < static_cast<int>(cd::MaterialTextureType::Count); ++textureTypeIndex)
+			for (int textureTypeIndex = 0; textureTypeIndex < nameof::enum_count<cd::MaterialTextureType>(); ++textureTypeIndex)
 			{
 				material.RemoveTexture(static_cast<cd::MaterialTextureType>(textureTypeIndex));
 			}

diff --git a/Engine/Source/Editor/UILayers/AssetBrowser.h b/Engine/Source/Editor/UILayers/AssetBrowser.h
@@ -39,30 +39,8 @@ enum class IOAssetType
 	Terrain,
 	Light,
 	Unknown,
-
-	Count,
-};
-
-constexpr const char *IOAssetTypeName[] =
-{
-	"CubeMap",
-	"DDGIModel",
-	"Model",
-	"Shader",
-	"SceneDatabase",
-	"Terrain",
-	"Light",
-	"Unknown",
 };
 
-static_assert(static_cast<int>(IOAssetType::Count) == sizeof(IOAssetTypeName) / sizeof(char*),
-	"IO asset type and names mismatch.");
-
-CD_FORCEINLINE const char* GetIOAssetTypeName(IOAssetType type)
-{
-	return IOAssetTypeName[static_cast<size_t>(type)];
-}
-
 struct AssetImportOptions
 {
 	IOAssetType AssetType = IOAssetType::Unknown;

diff --git a/Engine/Source/Editor/UILayers/Inspector.cpp b/Engine/Source/Editor/UILayers/Inspector.cpp
@@ -200,7 +200,7 @@ void UpdateComponentWidget<engine::MaterialComponent>(engine::SceneWorld* pScene
 		}
 
 		// Textures
-		for (int textureTypeValue = 0; textureTypeValue < static_cast<int>(cd::MaterialTextureType::Count); ++textureTypeValue)
+		for (int textureTypeValue = 0; textureTypeValue < nameof::enum_count<cd::MaterialTextureType>(); ++textureTypeValue)
 		{
 			auto textureType = static_cast<cd::MaterialTextureType>(textureTypeValue);
 			bool allowNoTextures = textureType == cd::MaterialTextureType::BaseColor ||
@@ -386,7 +386,7 @@ void UpdateComponentWidget<engine::LightComponent>(engine::SceneWorld* pSceneWor
 	if (isOpen)
 	{
 		cd::LightType lightType = pLightComponent->GetType();
-		std::string lightTypeName = cd::GetLightTypeName(lightType);
+		std::string lightTypeName(nameof::nameof_enum(lightType));
 
 		ImGuiUtils::ImGuiStringProperty("Type", lightTypeName);
 		ImGuiUtils::ColorPickerProperty("Color", pLightComponent->GetColor());

diff --git a/Engine/Source/Runtime/ECWorld/SceneWorld.cpp b/Engine/Source/Runtime/ECWorld/SceneWorld.cpp
@@ -251,7 +251,7 @@ void SceneWorld::AddMaterialToSceneDatabase(engine::Entity entity)
 	pMaterialData->SetFloatProperty(cd::MaterialPropertyGroup::Roughness, cd::MaterialProperty::Factor, pMaterialComponent->GetRoughnessFactor());
 	pMaterialData->SetBoolProperty(cd::MaterialPropertyGroup::General, cd::MaterialProperty::TwoSided, pMaterialComponent->GetTwoSided());
 
-	for (int textureTypeValue = 0; textureTypeValue <static_cast<int>(cd::MaterialTextureType::Count); ++textureTypeValue)
+	for (int textureTypeValue = 0; textureTypeValue < nameof::enum_count<cd::MaterialTextureType>(); ++textureTypeValue)
 	{
 		if (MaterialComponent::TextureInfo* textureInfo = pMaterialComponent->GetTextureInfo(static_cast<cd::MaterialPropertyGroup>(textureTypeValue)))
 		{

diff --git a/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp b/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
@@ -7,6 +7,7 @@
 #include "Math/UnitSystem.hpp"
 
 #include <imgui/imgui.h>
+
 namespace ImGuiUtils
 {
 
@@ -27,7 +28,7 @@ static bool ImGuiEnumProperty(const char* pName, EnumType& value)
 
 	if (ImGui::BeginCombo("##combo", nameof::nameof_enum(value).data()))
 	{
-		auto enumCount = nameof::detail::count_v<std::decay_t<EnumType>>;
+		auto enumCount = nameof::enum_count<EnumType>();
 		for (uint32_t enumIndex = 0U; enumIndex < enumCount; ++enumIndex)
 		{
 			EnumType enumValue = static_cast<EnumType>(enumIndex);

diff --git a/Engine/Source/ThirdParty/AssetPipeline b/Engine/Source/ThirdParty/AssetPipeline
+5 −7		private/Producers/FbxProducer/FbxProducerImpl.cpp
+2 −7		private/Producers/GenericProducer/GenericProducerImpl.cpp
+5 −3		private/Scene/SceneDatabaseImpl.cpp
+12 −1		public/Base/NameOf.h
+1 −20		public/Scene/LightType.h
+5 −13		public/Scene/MaterialTextureType.h