cleaning

Makefile

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

beamer_config.sh

 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* \

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