diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-05-12 12:49:25 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-05-12 12:49:25 +0100 |
| commit | 78070da737d7fb7ed3b0307cd04d46be70e63b83 (patch) | |
| tree | 8c1a4d9abe3fa55c284d65859242353eca4a0828 /game | |
| parent | Remove all the old network link creation code (diff) | |
| download | ilt-78070da737d7fb7ed3b0307cd04d46be70e63b83.tar.bz2 ilt-78070da737d7fb7ed3b0307cd04d46be70e63b83.tar.xz ilt-78070da737d7fb7ed3b0307cd04d46be70e63b83.zip | |
Rename terrainSplitAt to connectAt
It doesn't split, it connects a duplicated pair of link definitions.
Diffstat (limited to 'game')
| -rw-r--r-- | game/network/network.cpp | 6 | ||||
| -rw-r--r-- | game/network/network.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/game/network/network.cpp b/game/network/network.cpp index a9c9372..5afac7e 100644 --- a/game/network/network.cpp +++ b/game/network/network.cpp @@ -107,7 +107,7 @@ Network::add(GeoData * geoData, const std::span<const Link::Ptr> links) } void -Network::terrainSplitAt(GenLinkDef & previous, GenLinkDef & next, GlobalPosition3D pos) +Network::connectAt(GenLinkDef & previous, GenLinkDef & next, GlobalPosition3D pos) { std::visit( [pos](auto & typedDefPrevious, auto & typedDefNext) { @@ -125,7 +125,7 @@ Network::terrainSplit(const GeoData * geoData, const GenStraightDef & def) const if (step.previous.is_valid() && geoData->getSurface(step.current) != geoData->getSurface(step.previous)) { const auto surfaceEdgePosition = geoData->positionAt(GeoData::PointFace(step.exitPosition, step.current)); out.emplace_back(out.back()); - terrainSplitAt(*out.rbegin(), *++out.rbegin(), surfaceEdgePosition); + connectAt(*out.rbegin(), *++out.rbegin(), surfaceEdgePosition); } }); return out; @@ -161,7 +161,7 @@ Network::terrainSplit(const GeoData * geoData, const GenCurveDef & def) const GenLinksDef out {def}; std::ranges::for_each(++points.begin(), --points.end(), [&out](const auto pos) { out.emplace_back(out.back()); - terrainSplitAt(*out.rbegin(), *++out.rbegin(), pos); + connectAt(*out.rbegin(), *++out.rbegin(), pos); }); return out; } diff --git a/game/network/network.h b/game/network/network.h index 86e0421..efacac2 100644 --- a/game/network/network.h +++ b/game/network/network.h @@ -72,7 +72,7 @@ protected: [[nodiscard]] GenLinksDef terrainSplit(const GeoData *, const GenStraightDef &) const; [[nodiscard]] GenLinksDef terrainSplit(const GeoData *, const GenCurveDef &) const; - static void terrainSplitAt(GenLinkDef & previous, GenLinkDef & next, GlobalPosition3D pos); + static void connectAt(GenLinkDef & previous, GenLinkDef & next, GlobalPosition3D pos); [[nodiscard]] virtual Link::Ptr create(const GenStraightDef &) = 0; [[nodiscard]] virtual Link::Ptr create(const GenCurveDef &) = 0; |