oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

node: change class sent to GetShaderCode

Browse Source
This commit is contained in:
itsmattkc
2022-05-07 13:36:44 -07:00
parent b51cae0475
commit 601d08ce64
38 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/math/math.cpp
+2 -2
View File
@@ -80,9 +80,9 @@ void MathNode::Retranslate()
SetComboBoxStrings(kMethodIn, operations);
}
ShaderCode MathNode::GetShaderCode(const QString &shader_id) const
ShaderCode MathNode::GetShaderCode(const ShaderRequest &request) const
{
return GetShaderCodeInternal(shader_id, kParamAIn, kParamBIn);
return GetShaderCodeInternal(request.id, kParamAIn, kParamBIn);
}
void MathNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
app/node/math/math/math.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
virtual void Retranslate() override;
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
Operation GetOperation() const
{
app/node/math/merge/merge.cpp
+2 -2
View File
@@ -67,9 +67,9 @@ void MergeNode::Retranslate()
SetInputName(kBlendIn, tr("Blend"));
}
ShaderCode MergeNode::GetShaderCode(const QString &shader_id) const
ShaderCode MergeNode::GetShaderCode(const ShaderRequest &request) const
{
Q_UNUSED(shader_id)
Q_UNUSED(request)
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
}
app/node/math/merge/merge.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
virtual void Retranslate() override;
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
static const QString kBaseIn;