From 02902f46a22e7f6657a3423878ee525a9abf84e5 Mon Sep 17 00:00:00 2001
From: "simon.fanetti" <simon.fanetti@etu.hesge.ch>
Date: Wed, 25 Mar 2020 11:13:06 +0100
Subject: [PATCH] rename subdir

---
 .export.sh.swp                             | Bin 0 -> 12288 bytes
 export.sh                                  |   7 ++++++-
 includes/camera.h                          |   6 +++---
 src/Makefile                               |   4 ++--
 src/{lib => core}/Makefile                 |   0
 src/{lib => core}/components/Makefile      |   0
 src/{lib => core}/components/beamer.cpp    |   0
 src/{lib => core}/components/calibrate.cpp |   0
 src/{lib => core}/components/camera.cpp    |   0
 src/{lib => core}/controller.cpp           |   0
 src/{lib => core}/tools/Makefile           |   0
 src/{lib => core}/tools/borderedit.cpp     |   0
 src/{lib => core}/tools/borderfinder.cpp   |   0
 src/{lib => core}/tools/log.c              |   0
 14 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 .export.sh.swp
 rename src/{lib => core}/Makefile (100%)
 rename src/{lib => core}/components/Makefile (100%)
 rename src/{lib => core}/components/beamer.cpp (100%)
 rename src/{lib => core}/components/calibrate.cpp (100%)
 rename src/{lib => core}/components/camera.cpp (100%)
 rename src/{lib => core}/controller.cpp (100%)
 rename src/{lib => core}/tools/Makefile (100%)
 rename src/{lib => core}/tools/borderedit.cpp (100%)
 rename src/{lib => core}/tools/borderfinder.cpp (100%)
 rename src/{lib => core}/tools/log.c (100%)

diff --git a/.export.sh.swp b/.export.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..945b1e361770b3cc3bd6ba068d9e9996727fd8d6
GIT binary patch
literal 12288
zcmYc?2=nw+u+TGLU|?VnU|{gsSsZtYLxW+pDg#4tW^R5SNSpu$tJ8HiHS-F>tFjKP
zP~WMvC^fNEKO?muGf}^wC_gK;Bt9uIIU_YEzeqo^D84u`FC{6zB0eWGNk6rsAit<Y
zuQ&s*!K0F+Aut*O_(PzyBu&?XH`Lh35S-POl@t|(g+lS`8I>Ikfzc2c4S~@R7!85Z
z5Eu=C(GVC7fzc2cRv}PQz{pU~z`(!+^%XOeW<;Z*+)-*Y1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E0qLtqGoKw=65!w!B1h6ntR`F~jd|35zi!#}9_6_DHz^xLSD
zM?+vV1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU|5GhDiQ!MpjYs5iTCkz3UUmJ
Uj1O=O@vv3VC@4?SWME(b05TdpqW}N^

literal 0
HcmV?d00001

diff --git a/export.sh b/export.sh
index 218b4d4..9798966 100644
--- a/export.sh
+++ b/export.sh
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=$(pwd)
+## Unsable script for now
+## LD_LIBRARY_PATH must contains dir's path to libsandbox.so
+## Do the cmd in your terminal
+
+REALTIVE_PATH_TO_SO=../ar_sandbox_lib && \
+export LD_LIBRARY_PATH=$(pwd)/$REALTIVE_PATH_TO_SO
diff --git a/includes/camera.h b/includes/camera.h
index 2e29fa1..65ed09e 100644
--- a/includes/camera.h
+++ b/includes/camera.h
@@ -10,9 +10,9 @@ class Camera
 private:
     //constants in mm
     //const float scale = rs2_get_depth_scale(sensor, NULL);
-    static const int maxHeightSand = 400;
-    static const int maxZ = 1120;
-    static const int minZ = maxZ - maxHeightSand;
+    //static const int maxHeightSand = 400;
+    //static const int maxZ = 1120;
+    //static const int minZ = maxZ - maxHeightSand;
 
     rs2::spatial_filter spatFilter;
     rs2::temporal_filter tempFilter;
diff --git a/src/Makefile b/src/Makefile
index 6347fd1..7a03607 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ SRCS:=$(wildcard *.cpp)
 OBJS:=$(SRCS:%.cpp=%.o)
 
 all:
-	$(MAKE) -C lib
+	$(MAKE) -C core
 	$(MAKE) build -C .
 
 build: $(OBJS)
@@ -14,4 +14,4 @@ build: $(OBJS)
 
 clean:
 	-rm -f *.o
-	$(MAKE) clean -C lib
+	$(MAKE) clean -C core
diff --git a/src/lib/Makefile b/src/core/Makefile
similarity index 100%
rename from src/lib/Makefile
rename to src/core/Makefile
diff --git a/src/lib/components/Makefile b/src/core/components/Makefile
similarity index 100%
rename from src/lib/components/Makefile
rename to src/core/components/Makefile
diff --git a/src/lib/components/beamer.cpp b/src/core/components/beamer.cpp
similarity index 100%
rename from src/lib/components/beamer.cpp
rename to src/core/components/beamer.cpp
diff --git a/src/lib/components/calibrate.cpp b/src/core/components/calibrate.cpp
similarity index 100%
rename from src/lib/components/calibrate.cpp
rename to src/core/components/calibrate.cpp
diff --git a/src/lib/components/camera.cpp b/src/core/components/camera.cpp
similarity index 100%
rename from src/lib/components/camera.cpp
rename to src/core/components/camera.cpp
diff --git a/src/lib/controller.cpp b/src/core/controller.cpp
similarity index 100%
rename from src/lib/controller.cpp
rename to src/core/controller.cpp
diff --git a/src/lib/tools/Makefile b/src/core/tools/Makefile
similarity index 100%
rename from src/lib/tools/Makefile
rename to src/core/tools/Makefile
diff --git a/src/lib/tools/borderedit.cpp b/src/core/tools/borderedit.cpp
similarity index 100%
rename from src/lib/tools/borderedit.cpp
rename to src/core/tools/borderedit.cpp
diff --git a/src/lib/tools/borderfinder.cpp b/src/core/tools/borderfinder.cpp
similarity index 100%
rename from src/lib/tools/borderfinder.cpp
rename to src/core/tools/borderfinder.cpp
diff --git a/src/lib/tools/log.c b/src/core/tools/log.c
similarity index 100%
rename from src/lib/tools/log.c
rename to src/core/tools/log.c
-- 
GitLab