Merge branch 'feature/147/clipping' into 'master'

Implement #147 clipping

Closes #147

See merge request nicolas.pope/ftl!84

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;

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;
 }
 

config/config_nick.jsonc

@@ -150,13 +150,13 @@
 			"confidenceThreshold": 0.0,
 			"mls": true,
 			"voxels": false,
-			"clipping": false,
-			"bbox_x_max": 1.5,
-			"bbox_x_min": -1.5,
+			"clipping": true,
+			"bbox_x_max": 0.6,
+			"bbox_x_min": -0.6,
 			"bbox_y_max": 3.0,
 			"bbox_y_min": -3.0,
-			"bbox_z_max": 2.5,
-			"bbox_z_min": 0.0,
+			"bbox_z_max": 3.5,
+			"bbox_z_min": 2.0,
 			"cudaDevice": 1
 		},
 		"rs": {
@@ -507,6 +507,34 @@
 		"stream": {}
 	},
 
+	"reconstruction_snap10": {
+		"net": {
+			"peers": [],
+			"listen": "tcp://*:9002"
+		},
+		"sources": [
+			{"uri":"file:///home/nick/Pictures/FTL/snaptest10.tar.gz#0", "index": "camera0"},
+			{"uri":"file:///home/nick/Pictures/FTL/snaptest10.tar.gz#1", "index": "camera1"},
+			{"uri":"file:///home/nick/Pictures/FTL/snaptest10.tar.gz#2", "index": "camera2"},
+			{"uri":"file:///home/nick/Pictures/FTL/snaptest10.tar.gz#3", "index": "camera3"},
+			{"uri":"file:///home/nick/Pictures/FTL/snaptest10.tar.gz#4", "index": "camera4"}
+		],
+		"display": { "$ref": "#displays/left" },
+		"virtual": { "$ref": "#virtual_cams/default" },
+		"voxelhash": { "$ref": "#hash_conf/default" },
+		"merge": {
+			"$id": "ftl://blah/blah",
+			"targetsource" : "ftl://utu.fi/node3#vision_default/source",
+			"register": false,
+			"chain": false,
+			"maxerror": 100,
+			"iterations" : 10,
+			"delay" : 500,
+			"patternsize" : [9, 6]
+		},
+		"stream": {}
+	},
+
 	"reconstruction_lab": {
 		"net": {
 			"peers": ["tcp://ftl-node-4:9001",