From 9c4b26ce6781584ddcd60da8a013ac5757ec05b1 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 18 Feb 2025 19:25:34 +0000
Subject: Expand new verts collection once

Before doing vertex normal recalc only, not on every insert
---
 game/geoData.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'game/geoData.cpp')

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();
 
-- 
cgit v1.2.3