Radient: delegate material asset creation to definitions

Author: TheMostDiligent

Radient/CMakeLists.txt

@@ -65,13 +65,13 @@ set(INCLUDE
     include/Assets/RadientCacheKeyBuilder.hpp
     include/Assets/RadientFilesystemAssetResolver.hpp
     include/Assets/RadientGLTFLoader.hpp
+    include/Assets/RadientMaterialAssetFactory.hpp
     include/Assets/RadientMaterialAssetManager.hpp
     include/Assets/RadientMaterialDefinitionImpl.hpp
     include/Assets/RadientMaterialStorage.hpp
     include/Assets/RadientMeshIndexSource.hpp
     include/Assets/RadientMeshAssetManager.hpp
     include/Assets/RadientMeshVertexSource.hpp
-    include/Assets/RadientSurfaceMaterialAssetImpl.hpp
     include/Assets/RadientMeshViewSource.hpp
     include/Assets/RadientTextureAssetManager.hpp
     include/Assets/RadientTextureFormat.hpp

…sets/RadientSurfaceMaterialAssetImpl.hpp …e/Assets/RadientMaterialAssetFactory.hppRadient/include/Assets/RadientSurfaceMaterialAssetImpl.hpp renamed to Radient/include/Assets/RadientMaterialAssetFactory.hpp Radient/include/Assets/RadientSurfaceMaterialAssetImpl.hpp renamed to Radient/include/Assets/RadientMaterialAssetFactory.hpp

@@ -26,14 +26,20 @@
 
 #pragma once
 
-#include "Assets/RadientMaterialStorage.hpp"
+#include "RadientMaterials.h"
+
+#include "RefCntAutoPtr.hpp"
 
 namespace Diligent
 {
 
 namespace RadientMaterialDetail
 {
 
+RefCntAutoPtr<IRadientMaterialAsset> MakeGenericMaterialAsset(
+    IRadientMaterialDefinitionAsset* pDefinition,
+    RadientHandle                    DefinitionHandle);
+
 RefCntAutoPtr<IRadientMaterialAsset> MakeSurfaceMaterialAsset(
     IRadientMaterialDefinitionAsset* pDefinition,
     RadientHandle                    DefinitionHandle);

Radient/include/Assets/RadientMaterialDefinitionImpl.hpp

@@ -30,6 +30,7 @@
 
 #include "HashUtils.hpp"
 #include "ObjectBase.hpp"
+#include "RefCntAutoPtr.hpp"
 #include "STDAllocator.hpp"
 
 #ifdef _MSC_VER
@@ -193,6 +194,8 @@ class RadientMaterialDefinitionImpl final : public ObjectBase<IRadientMaterialDe
     virtual RADIENT_STATUS DILIGENT_CALL_TYPE FindParameter(const Char*                     Name,
                                                             RadientMaterialParameterHandle* pHandle) const override final;
 
+    RefCntAutoPtr<IRadientMaterialAsset> CreateAsset();
+
     Uint32 GetShaderDataSize() const noexcept
     {
         return m_Data.PackingPlan.Size;
@@ -207,11 +210,6 @@ class RadientMaterialDefinitionImpl final : public ObjectBase<IRadientMaterialDe
     void WriteShaderData(const IRadientMaterialAsset& Material,
                          void*                        pData) const noexcept;
 
-    RadientHandle GetDefinitionHandle() const noexcept
-    {
-        return m_DefinitionHandle;
-    }
-
 private:
     struct ShaderDataCopyCommand
     {
@@ -250,9 +248,9 @@ class RadientMaterialDefinitionImpl final : public ObjectBase<IRadientMaterialDe
             Other.PackingPlan = {};
         }
 
-        PackedData(const PackedData&)            = delete;
+        PackedData(const PackedData&) = delete;
         PackedData& operator=(const PackedData&) = delete;
-        PackedData& operator=(PackedData&&)      = delete;
+        PackedData& operator=(PackedData&&) = delete;
 
         ~PackedData()
         {

Radient/include/Assets/RadientMaterialStorage.hpp

@@ -100,7 +100,6 @@ class MaterialStorage final
     // clang-format on
 
     IRadientMaterialDefinitionAsset* GetDefinition() const noexcept;
-    RadientHandle                    GetDefinitionHandle() const noexcept;
     Uint64                           GetVersion() const noexcept;
 
     RADIENT_STATUS GetParameter(RadientMaterialParameterHandle Handle,
@@ -180,10 +179,6 @@ class MaterialWriterState final
     std::vector<PackedMaterialData::TexturePtr> m_TextureData;
 };
 
-RefCntAutoPtr<IRadientMaterialAsset> MakeMaterialAsset(
-    IRadientMaterialDefinitionAsset* pDefinition,
-    RadientHandle                    DefinitionHandle);
-
 MaterialStorage*       TryGetMaterialStorage(IRadientMaterialAsset* pMaterial) noexcept;
 const MaterialStorage* TryGetMaterialStorage(const IRadientMaterialAsset* pMaterial) noexcept;
 

Radient/src/Assets/RadientMaterialAssetImpl.cpp

@@ -24,6 +24,7 @@
  *  of the possibility of such damages.
  */
 
+#include "Assets/RadientMaterialAssetFactory.hpp"
 #include "Assets/RadientMaterialStorage.hpp"
 
 #include "RadientMaterialAssetImplBase.hpp"
@@ -413,11 +414,6 @@ IRadientMaterialDefinitionAsset* MaterialStorage::GetDefinition() const noexcept
     return m_pDefinition;
 }
 
-RadientHandle MaterialStorage::GetDefinitionHandle() const noexcept
-{
-    return m_DefinitionHandle;
-}
-
 Uint64 MaterialStorage::GetVersion() const noexcept
 {
     return m_Version;
@@ -698,7 +694,7 @@ RefCntAutoPtr<RadientMaterialWriterImpl> RadientMaterialAssetImpl::MakeWriter()
 
 } // namespace
 
-RefCntAutoPtr<IRadientMaterialAsset> RadientMaterialDetail::MakeMaterialAsset(
+RefCntAutoPtr<IRadientMaterialAsset> RadientMaterialDetail::MakeGenericMaterialAsset(
     IRadientMaterialDefinitionAsset* pDefinition,
     RadientHandle                    DefinitionHandle)
 {

Radient/src/Assets/RadientMaterialAssetManager.cpp

@@ -28,7 +28,6 @@
 
 #include "Assets/RadientMaterialDefinitionImpl.hpp"
 #include "Assets/RadientMaterialStorage.hpp"
-#include "Assets/RadientSurfaceMaterialAssetImpl.hpp"
 #include "DebugUtilities.hpp"
 
 #include <exception>
@@ -112,26 +111,10 @@ RADIENT_STATUS RadientMaterialAssetManager::CreateMaterial(
 
     try
     {
-        RefCntAutoPtr<IRadientMaterialAsset> pMaterial;
-        switch (pDefinitionImpl->GetDesc().Type)
-        {
-            case RADIENT_MATERIAL_DEFINITION_TYPE_SURFACE:
-                pMaterial = RadientMaterialDetail::MakeSurfaceMaterialAsset(
-                    pDefinitionImpl, pDefinitionImpl->GetDefinitionHandle());
-                break;
-
-            case RADIENT_MATERIAL_DEFINITION_TYPE_POST_PROCESS:
-            case RADIENT_MATERIAL_DEFINITION_TYPE_COMPUTE:
-                pMaterial = RadientMaterialDetail::MakeMaterialAsset(
-                    pDefinitionImpl, pDefinitionImpl->GetDefinitionHandle());
-                break;
-
-            default:
-                UNEXPECTED("Unexpected material definition type");
-                return RADIENT_STATUS_INVALID_OPERATION;
-        }
-
-        VERIFY_EXPR(pMaterial != nullptr);
+        RefCntAutoPtr<IRadientMaterialAsset> pMaterial = pDefinitionImpl->CreateAsset();
+        if (pMaterial == nullptr)
+            return RADIENT_STATUS_INVALID_OPERATION;
+
         *ppMaterial = pMaterial.Detach();
         return RADIENT_STATUS_OK;
     }

Radient/src/Assets/RadientMaterialDefinitionImpl.cpp

@@ -26,6 +26,7 @@
 
 #include "Assets/RadientMaterialDefinitionImpl.hpp"
 
+#include "Assets/RadientMaterialAssetFactory.hpp"
 #include "Assets/RadientMaterialStorage.hpp"
 #include "Assets/RadientTextureAssetManager.hpp"
 
@@ -770,6 +771,23 @@ RADIENT_STATUS DILIGENT_CALL_TYPE RadientMaterialDefinitionImpl::FindParameter(
     return GetParameterHandle(It->second, pHandle);
 }
 
+RefCntAutoPtr<IRadientMaterialAsset> RadientMaterialDefinitionImpl::CreateAsset()
+{
+    switch (m_Data.GetDesc().Type)
+    {
+        case RADIENT_MATERIAL_DEFINITION_TYPE_SURFACE:
+            return RadientMaterialDetail::MakeSurfaceMaterialAsset(this, m_DefinitionHandle);
+
+        case RADIENT_MATERIAL_DEFINITION_TYPE_POST_PROCESS:
+        case RADIENT_MATERIAL_DEFINITION_TYPE_COMPUTE:
+            return RadientMaterialDetail::MakeGenericMaterialAsset(this, m_DefinitionHandle);
+
+        default:
+            UNEXPECTED("Unexpected material definition type");
+            return {};
+    }
+}
+
 void RadientMaterialDefinitionImpl::WriteShaderData(
     const IRadientMaterialAsset& Material,
     void*                        pData) const noexcept

Radient/src/Assets/RadientSurfaceMaterialAssetImpl.cpp

@@ -24,7 +24,7 @@
  *  of the possibility of such damages.
  */
 
-#include "Assets/RadientSurfaceMaterialAssetImpl.hpp"
+#include "Assets/RadientMaterialAssetFactory.hpp"
 
 #include "RadientMaterialAssetImplBase.hpp"