Merge branch 'main' of https://github.com/ibois-epfl/augmented-carpentry

ibois-epfl · Aug 29, 2024 · 1cac995 · 1cac995
2 parents 04b7664 + 8d1b4ae
commit 1cac995
Show file tree

Hide file tree

Showing 79 changed files with 214,636 additions and 573 deletions.
diff --git a/.github/workflows/gh-build.yml b/.github/workflows/gh-build.yml
@@ -2,7 +2,7 @@ name: gh-build
 
 on:
     push:
-        branches: ["main"]
+        branches: ["main", "ac_replayer"]
     pull_request:
         branches: ["main"]
 

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,10 @@
 assets/tslam/*.map
 scanned_map
 
+## other assets
+py/expirment
+assets/replayer_example/TTool_dataset
+
 ## >>>>>>>>> vscode >>>>>>>>>
 
 # VScode config
@@ -351,4 +355,15 @@ examples/example_sdl2_sdlrenderer/example_sdl2_sdlrenderer
 config.ini
 
 # do not version the imgui.ini
-imgui.ini
+imgui.ini
+
+###############################################################
+# Automatically downloaded deps
+###############################################################
+
+deps/*-download
+deps/eventpp
+deps/freetype
+deps/imgui
+deps/pugixml
+deps/spdlog
diff --git a/.gitmodules b/.gitmodules
@@ -10,7 +10,3 @@
 	branch = main
 	path = deps/TTool
 	url = git@github.com:ibois-epfl/TTool.git
-[submodule "deps/eventpp"]
-	branch = main
-	path = deps/eventpp
-	url = git@github.com:ibois-epfl/eventpp.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(OpenGL_GL_PREFERENCE LEGACY)  # <-- temp fix: or GLVIND?
 find_package(OpenGL REQUIRED)
 
 set(BUILD_V4_API ON)
-add_external_package(TSlam)
+add_external_package(TSlam IGNORE_SYSTEM)
 add_external_package(TTool IGNORE_SYSTEM)
 
 find_package(glfw3 3.3 REQUIRED)

diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@
 </p>
 
 
+
 # Augmented Carpentry
 
 ```

diff --git a/assets/replayer_example/TTool_dataset/.gitkeep b/assets/replayer_example/TTool_dataset/.gitkeep
diff --git a/assets/replayer_example/example_replayer.gh b/assets/replayer_example/example_replayer.gh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		</p>



		# Augmented Carpentry

		```
Expand Down