diff --git a/include/Nazara/Graphics/BasicMaterial.inl b/include/Nazara/Graphics/BasicMaterial.inl index 875dc4b8e..8eb32ff7f 100644 --- a/include/Nazara/Graphics/BasicMaterial.inl +++ b/include/Nazara/Graphics/BasicMaterial.inl @@ -9,6 +9,20 @@ namespace Nz { + /*! + * \brief Enable/Disable alpha test for this material + * + * When enabled, all objects using this material will be rendered using alpha testing, + * rejecting pixels if their alpha component is under a defined threshold. + * This allows some kind of transparency with a much cheaper cost as it doesn't prevent any optimization (as deferred rendering or batching). + * + * \param alphaTest Defines if this material will use alpha testing + * + * \remark Invalidates the pipeline + * + * \see IsAlphaTestEnabled + * \see SetAlphaThreshold + */ inline void BasicMaterial::EnableAlphaTest(bool alphaTest) { NazaraAssert(HasAlphaTest(), "Material has no alpha test condition"); diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index f3e58e271..93493ce14 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -38,7 +38,6 @@ namespace Nz inline void Configure(std::shared_ptr pipeline); inline void Configure(const MaterialPipelineInfo& pipelineInfo); - inline void EnableAlphaTest(bool alphaTest); inline void EnableBlending(bool blending); inline void EnableColorWrite(bool colorWrite); inline void EnableCondition(std::size_t conditionIndex, bool enable); diff --git a/include/Nazara/Graphics/Material.inl b/include/Nazara/Graphics/Material.inl index 8a2e56b15..036ad2b6e 100644 --- a/include/Nazara/Graphics/Material.inl +++ b/include/Nazara/Graphics/Material.inl @@ -53,27 +53,6 @@ namespace Nz InvalidatePipeline(); } - /*! - * \brief Enable/Disable alpha test for this material - * - * When enabled, all objects using this material will be rendered using alpha testing, - * rejecting pixels if their alpha component is under a defined threshold. - * This allows some kind of transparency with a much cheaper cost as it doesn't prevent any optimization (as deferred rendering or batching). - * - * \param alphaTest Defines if this material will use alpha testing - * - * \remark Invalidates the pipeline - * - * \see IsAlphaTestEnabled - * \see SetAlphaThreshold - */ - inline void Material::EnableAlphaTest(bool alphaTest) - { - m_pipelineInfo.alphaTest = alphaTest; - - InvalidatePipeline(); - } - /*! * \brief Enable/Disable blending for this material * @@ -489,15 +468,6 @@ namespace Nz return m_pipelineInfo.hasVertexColor; } - /*! - * \brief Checks whether this material has alpha test enabled - * \return true If it is the case - */ - inline bool Material::IsAlphaTestEnabled() const - { - return m_pipelineInfo.alphaTest; - } - /*! * \brief Checks whether this material has blending enabled * \return true If it is the case diff --git a/include/Nazara/Graphics/MaterialPipeline.hpp b/include/Nazara/Graphics/MaterialPipeline.hpp index 9e02828b1..951320269 100644 --- a/include/Nazara/Graphics/MaterialPipeline.hpp +++ b/include/Nazara/Graphics/MaterialPipeline.hpp @@ -27,7 +27,6 @@ namespace Nz Nz::UInt64 enabledConditions = 0; }; - bool alphaTest = false; bool depthSorting = false; bool hasVertexColor = false; bool reflectionMapping = false; diff --git a/include/Nazara/Graphics/MaterialPipeline.inl b/include/Nazara/Graphics/MaterialPipeline.inl index b83e6fc6b..0131b7153 100644 --- a/include/Nazara/Graphics/MaterialPipeline.inl +++ b/include/Nazara/Graphics/MaterialPipeline.inl @@ -76,7 +76,6 @@ namespace std #define NazaraPipelineMember(member) Nz::HashCombine(seed, pipelineInfo.member) #define NazaraPipelineBoolMember(member) parameterHash |= ((pipelineInfo.member) ? 1U : 0U) << (parameterIndex++) - NazaraPipelineBoolMember(alphaTest); NazaraPipelineBoolMember(depthSorting); NazaraPipelineBoolMember(hasVertexColor); NazaraPipelineBoolMember(reflectionMapping);