diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-03-20 00:11:43 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-03-20 00:11:43 +0000 |
| commit | 5f0fbcef6dbc1421ea2b538c7f839b2f37c6e36e (patch) | |
| tree | ee167c9dbdd5c9d9cb275f0af2f487fa72bea058 /assetFactory | |
| parent | Remove (as yet) unused members from Camera (diff) | |
| download | ilt-5f0fbcef6dbc1421ea2b538c7f839b2f37c6e36e.tar.bz2 ilt-5f0fbcef6dbc1421ea2b538c7f839b2f37c6e36e.tar.xz ilt-5f0fbcef6dbc1421ea2b538c7f839b2f37c6e36e.zip | |
Fix some name shadowing in FaceController
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/faceController.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp index 2fb0412..1e563b2 100644 --- a/assetFactory/faceController.cpp +++ b/assetFactory/faceController.cpp @@ -52,9 +52,9 @@ FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const const auto next = (idx + 1) % vertexCount; const auto newFace = mesh.add_face({baseVertices[idx], baseVertices[next], vertices[next], vertices[idx]}); - auto & name = mesh.property(mesh.nameFaceProperty, newFace); - name = getAdjacentFaceName(ofrange, newFace); - newFaces.emplace(name, newFace); + auto & newFaceName = mesh.property(mesh.nameFaceProperty, newFace); + newFaceName = getAdjacentFaceName(ofrange, newFace); + newFaces.emplace(newFaceName, newFace); } newFaces.emplace(name, mesh.add_face(vertices)); if (smooth) { @@ -63,8 +63,8 @@ FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const } } applyStyle(mesh, parents + this, newFaces); - for (const auto & [name, faceController] : faceControllers) { - faceController->apply(mesh, parents + this, name, newFaces); + for (const auto & [subFaceName, faceController] : faceControllers) { + faceController->apply(mesh, parents + this, subFaceName, newFaces); } faces.merge(std::move(newFaces)); } |