diff options
| -rw-r--r-- | game/network/network.cpp | 30 | ||||
| -rw-r--r-- | game/network/network.h | 7 | ||||
| -rw-r--r-- | test/test-network.cpp | 5 |
3 files changed, 25 insertions, 17 deletions
diff --git a/game/network/network.cpp b/game/network/network.cpp index 5afac7e..70c4e21 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -166,21 +166,27 @@ Network::terrainSplit(const GeoData * geoData, const GenCurveDef & def) const return out; } -GenCurveDef -Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & end, float startDir) +GenLinksDef +Network::genDef(const GlobalPosition3D & start, const GlobalPosition3D & end) +{ + return {GenStraightDef {start, end}}; +} + +GenLinksDef +Network::genDef(const GlobalPosition3D & start, const GlobalPosition3D & end, Angle startDir) { const auto dir = pi + startDir; const auto flatStart = start.xy(), flatEnd = end.xy(); const auto centre = find_arc_centre(flatStart, dir, flatEnd); if (centre.second) { // right hand arc - return {end, start, centre.first}; + return {GenCurveDef {end, start, centre.first}}; } - return {start, end, centre.first}; + return {GenCurveDef {start, end, centre.first}}; } -std::pair<GenCurveDef, GenCurveDef> -Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & end, float startDir, float endDir) +GenLinksDef +Network::genDef(const GlobalPosition3D & start, const GlobalPosition3D & end, Angle startDir, Angle endDir) { // Based on formula/code from https://www.ryanjuckett.com/biarc-interpolation/ const auto startVec = -sincos(startDir); @@ -194,7 +200,7 @@ Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & en if (equalTangents && perpT1) { const auto joint = start + (diff * 0.5F); - return {genCurveDef(start, joint, startDir), genCurveDef(end, joint, endDir)}; + return genDef(start, joint, startDir) + genDef(end, joint, endDir); } const auto vDotT = glm::dot(diff.xy(), endsVecTotal); @@ -210,7 +216,7 @@ Network::genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & en const auto joint = (start + end + ((difference(startVec, endVec) * extLen1) || 0.F)) / 2; - return {genCurveDef(start, joint, startDir), genCurveDef(end, joint, endDir)}; + return genDef(start, joint, startDir) + genDef(end, joint, endDir); } Link::Collection @@ -228,15 +234,13 @@ Network::create(const GeoData * geoData, const CreationDefinition & def) if (def.fromEnd.direction) { if (def.toEnd.direction) { // Two specific directions at both ends, S curves - const auto curves = genCurveDef( - def.fromEnd.position, def.toEnd.position, *def.fromEnd.direction, *def.toEnd.direction); - return {curves.first, curves.second}; + return genDef(def.fromEnd.position, def.toEnd.position, *def.fromEnd.direction, *def.toEnd.direction); } // One specific direction, single curve from there - return {genCurveDef(def.fromEnd.position, def.toEnd.position, *def.fromEnd.direction)}; + return genDef(def.fromEnd.position, def.toEnd.position, *def.fromEnd.direction); } // One specific direction, single curve from the other - return {genCurveDef(def.toEnd.position, def.fromEnd.position, *def.toEnd.direction)}; + return genDef(def.toEnd.position, def.fromEnd.position, *def.toEnd.direction); }; const auto splitDefs = [&linkDefs, this, geoData]() { return std::ranges::fold_left(linkDefs(), GenLinksDef {}, [this, geoData](auto && existing, const auto & def) { diff --git a/game/network/network.h b/game/network/network.h index efacac2..d3370b3 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -66,9 +66,10 @@ public: protected: static void joinLinks(const Link::Ptr & link, const Link::Ptr & oldLink); - static GenCurveDef genCurveDef(const GlobalPosition3D & start, const GlobalPosition3D & end, float startDir); - static std::pair<GenCurveDef, GenCurveDef> genCurveDef( - const GlobalPosition3D & start, const GlobalPosition3D & end, float startDir, float endDir); + static GenLinksDef genDef(const GlobalPosition3D & start, const GlobalPosition3D & end); + static GenLinksDef genDef(const GlobalPosition3D & start, const GlobalPosition3D & end, Angle startDir); + static GenLinksDef genDef( + const GlobalPosition3D & start, const GlobalPosition3D & end, Angle startDir, Angle endDir); [[nodiscard]] GenLinksDef terrainSplit(const GeoData *, const GenStraightDef &) const; [[nodiscard]] GenLinksDef terrainSplit(const GeoData *, const GenCurveDef &) const; diff --git a/test/test-network.cpp b/test/test-network.cpp index 28a338f..0739073 100644 --- a/test/test-network.cpp +++ b/test/test-network.cpp @@ -274,7 +274,10 @@ BOOST_DATA_TEST_CASE(GenCurveDefs, }), start, end, startDir, exp) { - BOOST_CHECK_EQUAL(genCurveDef(start, end, startDir), exp); + const auto defs = genDef(start, end, startDir); + BOOST_REQUIRE_EQUAL(defs.size(), 1); + BOOST_REQUIRE_EQUAL(defs.front().index(), 1); + BOOST_CHECK_EQUAL(std::get<GenCurveDef>(defs.front()), exp); } BOOST_AUTO_TEST_CASE(NetworkCreateStraight) |