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

mathnode: override texture x matrix op

Browse Source
This commit is contained in:
itsmattkc
2020-04-15 02:07:48 +10:00
parent a0a7d106dc
commit c761403ba4
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/math.cpp
+31 -21
View File
@@ -116,26 +116,36 @@ QString MathNode::ShaderFragmentCode(const NodeValueDatabase &input) const
QString operation;
switch (GetOperation()) {
case kOpAdd:
operation = QStringLiteral("%1 + %2");
break;
case kOpSubtract:
operation = QStringLiteral("%1 - %2");
break;
case kOpMultiply:
operation = QStringLiteral("%1 * %2");
break;
case kOpDivide:
operation = QStringLiteral("%1 / %2");
break;
case kOpPower:
operation = QStringLiteral("pow(%1, %2)");
break;
}
if (calc.GetMostLikelyPairing() == kPairTextureMatrix && GetOperation() == kOpMultiply) {
operation = operation.arg(GetShaderVariableCall(param_a_in_->id(), type_a),
GetShaderVariableCall(param_b_in_->id(), type_b));
// Override the operation for this operation since we multiply texture COORDS by the matrix rather than
NodeParam* tex_in = (type_a == NodeParam::kTexture) ? param_a_in_ : param_b_in_;
NodeParam* mat_in = (type_a == NodeParam::kTexture) ? param_b_in_ : param_a_in_;
operation = QStringLiteral("texture2D(%1, (vec4(ove_texcoord, 0.0, 1.0) * %2).xy)").arg(tex_in->id(), mat_in->id());
} else {
switch (GetOperation()) {
case kOpAdd:
operation = QStringLiteral("%1 + %2");
break;
case kOpSubtract:
operation = QStringLiteral("%1 - %2");
break;
case kOpMultiply:
operation = QStringLiteral("%1 * %2");
break;
case kOpDivide:
operation = QStringLiteral("%1 / %2");
break;
case kOpPower:
operation = QStringLiteral("pow(%1, %2)");
break;
}
operation = operation.arg(GetShaderVariableCall(param_a_in_->id(), type_a),
GetShaderVariableCall(param_b_in_->id(), type_b));
}
return QStringLiteral("#version 110\n"
"\n"
@@ -361,10 +371,10 @@ QString MathNode::GetShaderUniformType(const NodeParam::DataType &type)
}
}
QString MathNode::GetShaderVariableCall(const QString &input_id, const NodeParam::DataType &type)
QString MathNode::GetShaderVariableCall(const QString &input_id, const NodeParam::DataType &type, const QString& coord_op)
{
if (type == NodeParam::kTexture) {
return QStringLiteral("texture2D(%1, ove_texcoord)").arg(input_id);
return QStringLiteral("texture2D(%1, ove_texcoord%2)").arg(input_id, coord_op);
}
return input_id;
app/node/math/math.h
+1 -1
View File
@@ -134,7 +134,7 @@ private:
static QString GetShaderUniformType(const NodeParam::DataType& type);
static QString GetShaderVariableCall(const QString& input_id, const NodeParam::DataType& type);
static QString GetShaderVariableCall(const QString& input_id, const NodeParam::DataType& type, const QString &coord_op = QString());
static QVector4D RetrieveVector(const NodeValue& val);