summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test-assetFactory.cpp2
-rw-r--r--test/test-render.cpp14
2 files changed, 7 insertions, 9 deletions
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 82a1825..c0edd66 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(brush47xml, *boost::unit_test::timeout(5))
BOOST_REQUIRE(brush47rvc->bogies.back());
auto railVehicle = std::make_shared<RailVehicle>(brush47rvc);
- objects.objects.push_back(railVehicle);
+ objects.objects.push_back(brush47rvc);
render();
}
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 1643068..0fbeb2b 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -22,6 +22,8 @@
class TestScene : public SceneProvider {
std::shared_ptr<RailVehicle> train1, train2;
+ const RailVehicleClassPtr brush47rvc = std::dynamic_pointer_cast<RailVehicleClass>(
+ AssetFactory::loadXML(RESDIR "/brush47.xml")->assets.at("brush-47"));
Terrain terrain {[]() {
auto gd = std::make_shared<GeoData>(GeoData::Limits {{0, 0}, {100, 100}});
@@ -32,19 +34,16 @@ class TestScene : public SceneProvider {
public:
TestScene()
{
- const auto assetFactory = AssetFactory::loadXML(RESDIR "/brush47.xml");
- const auto brush47rvc = std::dynamic_pointer_cast<RailVehicleClass>(assetFactory->assets.at("brush-47"));
train1 = std::make_shared<RailVehicle>(brush47rvc);
- train1->location.pos = {52, 50, 2};
+ train1->location.setPosition({52, 50, 2});
train2 = std::make_shared<RailVehicle>(brush47rvc);
- train2->location.pos = {52, 30, 2};
+ train2->location.setPosition({52, 30, 2});
}
void
content(const SceneShader & shader) const override
{
terrain.render(shader);
- train1->render(shader);
- train2->render(shader);
+ brush47rvc->render(shader);
}
void
lights(const SceneShader &) const override
@@ -54,8 +53,7 @@ public:
shadows(const ShadowMapper & shadowMapper) const override
{
terrain.shadows(shadowMapper);
- train1->shadows(shadowMapper);
- train2->shadows(shadowMapper);
+ brush47rvc->shadows(shadowMapper);
}
};