From 34b1a31704e9af993b16e7e49e7ba606c2596429 Mon Sep 17 00:00:00 2001 From: David Allemang Date: Sun, 13 Feb 2022 13:02:26 -0500 Subject: [PATCH] Create source tree --- CMakeLists.txt | 6 ++++-- meshlib.hpp => include/ml/meshlib.hpp | 11 ----------- gldebug.hpp => src/gldebug.hpp | 0 src/main.cpp | 4 ++-- src/serialtest.cpp | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) rename meshlib.hpp => include/ml/meshlib.hpp (86%) rename gldebug.hpp => src/gldebug.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5b9818..33fbe53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,10 @@ include(External/eigen.cmake) include(External/glad.cmake) include(External/json.cmake) -add_executable(vis main.cpp) +include_directories(./include) + +add_executable(vis src/main.cpp) target_link_libraries(vis glfw glad imgui eigen nlohmann_json) -add_executable(serial serialtest.cpp) +add_executable(serial src/serialtest.cpp) target_link_libraries(serial eigen nlohmann_json) diff --git a/meshlib.hpp b/include/ml/meshlib.hpp similarity index 86% rename from meshlib.hpp rename to include/ml/meshlib.hpp index 4f6724b..ff71147 100644 --- a/meshlib.hpp +++ b/include/ml/meshlib.hpp @@ -83,15 +83,4 @@ namespace ml { return out; } }; - -// class CubeMesh : public MeshBase { -// public: -// const Eigen::MatrixBase &points() const override { -// return PointsType::Random(3, 8); -// } -// -// const Eigen::MatrixBase &cells() const override { -// return <#initializer#>; -// } -// }; } diff --git a/gldebug.hpp b/src/gldebug.hpp similarity index 100% rename from gldebug.hpp rename to src/gldebug.hpp diff --git a/src/main.cpp b/src/main.cpp index de1da54..221a9d8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,8 +8,8 @@ #include "gldebug.hpp" -#include "meshlib.hpp" -#include "meshlib_json.hpp" +#include +#include struct State { float bg[4] = {0.45f, 0.55f, 0.60f, 1.00f}; diff --git a/src/serialtest.cpp b/src/serialtest.cpp index 7b65e18..514b4f7 100644 --- a/src/serialtest.cpp +++ b/src/serialtest.cpp @@ -3,8 +3,8 @@ #include #include -#include "meshlib.hpp" -#include "meshlib_json.hpp" +#include +#include class Circle : public ml::MeshBase { public: