summaryrefslogtreecommitdiff
path: root/game/geoData.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2025-02-18 19:25:34 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2025-02-18 19:25:34 +0000
commit9c4b26ce6781584ddcd60da8a013ac5757ec05b1 (patch)
tree4a770728ebe00009c1de56a37f4af754ae021da6 /game/geoData.cpp
parentOnly build/run GeoDataMesh::sanityCheck for debug (diff)
downloadilt-9c4b26ce6781584ddcd60da8a013ac5757ec05b1.tar.bz2
ilt-9c4b26ce6781584ddcd60da8a013ac5757ec05b1.tar.xz
ilt-9c4b26ce6781584ddcd60da8a013ac5757ec05b1.zip
Expand new verts collection once
Before doing vertex normal recalc only, not on every insert
Diffstat (limited to 'game/geoData.cpp')
-rw-r--r--game/geoData.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/game/geoData.cpp b/game/geoData.cpp
index 988b11c..c472240 100644
--- a/game/geoData.cpp
+++ b/game/geoData.cpp
@@ -347,22 +347,13 @@ GeoData::setHeights(const std::span<const GlobalPosition3D> triangleStrip, const
= materializeRange(triangleStrip | std::views::transform([this, nearNodeTolerance](auto v) {
return geoData->setPoint(v, nearNodeTolerance);
}));
- std::ranges::for_each(newVerts, [this](auto vertex) {
- addVertexForNormalUpdate(vertex);
- });
+ std::ranges::copy(newVerts, std::inserter(newOrChangedVerts, newOrChangedVerts.end()));
#ifndef NDEBUG
geoData->sanityCheck();
#endif
return newVerts;
}
- void
- addVertexForNormalUpdate(const VertexHandle vertex)
- {
- newOrChangedVerts.emplace(vertex);
- std::ranges::copy(geoData->vv_range(vertex), std::inserter(newOrChangedVerts, newOrChangedVerts.end()));
- }
-
const Triangle<3> *
getTriangle(const GlobalPosition2D point) const
{
@@ -415,7 +406,7 @@ GeoData::setHeights(const std::span<const GlobalPosition3D> triangleStrip, const
}
start = geoData->split_copy(
geoData->edge_handle(next), triangle.positionOnPlane(*intersection));
- addVertexForNormalUpdate(start);
+ newOrChangedVerts.emplace(start);
boundaryTriangles.emplace(start, &triangle);
return true;
}
@@ -498,8 +489,8 @@ GeoData::setHeights(const std::span<const GlobalPosition3D> triangleStrip, const
}
std::ranges::for_each(done, [this](const auto heh) {
const auto ends = geoData->toVertexHandles(heh);
- addVertexForNormalUpdate(ends.first);
- addVertexForNormalUpdate(ends.second);
+ newOrChangedVerts.emplace(ends.first);
+ newOrChangedVerts.emplace(ends.second);
});
#ifndef NDEBUG
geoData->sanityCheck();
@@ -536,6 +527,7 @@ GeoData::setHeights(const std::span<const GlobalPosition3D> triangleStrip, const
setHeights(newVerts, opts.maxSlope);
const auto out = setSurface(opts.surface);
+ geoData->expandVerts(newOrChangedVerts);
geoData->updateAllVertexNormals(newOrChangedVerts);
geoData->afterChange();