From 441a703f7ae1d88e747c640437986b5a061104c7 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sun, 9 Jun 2019 21:11:04 +0300
Subject: [PATCH] Update config
---
applications/reconstruct/src/main.cpp | 2 +-
config/config.jsonc | 49 ++++++++++++++-------------
2 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/applications/reconstruct/src/main.cpp b/applications/reconstruct/src/main.cpp
index 5ff41ebe4..72f0673ab 100644
--- a/applications/reconstruct/src/main.cpp
+++ b/applications/reconstruct/src/main.cpp
@@ -76,7 +76,7 @@ static void run(ftl::Configurable *root) {
Universe *net = ftl::create<Universe>(root, "net");
net->start();
- //net->waitConnections();
+ net->waitConnections();
std::vector<Cameras> inputs;
auto sources = ftl::createArray<Source>(root, "sources", net); //root->get<vector<json_t>>("sources");
diff --git a/config/config.jsonc b/config/config.jsonc
index af02d3684..a9ea3321a 100644
--- a/config/config.jsonc
+++ b/config/config.jsonc
@@ -37,7 +37,7 @@
},
"sources": {
"stereocam": {
- "type": "stereovideo",
+ "uri": "",
"feed": {
"flip": false,
"nostereo": false,
@@ -94,18 +94,20 @@
},
"virtual_cams": {
"default": {
- "hash_renderer": true,
- "SDFRayIncrementFactor": 0.8,
- "SDFTruncation": 0.1,
- "SDFRayThresSampleDistFactor": 50.5,
- "SDFRayThresDistFactor": 50.0,
- "focal": 400,
- "width": 640,
- "height": 480,
- "max_depth": 10.0,
- "min_depth": 0.1,
- "SDFUseGradients": false,
- "uri": "ftl://utu.fi/virt1/rgb-d"
+ "raycaster": {
+ "hash_renderer": true,
+ "SDFRayIncrementFactor": 0.5,
+ "SDFTruncation": 0.1,
+ "SDFRayThresSampleDistFactor": 50.5,
+ "SDFRayThresDistFactor": 50.0,
+ "focal": 400,
+ "width": 640,
+ "height": 480,
+ "max_depth": 10.0,
+ "min_depth": 0.1,
+ "SDFUseGradients": false
+ },
+ "uri": "device:virtual"
}
},
"hash_conf": {
@@ -141,12 +143,13 @@
"reconstruction_default": {
"net": {
- "peers": ["tcp://localhost:9001"]
+ "peers": ["tcp://localhost:9001"],
+ "listen": "tcp://*:9002"
},
"sources": [
- {"type": "net", "uri":"ftl://utu.fi#vision_default/source"}
+ {"uri":"ftl://utu.fi#vision_default/source"}
],
- "display": { "$ref": "#displays/left" },
+ "display": { "$ref": "#displays/none" },
"virtual": { "$ref": "#virtual_cams/default" },
"voxelhash": { "$ref": "#hash_conf/default" },
"merge": {
@@ -164,10 +167,10 @@
"peers": ["tcp://ftl-node-4:9001", "tcp://ftl-node-5:9001"]
},
"sources": [
- {"type": "net", "uri":"ftl://utu.fi/node4#vision_default/source"},
- {"type": "net", "uri":"ftl://utu.fi/node5#vision_default/source"}
+ {"uri":"ftl://utu.fi/node4#vision_default/source"},
+ {"uri":"ftl://utu.fi/node5#vision_default/source"}
],
- "display": { "$ref": "#displays/left" },
+ "display": { "$ref": "#displays/none" },
"virtual": { "$ref": "#virtual_cams/default" },
"voxelhash": { "$ref": "#hash_conf/default" },
"merge": {
@@ -187,20 +190,20 @@
"net": {
"peers": ["tcp://ftl-node-5:9001"]
},
- "sources": [{"type": "net", "uri": "ftl://utu.fi/node5#vision_default/source"}]
+ "source": {"uri": "ftl://utu.fi/node5#vision_default/source"}
},
"gui_node4": {
"net": {
"peers": ["tcp://ftl-node-4:9001"]
},
- "sources": [{"type": "net", "uri": "ftl://utu.fi/node4#vision_default/source"}]
+ "source": {"uri": "ftl://utu.fi/node4#vision_default/source"}
},
"gui_default": {
"net": {
- "peers": ["tcp://localhost:9001"]
+ "peers": ["tcp://localhost:9001", "tcp://localhost:9002"]
},
- "sources": [{"type": "net", "uri": "ftl://utu.fi#vision_default/source"}]
+ "source": {"uri": "ftl://utu.fi#vision_default/source"}
}
}
--
GitLab