Un-nest the app/ dir, now that there's no fem/app divide.

khiner · Oct 16, 2023 · 139b1c7 · 139b1c7
1 parent d1c72fe
commit 139b1c7
Show file tree

Hide file tree

Showing 103 changed files with 35 additions and 213 deletions.
diff --git a/app/.clang-format → .clang-format b/app/.clang-format → .clang-format
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,3 @@
 build*
 .vscode/
 .DS_Store
-
-fem/src/*.mod
-fem/src/*.o
-fem/*.mod
-fem/*.o
-fem/test.mesh
-fem/p
-fem/*.out
diff --git a/.gitmodules b/.gitmodules
@@ -1,54 +1,54 @@
-[submodule "app/lib/imgui"]
-	path = app/lib/imgui
+[submodule "lib/imgui"]
+	path = lib/imgui
 	url = [email protected]:ocornut/imgui.git
 	branch = docking
-[submodule "app/lib/SDL"]
-	path = app/lib/SDL
+[submodule "lib/SDL"]
+	path = lib/SDL
 	url = [email protected]:libsdl-org/SDL.git
-[submodule "app/lib/implot"]
-	path = app/lib/implot
+[submodule "lib/implot"]
+	path = lib/implot
 	url = [email protected]:epezent/implot.git
-[submodule "app/lib/glm"]
-	path = app/lib/glm
+[submodule "lib/glm"]
+	path = lib/glm
 	url = [email protected]:g-truc/glm.git
-[submodule "app/lib/nativefiledialog"]
-	path = app/lib/nativefiledialog
+[submodule "lib/nativefiledialog"]
+	path = lib/nativefiledialog
 	url = [email protected]:btzy/nativefiledialog-extended.git
-[submodule "app/lib/faust"]
-	path = app/lib/faust
+[submodule "lib/faust"]
+	path = lib/faust
 	url = [email protected]:grame-cncm/faust.git
 	branch = master-dev
-[submodule "app/lib/miniaudio"]
-	path = app/lib/miniaudio
+[submodule "lib/miniaudio"]
+	path = lib/miniaudio
 	url = [email protected]:mackron/miniaudio.git
-[submodule "app/lib/ImGuizmo"]
-	path = app/lib/ImGuizmo
+[submodule "lib/ImGuizmo"]
+	path = lib/ImGuizmo
 	url = [email protected]:CedricGuillemet/ImGuizmo.git
-[submodule "app/lib/nanosvg"]
-	path = app/lib/nanosvg
+[submodule "lib/nanosvg"]
+	path = lib/nanosvg
 	url = [email protected]:memononen/nanosvg.git
-[submodule "app/lib/imspinner"]
-	path = app/lib/imspinner
+[submodule "lib/imspinner"]
+	path = lib/imspinner
 	url = [email protected]:dalerank/imspinner.git
-[submodule "app/lib/date"]
-	path = app/lib/date
+[submodule "lib/date"]
+	path = lib/date
 	url = [email protected]:HowardHinnant/date.git
-[submodule "app/lib/libnpy"]
-	path = app/lib/libnpy
+[submodule "lib/libnpy"]
+	path = lib/libnpy
 	url = [email protected]:llohse/libnpy.git
-[submodule "app/app/lib/libnpy"]
-	path = app/app/lib/libnpy
+[submodule "lib/libnpy"]
+	path = lib/libnpy
 	url = [email protected]:llohse/libnpy.git
-[submodule "app/lib/tetgen"]
-	path = app/lib/tetgen
+[submodule "lib/tetgen"]
+	path = lib/tetgen
 	url = [email protected]:libigl/tetgen.git
-[submodule "app/lib/reactphysics3d"]
-	path = app/lib/reactphysics3d
+[submodule "lib/reactphysics3d"]
+	path = lib/reactphysics3d
 	url = [email protected]:DanielChappuis/reactphysics3d.git
 	branch = develop
-[submodule "app/lib/quickhull"]
-	path = app/lib/quickhull
+[submodule "lib/quickhull"]
+	path = lib/quickhull
 	url = [email protected]:akuukka/quickhull.git
-[submodule "app/lib/OpenMesh"]
-	path = app/lib/OpenMesh
+[submodule "lib/OpenMesh"]
+	path = lib/OpenMesh
 	url = https://gitlab.vci.rwth-aachen.de:9000/OpenMesh/OpenMesh.git
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/app/CMakeLists.txt → CMakeLists.txt b/app/CMakeLists.txt → CMakeLists.txt
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ $ sudo apt install build-essential libgtk-3-dev libglu1-mesa-dev freeglut3-dev m
 
 ```shell
 $ git clone --recurse-submodules [email protected]:GATech-CSE-6730-Spring-2023-Project/mesh2audio.git
-$ cd mesh2audio/app
+$ cd mesh2audio
 ```
 
 - **Clean:**

diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/.vscode/launch.json b/app/.vscode/launch.json
diff --git a/app/.vscode/settings.json b/app/.vscode/settings.json
diff --git a/app/script/Build b/app/script/Build
diff --git a/app/lib/CMakeLists.txt → lib/CMakeLists.txt b/app/lib/CMakeLists.txt → lib/CMakeLists.txt
diff --git a/app/lib/ImGuizmo → lib/ImGuizmo b/app/lib/ImGuizmo → lib/ImGuizmo
diff --git a/app/lib/OpenMesh → lib/OpenMesh b/app/lib/OpenMesh → lib/OpenMesh
diff --git a/app/lib/SDL → lib/SDL b/app/lib/SDL → lib/SDL
diff --git a/app/lib/date → lib/date b/app/lib/date → lib/date
diff --git a/app/lib/faust → lib/faust b/app/lib/faust → lib/faust
diff --git a/app/lib/glm → lib/glm b/app/lib/glm → lib/glm
diff --git a/app/lib/imgui → lib/imgui b/app/lib/imgui → lib/imgui
diff --git a/app/lib/implot → lib/implot b/app/lib/implot → lib/implot
diff --git a/app/lib/imspinner → lib/imspinner b/app/lib/imspinner → lib/imspinner
diff --git a/app/lib/libnpy → lib/libnpy b/app/lib/libnpy → lib/libnpy
diff --git a/app/lib/miniaudio → lib/miniaudio b/app/lib/miniaudio → lib/miniaudio
diff --git a/app/lib/nanosvg → lib/nanosvg b/app/lib/nanosvg → lib/nanosvg
diff --git a/app/lib/nativefiledialog → lib/nativefiledialog b/app/lib/nativefiledialog → lib/nativefiledialog
diff --git a/app/lib/quickhull → lib/quickhull b/app/lib/quickhull → lib/quickhull
diff --git a/app/lib/reactphysics3d → lib/reactphysics3d b/app/lib/reactphysics3d → lib/reactphysics3d
diff --git a/app/lib/tetgen → lib/tetgen b/app/lib/tetgen → lib/tetgen
diff --git a/app/res/obj/airboat.obj → res/obj/airboat.obj b/app/res/obj/airboat.obj → res/obj/airboat.obj
diff --git a/app/res/obj/al.obj → res/obj/al.obj b/app/res/obj/al.obj → res/obj/al.obj
diff --git a/app/res/obj/bell/carillon.obj → res/obj/bell/carillon.obj b/app/res/obj/bell/carillon.obj → res/obj/bell/carillon.obj
diff --git a/app/res/obj/bell/church.obj → res/obj/bell/church.obj b/app/res/obj/bell/church.obj → res/obj/bell/church.obj
diff --git a/app/res/obj/bell/english.obj → res/obj/bell/english.obj b/app/res/obj/bell/english.obj → res/obj/bell/english.obj
diff --git a/app/res/obj/bell/french.obj → res/obj/bell/french.obj b/app/res/obj/bell/french.obj → res/obj/bell/french.obj
diff --git a/app/res/obj/bell/german.obj → res/obj/bell/german.obj b/app/res/obj/bell/german.obj → res/obj/bell/german.obj
diff --git a/app/res/obj/bell/russian.obj → res/obj/bell/russian.obj b/app/res/obj/bell/russian.obj → res/obj/bell/russian.obj
diff --git a/app/res/obj/bell/std.obj → res/obj/bell/std.obj b/app/res/obj/bell/std.obj → res/obj/bell/std.obj
diff --git a/app/res/obj/bunny.obj → res/obj/bunny.obj b/app/res/obj/bunny.obj → res/obj/bunny.obj
diff --git a/app/res/obj/car.obj → res/obj/car.obj b/app/res/obj/car.obj → res/obj/car.obj
diff --git a/app/res/obj/ico.obj → res/obj/ico.obj b/app/res/obj/ico.obj → res/obj/ico.obj
diff --git a/app/res/obj/lamp.obj → res/obj/lamp.obj b/app/res/obj/lamp.obj → res/obj/lamp.obj
diff --git a/app/res/obj/sandal.obj → res/obj/sandal.obj b/app/res/obj/sandal.obj → res/obj/sandal.obj
diff --git a/app/res/obj/shuttle.obj → res/obj/shuttle.obj b/app/res/obj/shuttle.obj → res/obj/shuttle.obj
diff --git a/app/res/obj/slot.obj → res/obj/slot.obj b/app/res/obj/slot.obj → res/obj/slot.obj
diff --git a/app/res/obj/teapot.obj → res/obj/teapot.obj b/app/res/obj/teapot.obj → res/obj/teapot.obj
diff --git a/app/res/obj/teddy.obj → res/obj/teddy.obj b/app/res/obj/teddy.obj → res/obj/teddy.obj
diff --git a/app/res/shaders/fragment.glsl → res/shaders/fragment.glsl b/app/res/shaders/fragment.glsl → res/shaders/fragment.glsl
diff --git a/app/res/shaders/grid_lines_fragment.glsl → res/shaders/grid_lines_fragment.glsl b/app/res/shaders/grid_lines_fragment.glsl → res/shaders/grid_lines_fragment.glsl
diff --git a/app/res/shaders/grid_lines_vertex.glsl → res/shaders/grid_lines_vertex.glsl b/app/res/shaders/grid_lines_vertex.glsl → res/shaders/grid_lines_vertex.glsl
diff --git a/app/res/shaders/lines_geom.glsl → res/shaders/lines_geom.glsl b/app/res/shaders/lines_geom.glsl → res/shaders/lines_geom.glsl
diff --git a/app/res/shaders/transform_vertex.glsl → res/shaders/transform_vertex.glsl b/app/res/shaders/transform_vertex.glsl → res/shaders/transform_vertex.glsl
diff --git a/app/res/shaders/transform_vertex_lines.glsl → res/shaders/transform_vertex_lines.glsl b/app/res/shaders/transform_vertex_lines.glsl → res/shaders/transform_vertex_lines.glsl
diff --git a/app/res/svg/bell/carillon.svg → res/svg/bell/carillon.svg b/app/res/svg/bell/carillon.svg → res/svg/bell/carillon.svg
diff --git a/app/res/svg/bell/church.svg → res/svg/bell/church.svg b/app/res/svg/bell/church.svg → res/svg/bell/church.svg
diff --git a/app/res/svg/bell/english.svg → res/svg/bell/english.svg b/app/res/svg/bell/english.svg → res/svg/bell/english.svg
diff --git a/app/res/svg/bell/french.svg → res/svg/bell/french.svg b/app/res/svg/bell/french.svg → res/svg/bell/french.svg
diff --git a/app/res/svg/bell/german.svg → res/svg/bell/german.svg b/app/res/svg/bell/german.svg → res/svg/bell/german.svg
diff --git a/app/res/svg/bell/russian.svg → res/svg/bell/russian.svg b/app/res/svg/bell/russian.svg → res/svg/bell/russian.svg
diff --git a/app/res/svg/bell/std.svg → res/svg/bell/std.svg b/app/res/svg/bell/std.svg → res/svg/bell/std.svg
diff --git a/app/res/svg/rect.svg → res/svg/rect.svg b/app/res/svg/rect.svg → res/svg/rect.svg
diff --git a/app/res/svg/wine_glass.svg → res/svg/wine_glass.svg b/app/res/svg/wine_glass.svg → res/svg/wine_glass.svg
diff --git a/app/script/Clean → script/Clean b/app/script/Clean → script/Clean
diff --git a/app/src/Audio.cpp → src/Audio.cpp b/app/src/Audio.cpp → src/Audio.cpp
diff --git a/app/src/Audio.h → src/Audio.h b/app/src/Audio.h → src/Audio.h
diff --git a/app/src/FaustParams.cpp → src/FaustParams.cpp b/app/src/FaustParams.cpp → src/FaustParams.cpp
diff --git a/app/src/FaustParams.h → src/FaustParams.h b/app/src/FaustParams.h → src/FaustParams.h
diff --git a/app/src/GLCanvas.cpp → src/GLCanvas.cpp b/app/src/GLCanvas.cpp → src/GLCanvas.cpp
diff --git a/app/src/GLCanvas.h → src/GLCanvas.h b/app/src/GLCanvas.h → src/GLCanvas.h
diff --git a/app/src/Geometry/Arrow.cpp → src/Geometry/Arrow.cpp b/app/src/Geometry/Arrow.cpp → src/Geometry/Arrow.cpp
diff --git a/app/src/Geometry/Arrow.h → src/Geometry/Arrow.h b/app/src/Geometry/Arrow.h → src/Geometry/Arrow.h
diff --git a/app/src/Geometry/ConvexHull.cpp → src/Geometry/ConvexHull.cpp b/app/src/Geometry/ConvexHull.cpp → src/Geometry/ConvexHull.cpp
diff --git a/app/src/Geometry/ConvexHull.h → src/Geometry/ConvexHull.h b/app/src/Geometry/ConvexHull.h → src/Geometry/ConvexHull.h
diff --git a/app/src/Geometry/Geometry.cpp → src/Geometry/Geometry.cpp b/app/src/Geometry/Geometry.cpp → src/Geometry/Geometry.cpp
diff --git a/app/src/Geometry/Geometry.h → src/Geometry/Geometry.h b/app/src/Geometry/Geometry.h → src/Geometry/Geometry.h
diff --git a/app/src/Geometry/MeshBuffers.cpp → src/Geometry/MeshBuffers.cpp b/app/src/Geometry/MeshBuffers.cpp → src/Geometry/MeshBuffers.cpp
diff --git a/app/src/Geometry/MeshBuffers.h → src/Geometry/MeshBuffers.h b/app/src/Geometry/MeshBuffers.h → src/Geometry/MeshBuffers.h
diff --git a/app/src/Geometry/Primitive/Cuboid.cpp → src/Geometry/Primitive/Cuboid.cpp b/app/src/Geometry/Primitive/Cuboid.cpp → src/Geometry/Primitive/Cuboid.cpp
diff --git a/app/src/Geometry/Primitive/Cuboid.h → src/Geometry/Primitive/Cuboid.h b/app/src/Geometry/Primitive/Cuboid.h → src/Geometry/Primitive/Cuboid.h
diff --git a/app/src/Geometry/Primitive/Rect.cpp → src/Geometry/Primitive/Rect.cpp b/app/src/Geometry/Primitive/Rect.cpp → src/Geometry/Primitive/Rect.cpp
diff --git a/app/src/Geometry/Primitive/Rect.h → src/Geometry/Primitive/Rect.h b/app/src/Geometry/Primitive/Rect.h → src/Geometry/Primitive/Rect.h
diff --git a/app/src/Geometry/Primitive/Sphere.cpp → src/Geometry/Primitive/Sphere.cpp b/app/src/Geometry/Primitive/Sphere.cpp → src/Geometry/Primitive/Sphere.cpp
diff --git a/app/src/Geometry/Primitive/Sphere.h → src/Geometry/Primitive/Sphere.h b/app/src/Geometry/Primitive/Sphere.h → src/Geometry/Primitive/Sphere.h
diff --git a/app/src/Material.cpp → src/Material.cpp b/app/src/Material.cpp → src/Material.cpp
diff --git a/app/src/Material.h → src/Material.h b/app/src/Material.h → src/Material.h
diff --git a/app/src/Mesh/InteractiveMesh.cpp → src/Mesh/InteractiveMesh.cpp b/app/src/Mesh/InteractiveMesh.cpp → src/Mesh/InteractiveMesh.cpp
diff --git a/app/src/Mesh/InteractiveMesh.h → src/Mesh/InteractiveMesh.h b/app/src/Mesh/InteractiveMesh.h → src/Mesh/InteractiveMesh.h
diff --git a/app/src/Mesh/Mesh.cpp → src/Mesh/Mesh.cpp b/app/src/Mesh/Mesh.cpp → src/Mesh/Mesh.cpp
diff --git a/app/src/Mesh/Mesh.h → src/Mesh/Mesh.h b/app/src/Mesh/Mesh.h → src/Mesh/Mesh.h
diff --git a/app/src/Mesh/MeshProfile.cpp → src/Mesh/MeshProfile.cpp b/app/src/Mesh/MeshProfile.cpp → src/Mesh/MeshProfile.cpp
diff --git a/app/src/Mesh/MeshProfile.h → src/Mesh/MeshProfile.h b/app/src/Mesh/MeshProfile.h → src/Mesh/MeshProfile.h
diff --git a/app/src/Physics.cpp → src/Physics.cpp b/app/src/Physics.cpp → src/Physics.cpp
diff --git a/app/src/Physics.h → src/Physics.h b/app/src/Physics.h → src/Physics.h
diff --git a/app/src/RealImpact.cpp → src/RealImpact.cpp b/app/src/RealImpact.cpp → src/RealImpact.cpp
diff --git a/app/src/RealImpact.h → src/RealImpact.h b/app/src/RealImpact.h → src/RealImpact.h
diff --git a/app/src/Scene.cpp → src/Scene.cpp b/app/src/Scene.cpp → src/Scene.cpp
diff --git a/app/src/Scene.h → src/Scene.h b/app/src/Scene.h → src/Scene.h
diff --git a/app/src/Shader/Shader.cpp → src/Shader/Shader.cpp b/app/src/Shader/Shader.cpp → src/Shader/Shader.cpp
diff --git a/app/src/Shader/Shader.h → src/Shader/Shader.h b/app/src/Shader/Shader.h → src/Shader/Shader.h
diff --git a/app/src/Shader/ShaderProgram.cpp → src/Shader/ShaderProgram.cpp b/app/src/Shader/ShaderProgram.cpp → src/Shader/ShaderProgram.cpp
diff --git a/app/src/Shader/ShaderProgram.h → src/Shader/ShaderProgram.h b/app/src/Shader/ShaderProgram.h → src/Shader/ShaderProgram.h
diff --git a/app/src/Window.h → src/Window.h b/app/src/Window.h → src/Window.h
diff --git a/app/src/Worker.cpp → src/Worker.cpp b/app/src/Worker.cpp → src/Worker.cpp
diff --git a/app/src/Worker.h → src/Worker.h b/app/src/Worker.h → src/Worker.h
diff --git a/app/src/main.cpp → src/main.cpp b/app/src/main.cpp → src/main.cpp