Skip to content
Snippets Groups Projects
Commit 7370a5e2 authored by Philip Trettner's avatar Philip Trettner
Browse files

Merge branch 'feature/doctestToNexus' into 'develop'

Replace doctest with nexus and update dependencies

See merge request !17
parents 0a1b1692 37d3c5e4
No related branches found
No related tags found
1 merge request!17Replace doctest with nexus and update dependencies
Pipeline #23897 passed
Showing with 44 additions and 6013 deletions
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
url = https://graphics.rwth-aachen.de:9000/ptrettner/imgui-lean url = https://graphics.rwth-aachen.de:9000/ptrettner/imgui-lean
[submodule "polymesh"] [submodule "polymesh"]
path = extern/polymesh path = extern/polymesh
url = https://www.graphics.rwth-aachen.de:9000/ptrettner/polymesh.git url = https://github.com/project-arcana/polymesh.git
branch = develop branch = develop
[submodule "extern/assimp"] [submodule "extern/assimp"]
path = extern/assimp path = extern/assimp
...@@ -38,3 +38,12 @@ ...@@ -38,3 +38,12 @@
[submodule "extern/clean-core"] [submodule "extern/clean-core"]
path = extern/clean-core path = extern/clean-core
url = https://github.com/project-arcana/clean-core.git url = https://github.com/project-arcana/clean-core.git
[submodule "extern/nexus"]
path = extern/nexus
url = https://github.com/project-arcana/nexus.git
[submodule "extern/rich-log"]
path = extern/rich-log
url = https://github.com/project-arcana/rich-log.git
[submodule "extern/reflector"]
path = extern/reflector
url = https://github.com/project-arcana/reflector.git
...@@ -92,6 +92,15 @@ add_subdirectory(extern/polymesh) ...@@ -92,6 +92,15 @@ add_subdirectory(extern/polymesh)
# set(GLOW_EXTRAS_EMBED_SHADERS OFF) # set(GLOW_EXTRAS_EMBED_SHADERS OFF)
add_subdirectory(extern/glow-extras) add_subdirectory(extern/glow-extras)
# Add reflector
add_subdirectory(extern/reflector)
# Add rich-log for logging
add_subdirectory(extern/rich-log)
# Add nexus for tests
add_subdirectory(extern/nexus)
# OpenMP # OpenMP
find_package(OpenMP) find_package(OpenMP)
if (OPENMP_FOUND) if (OPENMP_FOUND)
...@@ -128,6 +137,9 @@ if (GLOW_SAMPLES_TESTS) ...@@ -128,6 +137,9 @@ if (GLOW_SAMPLES_TESTS)
polymesh polymesh
glow glow
glow-extras glow-extras
reflector
rich-log
nexus
) )
target_include_directories(glow-tests PUBLIC "tests") target_include_directories(glow-tests PUBLIC "tests")
......
AntTweakBar @ db81c916
Subproject commit ff1f8588a0e2a45fdb5f113d5d8a87775ceac3c7 Subproject commit db81c91694d5e23217d78cb1eb95d2fd17d5f268
Subproject commit b3602fb50a1a2bdc4be2e487e469d5a23946cd6c Subproject commit 4f0b6bf78a006db89b098cf80160b98e35f08b2e
Subproject commit dd8a678a66f1967372e5a5e3deac41ebf65ee127 Subproject commit 3eaf1255b29fdf5c2895856c7be7d7185ef2b241
Subproject commit 21a30e11164c6ffc1ec12811cf7ce82c9f3b2d1f Subproject commit 47585fde0c49fa77a2bf2fb1d2ead06999fd4b6e
glow @ 5c8b4f91
Subproject commit 6454151bd41eb2c7e1dfc079b90f27fc62be77d6 Subproject commit 5c8b4f9169a622117b22c42d2925cb4fc3be9358
glow-extras @ db76c806
Subproject commit 3ad42b0f2b1744bfab95500d86b1e93ae5ceb959 Subproject commit db76c806b3df01907bab47d0c6f4cef17332156a
Subproject commit 67d9890922fc75332f917bdded27a48bf47d592e
Subproject commit 77b5ad3b1454a0184fd91215982d88a150b65d98 Subproject commit 177f00c451942d7798d8985415f93d6f7e376e22
Subproject commit 54bd3917c8a53f9d34812df3cc620145ef5b8cd0
Subproject commit 5886d159d801960cea93a1c88017013a9ff6640e
Subproject commit abaaa145c9d0902397d5226235a64f321fa0b364 Subproject commit c5e3b1482a4d35cc3c7b4f4a5a61050dfee627eb
This diff is collapsed.
This diff is collapsed.
#include <doctest.hh> #include <nexus/test.hh>
#include <vector> #include <vector>
#include <array> #include <array>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <glow-extras/viewer/traits.hh> #include <glow-extras/viewer/traits.hh>
TEST_CASE("glow-viewer type traits should work with glm, tg, and others") TEST("glow-viewer type traits should work with glm, tg, and others")
{ {
using namespace glow::viewer::detail; using namespace glow::viewer::detail;
......
#include <doctest.hh> #include <nexus/test.hh>
#include <array> #include <array>
#include <vector> #include <vector>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
static constexpr bool dont_actually_show = true; static constexpr bool dont_actually_show = true;
TEST_CASE("view(...) for meshes") TEST("view(...) for meshes")
{ {
pm::Mesh m; pm::Mesh m;
auto glm_pos = m.vertices().make_attribute<glm::vec3>(); auto glm_pos = m.vertices().make_attribute<glm::vec3>();
...@@ -32,7 +32,7 @@ TEST_CASE("view(...) for meshes") ...@@ -32,7 +32,7 @@ TEST_CASE("view(...) for meshes")
gv::view(gv::lines(tg_pos)); gv::view(gv::lines(tg_pos));
} }
TEST_CASE("view(...) for point clouds") TEST("view(...) for point clouds")
{ {
std::vector<glm::vec3> glm_pts; std::vector<glm::vec3> glm_pts;
std::vector<tg::pos3> tg_pts; std::vector<tg::pos3> tg_pts;
......
#include <doctest.hh> #include <nexus/test.hh>
#include <glm/ext.hpp> #include <glm/ext.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <glow-extras/geometry/Cube.hh> #include <glow-extras/geometry/Cube.hh>
TEST_CASE("Scene, Cube") TEST("Scene, Cube")
{ {
using namespace glow; using namespace glow;
......
#include <doctest.hh> #include <nexus/test.hh>
#include <glm/glm.hpp> #include <glm/glm.hpp>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <glow/objects/Texture2D.hh> #include <glow/objects/Texture2D.hh>
#include <glow/objects/VertexArray.hh> #include <glow/objects/VertexArray.hh>
TEST_CASE("FullscreenDraw, Constant") TEST("FullscreenDraw, Constant")
{ {
using namespace glow; using namespace glow;
......
#include <doctest.hh> #include <nexus/test.hh>
#include <glm/ext.hpp> #include <glm/ext.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glow/objects/Texture2DArray.hh> #include <glow/objects/Texture2DArray.hh>
TEST_CASE("TextureSize, StressTest") TEST("TextureSize, StressTest")
{ {
using namespace glow; using namespace glow;
int w = 3680; int w = 3680;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment