Commit d9c8fbd1 authored by Philip Trettner's avatar Philip Trettner
Browse files

Merge remote-tracking branch 'origin/agrabowy' into develop

parents 2deb00f3 599aac1a
Pipeline #13696 passed with stage
in 6 minutes and 17 seconds
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
#include <typed-geometry/tg-std.hh> #include <typed-geometry/tg-std.hh>
#include <iostream> TG_FUZZ_TEST_MAX_ITS_MAX_CYCLES(TypedGeometry, Project, 25, 100'000'000'000)
TG_FUZZ_TEST_MAX_ITS(TypedGeometry, Project, 20)
{ {
auto const test_obj = [&rng](auto p, auto o) { auto const test_obj = [&rng](auto p, auto o) {
auto proj = project(p, o); auto proj = project(p, o);
...@@ -147,10 +145,8 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, Project, 20) ...@@ -147,10 +145,8 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, Project, 20)
test_obj_and_boundary(p4, tg::sphere4(pos40, r)); test_obj_and_boundary(p4, tg::sphere4(pos40, r));
test_obj_and_boundary(p3, tg::sphere2in3(pos30, r, n3)); test_obj_and_boundary(p3, tg::sphere2in3(pos30, r, n3));
// triangle // triangle
(void)pos22; test_obj(p2, tg::triangle2(pos20, pos21, pos22));
(void)pos32; test_obj(p3, tg::triangle3(pos30, pos31, pos32));
// FIXME: test_obj(p2, tg::triangle2(pos20, pos21, pos22));
// FIXME: test_obj(p3, tg::triangle3(pos30, pos31, pos32));
// test_obj(p4, tg::triangle4(pos40, pos41, pos42)); // test_obj(p4, tg::triangle4(pos40, pos41, pos42));
} }
......
...@@ -130,7 +130,7 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, UniformGeneralProperties, 100) ...@@ -130,7 +130,7 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, UniformGeneralProperties, 100)
// aabb // aabb
// TODO: And boundary // TODO: And boundary
test_obj(samples1, tg::aabb1(minPos1, maxPos1)); test_obj(samples1, tg::aabb1(minPos1, maxPos1 + 0.1f)); // Give some space to place different samples
test_obj(samples2, tg::aabb2(minPos2, maxPos2)); test_obj(samples2, tg::aabb2(minPos2, maxPos2));
test_obj(samples3, tg::aabb3(minPos3, maxPos3)); test_obj(samples3, tg::aabb3(minPos3, maxPos3));
test_obj(samples4, tg::aabb4(minPos4, maxPos4)); test_obj(samples4, tg::aabb4(minPos4, maxPos4));
...@@ -326,7 +326,7 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, UniformCapsule, 10) ...@@ -326,7 +326,7 @@ TG_FUZZ_TEST_MAX_ITS(TypedGeometry, UniformCapsule, 10)
{ {
auto tolerance = 0.01f; auto tolerance = 0.01f;
auto range3 = tg::aabb3(tg::pos3(-10), tg::pos3(10)); auto range3 = tg::aabb3(tg::pos3(-10), tg::pos3(10));
auto r = uniform(rng, 0.0f, 10.0f); auto r = uniform(rng, 1.0f, 10.0f);
auto pos0 = uniform(rng, range3); auto pos0 = uniform(rng, range3);
auto pos1 = uniform(rng, range3); auto pos1 = uniform(rng, range3);
auto n = normalize(pos1 - pos0); auto n = normalize(pos1 - pos0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment