diff --git a/Makefile b/Makefile deleted file mode 100644 index 2815fd5a20351e7eff97b29f12171671cf6b5ca3..0000000000000000000000000000000000000000 --- a/Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -API_PATH=../ar_sandbox_lib -CFLAGS=-std=c++11 -Wall -Wextra -g -CCP=g++ - -all: - $(MAKE) -C apps - -run: - $(MAKE) run -C apps - -setup: - $(API_PATH)/app/SandboxSetup/SandboxSetup - -clean: - $(MAKE) clean -C apps diff --git a/beamer_config.sh b/beamer_config.sh index 4636773b4bef4b41009961a4375e84fdbbea9d1c..fd8f1117ab8c4a0cb0c5d38fb611bdb4c6502987 100755 --- a/beamer_config.sh +++ b/beamer_config.sh @@ -1,8 +1,8 @@ SCREEN=DVI-D-0 SCN_RES=1920x1080 BEAMER=HDMI-0 -#BM_RES=1400x1050 -BM_RES=1024x768 +BM_RES=1400x1050 +#BM_RES=1024x768 xrandr --output $SCREEN --rate 60 --mode $SCN_RES --fb $SCN_RES --panning $SCN_RES* \ diff --git a/display_levels/display_levels.cpp b/display_levels/display_levels.cpp index b0c657984d1b091d54d1635065e3be69b80f74fa..a4343d26afc0c995b6d3d9950e02e16f3480e57d 100644 --- a/display_levels/display_levels.cpp +++ b/display_levels/display_levels.cpp @@ -40,8 +40,6 @@ void displayLevels(Sandbox &sandbox, float top, float height){ cv::Mat1f new_depth = cv::Mat(depth_cache.size(), CV_32F); cv::Mat3b colorized = cv::Mat(depth_cache.size(), CV_8UC3); cv::Mat3b res = cv::Mat(depth_cache.size(), CV_8UC3); - - cv::Mat_<cv::Vec3b> img = cv::imread("index.png"); do{ sandbox.captureFrame(); @@ -52,9 +50,9 @@ void displayLevels(Sandbox &sandbox, float top, float height){ new_depth.copyTo( depth_cache, (cv::abs(depth_cache-new_depth) > DEPTH_MARGIN_ERROR/2) ); colorized = colorizeDepth(depth_cache, top, height); - res = sandbox.adjustProjection(img, depth_cache); + res = sandbox.adjustProjection(colorized, depth_cache); - //cv::cvtColor(res, res, CV_RGB2BGR); + cv::cvtColor(res, res, CV_RGB2BGR); cv::imshow(windowName, res); } while (cv::waitKey(10) != ESCAPE_CHAR);