From 61c1fa5f17e813bbba8aff68696552b1c63a1f30 Mon Sep 17 00:00:00 2001 From: Ashley Rogers Date: Fri, 20 Dec 2024 16:04:45 -0500 Subject: [PATCH] Make clang-tidy happy again --- .../src/ImplicitQuadtreeLoader.cpp | 6 +++--- .../src/LayerJsonTerrainLoader.cpp | 8 ++++---- Cesium3DTilesSelection/src/TilesetJsonLoader.cpp | 16 ++++++++-------- .../src/RasterOverlayUtilities.cpp | 4 ++-- .../src/WebMapServiceRasterOverlay.cpp | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp b/Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp index f6c16a5c8..069953853 100644 --- a/Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp +++ b/Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp @@ -215,13 +215,13 @@ CesiumAsync::Future requestTileContent( [ellipsoid, pLogger, tileUrl, - pAssetAccessor = std::move(pAssetAccessor), + pAssetAccessor, pCompletedRequest](GltfConverterResult&& result) mutable { // Report any errors if there are any logTileLoadResult(pLogger, tileUrl, result.errors); if (result.errors || !result.model) { return TileLoadResult::createFailedResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest)); } @@ -231,7 +231,7 @@ CesiumAsync::Future requestTileContent( std::nullopt, std::nullopt, std::nullopt, - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest), {}, TileLoadResultState::Success, diff --git a/Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp b/Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp index b2e4c46e0..f90a5bb7f 100644 --- a/Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp +++ b/Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp @@ -899,7 +899,7 @@ LayerJsonTerrainLoader::loadTileContent(const TileLoadInput& loadInput) { return std::move(finalFuture) .thenInMainThread([this, asyncSystem, - pAssetAccessor = std::move(pAssetAccessor), + pAssetAccessor, ellipsoid, ¤tLayer, &tile, @@ -919,7 +919,7 @@ LayerJsonTerrainLoader::loadTileContent(const TileLoadInput& loadInput) { // thread based on the projection of the loader since the upsampler // needs this UV to do the upsampling auto finalResult = convertToTileLoadResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(loadResult), ellipsoid); bool doesTileHaveUpsampledChild = tileHasUpsampledChild(tile); @@ -946,7 +946,7 @@ LayerJsonTerrainLoader::loadTileContent(const TileLoadInput& loadInput) { bool doesTileHaveUpsampledChild = tileHasUpsampledChild(tile); return std::move(futureQuantizedMesh) .thenImmediately( - [pAssetAccessor = std::move(pAssetAccessor), + [pAssetAccessor, doesTileHaveUpsampledChild, projection = this->_projection, tileTransform = tile.getTransform(), @@ -957,7 +957,7 @@ LayerJsonTerrainLoader::loadTileContent(const TileLoadInput& loadInput) { // based on the projection of the loader since the upsampler needs // this UV to do the upsampling auto result = convertToTileLoadResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(loadResult), ellipsoid); if (doesTileHaveUpsampledChild && diff --git a/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp b/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp index 7cfcd5c9e..48dcc5a18 100644 --- a/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp +++ b/Cesium3DTilesSelection/src/TilesetJsonLoader.cpp @@ -938,7 +938,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { ellipsoid, upAxis = _upAxis, externalContentInitializer = std::move(externalContentInitializer), - pAssetAccessor = pAssetAccessor, + pAssetAccessor, asyncSystem, requestHeaders](std::shared_ptr&& pCompletedRequest) mutable { @@ -951,7 +951,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { tileUrl); return asyncSystem.createResolvedFuture( TileLoadResult::createFailedResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest))); } @@ -964,7 +964,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { tileUrl); return asyncSystem.createResolvedFuture( TileLoadResult::createFailedResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest))); } @@ -995,12 +995,12 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { pLogger, upAxis, tileUrl, - pAssetAccessor = std::move(pAssetAccessor), - pCompletedRequest = std::move(pCompletedRequest)](GltfConverterResult&& result) { + pAssetAccessor, + pCompletedRequest = std::move(pCompletedRequest)](GltfConverterResult&& result) mutable { logTileLoadResult(pLogger, tileUrl, result.errors); if (result.errors) { return TileLoadResult::createFailedResult( - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest)); } return TileLoadResult{ @@ -1009,7 +1009,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { std::nullopt, std::nullopt, std::nullopt, - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest), {}, TileLoadResultState::Success, @@ -1023,7 +1023,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) { upAxis, tileRefine, pLogger, - std::move(pAssetAccessor), + pAssetAccessor, std::move(pCompletedRequest), std::move(externalContentInitializer), ellipsoid)); diff --git a/CesiumRasterOverlays/src/RasterOverlayUtilities.cpp b/CesiumRasterOverlays/src/RasterOverlayUtilities.cpp index e964f8b73..29f969e63 100644 --- a/CesiumRasterOverlays/src/RasterOverlayUtilities.cpp +++ b/CesiumRasterOverlays/src/RasterOverlayUtilities.cpp @@ -1108,8 +1108,8 @@ bool upsamplePrimitiveForRasterOverlays( Accessor& accessor = model.accessors[static_cast(attribute.accessorIndex)]; accessor.count = numberOfVertices; - accessor.min = std::move(attribute.minimums); - accessor.max = std::move(attribute.maximums); + accessor.min = attribute.minimums; + accessor.max = attribute.maximums; } // Add an accessor for the indices diff --git a/CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp b/CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp index 57203fdee..488003ecb 100644 --- a/CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp +++ b/CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp @@ -319,7 +319,7 @@ WebMapServiceRasterOverlay::createTileProvider( if (!pResponse) { return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{ RasterOverlayLoadType::TileProvider, - std::move(pRequest), + pRequest, "No response received from web map service."}); } @@ -332,7 +332,7 @@ WebMapServiceRasterOverlay::createTileProvider( if (error != tinyxml2::XMLError::XML_SUCCESS) { return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{ RasterOverlayLoadType::TileProvider, - std::move(pRequest), + pRequest, "Could not parse web map service XML."}); } @@ -340,7 +340,7 @@ WebMapServiceRasterOverlay::createTileProvider( if (!pRoot) { return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{ RasterOverlayLoadType::TileProvider, - std::move(pRequest), + pRequest, "Web map service XML document does not have a root " "element."}); } @@ -349,7 +349,7 @@ WebMapServiceRasterOverlay::createTileProvider( if (!validateCapabilities(pRoot, options, validationError)) { return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{ RasterOverlayLoadType::TileProvider, - std::move(pRequest), + pRequest, validationError}); }