diff --git a/applications/gui/CMakeLists.txt b/applications/gui/CMakeLists.txt index baffb9bdd645c85cbfc593d81e14687965b9bf4c..ce12244c67ee0e5ddff94dd3d178ed6aa4eef351 100644 --- a/applications/gui/CMakeLists.txt +++ b/applications/gui/CMakeLists.txt @@ -27,6 +27,6 @@ target_include_directories(ftl-gui PUBLIC #endif() #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_link_libraries(ftl-gui ftlcommon ftlctrl ftlrgbd Threads::Threads ${OpenCV_LIBS} glog::glog ftlnet ftlrender nanogui GL) +target_link_libraries(ftl-gui ftlcommon ftlctrl ftlrgbd Threads::Threads ${OpenCV_LIBS} glog::glog ftlnet nanogui GL) diff --git a/applications/reconstruct/CMakeLists.txt b/applications/reconstruct/CMakeLists.txt index 1e55c671c87487b995b0dd772495ff8a612a8c78..376852843a588446365acfe380bf12580f60591c 100644 --- a/applications/reconstruct/CMakeLists.txt +++ b/applications/reconstruct/CMakeLists.txt @@ -38,6 +38,6 @@ set_property(TARGET ftl-reconstruct PROPERTY CUDA_SEPARABLE_COMPILATION ON) endif() #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_link_libraries(ftl-reconstruct ftlcommon ftlrgbd Threads::Threads ${OpenCV_LIBS} ftlctrl ftlnet ftlrender) +target_link_libraries(ftl-reconstruct ftlcommon ftlrgbd Threads::Threads ${OpenCV_LIBS} ftlctrl ftlnet) diff --git a/applications/vision/CMakeLists.txt b/applications/vision/CMakeLists.txt index 684b195b5a2a8605e9bc3e04e629d21a35dcd545..1753488f3407b74518efad555ecdd87be54ba1e9 100644 --- a/applications/vision/CMakeLists.txt +++ b/applications/vision/CMakeLists.txt @@ -21,6 +21,6 @@ set_property(TARGET ftl-vision PROPERTY CUDA_SEPARABLE_COMPILATION OFF) endif() #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include) -target_link_libraries(ftl-vision ftlrgbd ftlcommon ftlctrl ftlrender ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} ftlnet) +target_link_libraries(ftl-vision ftlrgbd ftlcommon ftlctrl ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} ftlnet) diff --git a/applications/vision/src/main.cpp b/applications/vision/src/main.cpp index 1ce6cb162c322d82a51988fe63a9256505283b12..ba07e90424db91c5cc36e18d0aa40a68109bddbd 100644 --- a/applications/vision/src/main.cpp +++ b/applications/vision/src/main.cpp @@ -19,7 +19,7 @@ #include <opencv2/opencv.hpp> #include <ftl/rgbd.hpp> #include <ftl/middlebury.hpp> -#include <ftl/display.hpp> +//#include <ftl/display.hpp> #include <ftl/rgbd/streamer.hpp> #include <ftl/net/universe.hpp> #include <ftl/slave.hpp> @@ -36,7 +36,7 @@ using ftl::rgbd::Source; using ftl::rgbd::Camera; -using ftl::Display; +//using ftl::Display; using ftl::rgbd::Streamer; using ftl::net::Universe; using std::string; @@ -87,7 +87,7 @@ static void run(ftl::Configurable *root) { if (file != "") source->set("uri", file); - Display *display = ftl::create<Display>(root, "display", "local"); + //Display *display = ftl::create<Display>(root, "display", "local"); Streamer *stream = ftl::create<Streamer>(root, "stream", net); stream->add(source); @@ -95,7 +95,7 @@ static void run(ftl::Configurable *root) { net->start(); LOG(INFO) << "Running..."; - if (display->hasDisplays()) { + /*if (display->hasDisplays()) { stream->run(); while (ftl::running && display->active()) { cv::Mat rgb, depth; @@ -103,9 +103,9 @@ static void run(ftl::Configurable *root) { if (!rgb.empty()) display->render(rgb, depth, source->parameters()); display->wait(10); } - } else { + } else {*/ stream->run(true); - } + //} LOG(INFO) << "Stopping..."; slave.stop(); @@ -115,7 +115,7 @@ static void run(ftl::Configurable *root) { ftl::pool.stop(); delete stream; - delete display; + //delete display; //delete source; // TODO(Nick) Add ftl::destroy delete net; }