From 1773a02860d83b554fe4bce44ecde58a8b0fce6e Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 8 Aug 2019 15:53:54 +0300
Subject: [PATCH] Working clipping in initial point pocessing
---
.../include/ftl/voxel_hash_params.hpp | 4 ++--
applications/reconstruct/src/voxel_scene.cpp | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/applications/reconstruct/include/ftl/voxel_hash_params.hpp b/applications/reconstruct/include/ftl/voxel_hash_params.hpp
index 480e16d47..5e13ec21c 100644
--- a/applications/reconstruct/include/ftl/voxel_hash_params.hpp
+++ b/applications/reconstruct/include/ftl/voxel_hash_params.hpp
@@ -28,8 +28,8 @@ struct __align__(16) HashParams {
unsigned int m_integrationWeightSample;
unsigned int m_integrationWeightMax;
- int3 m_minBounds;
- int3 m_maxBounds;
+ float3 m_minBounds;
+ float3 m_maxBounds;
float m_spatialSmoothing;
float m_colourSmoothing;
float m_confidenceThresh;
diff --git a/applications/reconstruct/src/voxel_scene.cpp b/applications/reconstruct/src/voxel_scene.cpp
index 5d392d4f7..2dca32316 100644
--- a/applications/reconstruct/src/voxel_scene.cpp
+++ b/applications/reconstruct/src/voxel_scene.cpp
@@ -295,14 +295,14 @@ HashParams SceneRep::_parametersFromConfig() {
params.m_flags = 0;
params.m_flags |= (value("clipping", false)) ? ftl::voxhash::kFlagClipping : 0;
params.m_flags |= (value("mls", false)) ? ftl::voxhash::kFlagMLS : 0;
- params.m_maxBounds = make_int3(
- value("bbox_x_max", 2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE),
- value("bbox_y_max", 2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE),
- value("bbox_z_max", 2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE));
- params.m_minBounds = make_int3(
- value("bbox_x_min", -2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE),
- value("bbox_y_min", -2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE),
- value("bbox_z_min", -2.0f) / (params.m_virtualVoxelSize*SDF_BLOCK_SIZE));
+ params.m_maxBounds = make_float3(
+ value("bbox_x_max", 2.0f),
+ value("bbox_y_max", 2.0f),
+ value("bbox_z_max", 2.0f));
+ params.m_minBounds = make_float3(
+ value("bbox_x_min", -2.0f),
+ value("bbox_y_min", -2.0f),
+ value("bbox_z_min", -2.0f));
return params;
}
--
GitLab