sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShaderNode: Handle vector component count at runtime

Browse Source
This commit is contained in:
Lynix
2020-05-31 18:39:28 +02:00
parent 2ecc624fe4
commit effd1b4552
28 changed files with 529 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/ShaderAst.hpp
View File

@@ -258,6 +258,7 @@ namespace Nz
{
public:
inline Cast(ExpressionType castTo, ExpressionPtr first, ExpressionPtr second = nullptr, ExpressionPtr third = nullptr, ExpressionPtr fourth = nullptr);
inline Cast(ExpressionType castTo, ExpressionPtr* expressions, std::size_t expressionCount);
ExpressionType GetExpressionType() const override;
void Register(ShaderWriter& visitor) override;
@@ -265,6 +266,9 @@ namespace Nz
ExpressionType exprType;
std::array<ExpressionPtr, 4> expressions;
private:
void Validate() const;
};
class NAZARA_RENDERER_API Constant : public Expression

19
include/Nazara/Renderer/ShaderAst.inl
View File

@@ -169,19 +169,16 @@ namespace Nz
exprType(castTo),
expressions({ {first, second, third, fourth} })
{
unsigned int componentCount = 0;
unsigned int requiredComponents = GetComponentCount(exprType);
for (const auto& exprPtr : expressions)
{
if (!exprPtr)
break;
Validate();
}
componentCount += GetComponentCount(exprPtr->GetExpressionType());
}
inline Cast::Cast(ExpressionType castTo, ExpressionPtr* Expressions, std::size_t expressionCount) :
exprType(castTo)
{
for (std::size_t i = 0; i < expressionCount; ++i)
expressions[i] = Expressions[i];
//TODO: AstParseError
if (componentCount != requiredComponents)
throw std::runtime_error("Component count doesn't match required component count");
Validate();
}
inline Constant::Constant(bool value) :