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

merge: don't merge if the blend texture is RGB

Browse Source
This commit is contained in:
itsmattkc
2020-11-15 22:47:10 +11:00
parent 0d0766e4fb
commit bb1f16c8e1
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/math/merge/merge.cpp
+10 -6
View File
@@ -75,15 +75,19 @@ NodeValueTable MergeNode::Value(NodeValueDatabase &value) const
job.InsertValue(base_in_, value); job.InsertValue(base_in_, value);
job.InsertValue(blend_in_, value); job.InsertValue(blend_in_, value);
// FIXME: Check if "blend" is RGB-only, in which case it's a no-op
NodeValueTable table = value.Merge(); NodeValueTable table = value.Merge();
if (!job.GetValue(base_in_).data.isNull() || !job.GetValue(blend_in_).data.isNull()) { TexturePtr base_tex = job.GetValue(base_in_).data.value<TexturePtr>();
if (job.GetValue(base_in_).data.isNull()) { TexturePtr blend_tex = job.GetValue(blend_in_).data.value<TexturePtr>();
// We only have a blend texture, no need to alpha over
if (base_tex || blend_tex) {
if (!base_tex || (blend_tex && blend_tex->channel_count() < VideoParams::kRGBAChannelCount)) {
// We only have a blend texture or the blend texture is RGB only, no need to alpha over
if (base_tex) {
qDebug() << "Ignored merge because blend texture was RGB only";
}
table.Push(job.GetValue(blend_in_), this); table.Push(job.GetValue(blend_in_), this);
} else if (job.GetValue(blend_in_).data.isNull()) { } else if (!blend_tex) {
// We only have a base texture, no need to alpha over // We only have a base texture, no need to alpha over
table.Push(job.GetValue(base_in_), this); table.Push(job.GetValue(base_in_), this);
} else { } else {