From ffdaa93edf5eeaf9db7dc17e51554a77dd9d596d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 19 Nov 2022 15:04:30 +0000 Subject: Separate out the illumation of the scene --- test/test-render.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'test/test-render.cpp') diff --git a/test/test-render.cpp b/test/test-render.cpp index 62090e3..d5a79ec 100644 --- a/test/test-render.cpp +++ b/test/test-render.cpp @@ -54,6 +54,19 @@ public: } }; +class TestScene : public SceneRenderer::SceneProvider { + Terrain terrain {[]() { + auto gd = std::make_shared(GeoData::Limits {{0, 0}, {100, 100}}); + gd->generateRandom(); + return gd; + }()}; + void + content(const SceneShader & shader) const + { + terrain.render(shader); + } +}; + BOOST_GLOBAL_FIXTURE(ApplicationBase); BOOST_GLOBAL_FIXTURE(TestMainWindow); @@ -61,29 +74,21 @@ BOOST_FIXTURE_TEST_SUITE(w, TestRenderOutput); BOOST_AUTO_TEST_CASE(basic) { - auto gd = std::make_shared(GeoData::Limits {{0, 0}, {100, 100}}); - gd->generateRandom(); - Terrain terrain {gd}; SceneRenderer ss {size, output}; ss.camera.pos = {-10, -10, 60}; ss.camera.forward = glm::normalize(glm::vec3 {1, 1, -0.5F}); - ss.render([&terrain](const auto & shader) { - terrain.render(shader); - }); + TestScene scene; + ss.render(scene); Texture::save(outImage, size, "/tmp/basic.tga"); } BOOST_AUTO_TEST_CASE(pointlight) { - auto gd = std::make_shared(GeoData::Limits {{0, 0}, {100, 100}}); - gd->generateRandom(); - Terrain terrain {gd}; SceneRenderer ss {size, output}; ss.camera.pos = {-10, -10, 60}; ss.camera.forward = glm::normalize(glm::vec3 {1, 1, -0.5F}); - ss.render([&terrain](const auto & shader) { - terrain.render(shader); - }); + TestScene scene; + ss.render(scene); Texture::save(outImage, size, "/tmp/pointlight.tga"); } -- cgit v1.2.3