From 1cfe66ffece8a18a1673b8fbac4e6b433be85e4e Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Tue, 3 Dec 2019 09:03:39 +0200
Subject: [PATCH] Use discon support for MLS
---
applications/reconstruct/src/main.cpp | 2 +-
components/operators/src/mvmls.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/applications/reconstruct/src/main.cpp b/applications/reconstruct/src/main.cpp
index 42d339fd0..f3a92c933 100644
--- a/applications/reconstruct/src/main.cpp
+++ b/applications/reconstruct/src/main.cpp
@@ -334,7 +334,7 @@ static void run(ftl::Configurable *root) {
pipeline1->append<ftl::operators::CrossSupport>("cross2")->set("discon_support", true);
pipeline1->append<ftl::operators::CullDiscontinuity>("remove_discontinuity");
//pipeline1->append<ftl::operators::AggreMLS>("mls"); // Perform MLS (using smoothing channel)
- pipeline1->append<ftl::operators::VisCrossSupport>("viscross"); //->set("enabled", false);
+ pipeline1->append<ftl::operators::VisCrossSupport>("viscross")->set("enabled", false);
pipeline1->append<ftl::operators::MultiViewMLS>("mvmls");
// Alignment
diff --git a/components/operators/src/mvmls.cpp b/components/operators/src/mvmls.cpp
index 4c02a7607..e85f82711 100644
--- a/components/operators/src/mvmls.cpp
+++ b/components/operators/src/mvmls.cpp
@@ -61,7 +61,7 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
LOG(ERROR) << "Required normals channel missing for MLS";
return false;
}
- if (!f.hasChannel(Channel::Support1)) {
+ if (!f.hasChannel(Channel::Support2)) {
LOG(ERROR) << "Required cross support channel missing for MLS";
return false;
}
@@ -214,7 +214,7 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
}
ftl::cuda::mls_aggr_horiz(
- f.createTexture<uchar4>(Channel::Support1),
+ f.createTexture<uchar4>(Channel::Support2),
f.createTexture<float4>(Channel::Normals),
normals_horiz_[i],
f.createTexture<float>(Channel::Depth),
@@ -228,7 +228,7 @@ bool MultiViewMLS::apply(ftl::rgbd::FrameSet &in, ftl::rgbd::FrameSet &out, cuda
);
ftl::cuda::mls_aggr_vert(
- f.getTexture<uchar4>(Channel::Support1),
+ f.getTexture<uchar4>(Channel::Support2),
normals_horiz_[i],
f.getTexture<float4>(Channel::Normals),
centroid_horiz_[i],
--
GitLab