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

transform: added interpolation parameter

Browse Source
This commit is contained in:
itsmattkc
2020-11-22 22:53:31 +11:00
parent ed6f4eed3e
commit 60f515a2cc
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/distort/transform/transformdistortnode.cpp
+7
View File
@@ -31,6 +31,9 @@ TransformDistortNode::TransformDistortNode()
autoscale_input_ = new NodeInput(QStringLiteral("autoscale_in"), NodeParam::kCombo, 0);
AddInput(autoscale_input_);
interpolation_input_ = new NodeInput(QStringLiteral("interpolation_in"), NodeParam::kCombo, 2);
AddInput(interpolation_input_);
texture_input_ = new NodeInput(QStringLiteral("tex_in"), NodeParam::kTexture);
AddInput(texture_input_);
}
@@ -41,8 +44,10 @@ void TransformDistortNode::Retranslate()
autoscale_input_->set_name(tr("Auto-Scale"));
texture_input_->set_name(tr("Texture"));
interpolation_input_->set_name(tr("Interpolation"));
autoscale_input_->set_combobox_strings({tr("None"), tr("Fit"), tr("Fill"), tr("Stretch")});
interpolation_input_->set_combobox_strings({tr("Nearest Neighbor"), tr("Bilinear"), tr("Mipmapped Bilinear")});
}
NodeValueTable TransformDistortNode::Value(NodeValueDatabase &value) const
@@ -76,6 +81,8 @@ NodeValueTable TransformDistortNode::Value(NodeValueDatabase &value) const
ShaderJob job;
job.InsertValue(QStringLiteral("ove_maintex"), ShaderValue(QVariant::fromValue(texture), NodeParam::kTexture));
job.InsertValue(QStringLiteral("ove_mvpmat"), ShaderValue(real_matrix, NodeParam::kMatrix));
job.SetInterpolation(QStringLiteral("ove_maintex"), static_cast<Texture::Interpolation>(value[interpolation_input_].Get(NodeParam::kCombo).toInt()));
table.Push(NodeParam::kShaderJob, QVariant::fromValue(job), this);
}
}
app/node/distort/transform/transformdistortnode.h
+1
View File
@@ -100,6 +100,7 @@ private:
NodeInput* texture_input_;
NodeInput* autoscale_input_;
NodeInput* interpolation_input_;
// Gizmo variables
NodeInput* gizmo_drag_;
app/render/job/shaderjob.h
+1 -1
View File
@@ -67,7 +67,7 @@ public:
return iterative_input_;
}
Texture::Interpolation GetInterpolation(const QString& id)
Texture::Interpolation GetInterpolation(const QString& id) const
{
return interpolation_.value(id, Texture::kDefaultInterpolation);
}