GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add shader getter to IMaterial interface

Browse Source
This commit is contained in:
Wojciech Figat
2022-05-12 13:47:19 +02:00
parent 69b9c1b9ee
commit f7e48d9b23
14 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Content/Assets/Material.cpp
View File

@@ -48,6 +48,11 @@ const MaterialInfo& Material::GetInfo() const
return EmptyInfo;
}
GPUShader* Material::GetShader() const
{
return _materialShader ? _materialShader->GetShader() : nullptr;
}
bool Material::IsReady() const
{
return _materialShader && _materialShader->IsReady();
@@ -431,7 +436,7 @@ void Material::InitCompilationOptions(ShaderCompilationOptions& options)
options.Macros.Add({ "USE_GBUFFER_CUSTOM_DATA", Numbers[useCustomData ? 1 : 0] });
options.Macros.Add({ "USE_REFLECTIONS", Numbers[info.FeaturesFlags & MaterialFeaturesFlags::DisableReflections ? 0 : 1] });
if (!(info.FeaturesFlags & MaterialFeaturesFlags::DisableReflections) && info.FeaturesFlags & MaterialFeaturesFlags::ScreenSpaceReflections)
options.Macros.Add({ "MATERIAL_REFLECTIONS", Numbers[1]});
options.Macros.Add({ "MATERIAL_REFLECTIONS", Numbers[1] });
options.Macros.Add({ "USE_FOG", Numbers[info.FeaturesFlags & MaterialFeaturesFlags::DisableFog ? 0 : 1] });
if (useForward)
options.Macros.Add({ "USE_PIXEL_NORMAL_OFFSET_REFRACTION", Numbers[info.FeaturesFlags & MaterialFeaturesFlags::PixelNormalOffsetRefraction ? 1 : 0] });

1
Source/Engine/Content/Assets/Material.h
View File

@@ -45,6 +45,7 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
DrawPass GetDrawModes() const override;
bool CanUseLightmap() const override;

5
Source/Engine/Content/Assets/MaterialInstance.cpp
View File

@@ -143,6 +143,11 @@ const MaterialInfo& MaterialInstance::GetInfo() const
return EmptyInfo;
}
GPUShader* MaterialInstance::GetShader() const
{
return _baseMaterial ? _baseMaterial->GetShader() : nullptr;
}
bool MaterialInstance::IsReady() const
{
return IsLoaded() && _baseMaterial && _baseMaterial->IsReady();

1
Source/Engine/Content/Assets/MaterialInstance.h
View File

@@ -59,6 +59,7 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
DrawPass GetDrawModes() const override;
bool CanUseLightmap() const override;

7
Source/Engine/Graphics/Materials/IMaterial.h
View File

@@ -5,6 +5,7 @@
#include "MaterialInfo.h"
struct MaterialParamsLink;
class GPUShader;
class GPUContext;
class GPUTextureView;
class RenderBuffers;
@@ -26,6 +27,12 @@ public:
/// <returns>The constant reference to the material descriptor.</returns>
virtual const MaterialInfo& GetInfo() const = 0;
/// <summary>
/// Gets the shader resource.
/// </summary>
/// <returns>The material shader resource.</returns>
virtual GPUShader* GetShader() const = 0;
/// <summary>
/// Determines whether material is a surface shader.
/// </summary>

3
Source/Engine/Graphics/Materials/MaterialShader.h
View File

@@ -98,8 +98,6 @@ public:
/// <returns>The created and loaded material or null if failed.</returns>
static MaterialShader* CreateDummy(MemoryReadStream& shaderCacheStream, const MaterialInfo& info);
GPUShader* GetShader() const;
/// <summary>
/// Clears the loaded data.
/// </summary>
@@ -114,5 +112,6 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
};

5
Source/Engine/Renderer/Editor/LODPreview.cpp
View File

@@ -22,6 +22,11 @@ const MaterialInfo& LODPreviewMaterialShader::GetInfo() const
return _material->GetInfo();
}
GPUShader* LODPreviewMaterialShader::GetShader() const
{
return _material->GetShader();
}
bool LODPreviewMaterialShader::IsReady() const
{
return _material && _material->IsReady();

1
Source/Engine/Renderer/Editor/LODPreview.h
View File

@@ -30,6 +30,7 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
bool CanUseInstancing(InstancingHandler& handler) const override;
DrawPass GetDrawModes() const override;

5
Source/Engine/Renderer/Editor/LightmapUVsDensity.cpp
View File

@@ -53,6 +53,11 @@ const MaterialInfo& LightmapUVsDensityMaterialShader::GetInfo() const
return _info;
}
GPUShader* LightmapUVsDensityMaterialShader::GetShader() const
{
return _shader->GetShader();
}
bool LightmapUVsDensityMaterialShader::IsReady() const
{
return _shader && _shader->IsLoaded();

1
Source/Engine/Renderer/Editor/LightmapUVsDensity.h
View File

@@ -40,6 +40,7 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
DrawPass GetDrawModes() const override;
void Bind(BindParameters& params) override;

5
Source/Engine/Renderer/Editor/MaterialComplexity.cpp
View File

@@ -29,6 +29,11 @@ const MaterialInfo& MaterialComplexityMaterialShader::WrapperShader::GetInfo() c
return Info;
}
GPUShader* MaterialComplexityMaterialShader::WrapperShader::GetShader() const
{
return MaterialAsset->GetShader();
}
bool MaterialComplexityMaterialShader::WrapperShader::IsReady() const
{
return MaterialAsset && MaterialAsset->IsReady();

1
Source/Engine/Renderer/Editor/MaterialComplexity.h
View File

@@ -25,6 +25,7 @@ private:
MaterialDomain Domain;
AssetReference<Material> MaterialAsset;
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
bool CanUseInstancing(InstancingHandler& handler) const override;
DrawPass GetDrawModes() const override;

5
Source/Engine/Renderer/Editor/VertexColors.cpp
View File

@@ -41,6 +41,11 @@ const MaterialInfo& VertexColorsMaterialShader::GetInfo() const
return _info;
}
GPUShader* VertexColorsMaterialShader::GetShader() const
{
return _shader->GetShader();
}
bool VertexColorsMaterialShader::IsReady() const
{
return _shader && _shader->IsLoaded();

1
Source/Engine/Renderer/Editor/VertexColors.h
View File

@@ -38,6 +38,7 @@ public:
// [IMaterial]
const MaterialInfo& GetInfo() const override;
GPUShader* GetShader() const override;
bool IsReady() const override;
DrawPass GetDrawModes() const override;
void Bind(BindParameters& params) override;