Skip to content

Commit

Permalink
Make clang-tidy happy again
Browse files Browse the repository at this point in the history
  • Loading branch information
@azrogers
azrogers committed Dec 20, 2024
1 parent 869a432 commit 61c1fa5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions Cesium3DTilesSelection/src/ImplicitQuadtreeLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ CesiumAsync::Future<TileLoadResult> 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));
}

Expand All @@ -231,7 +231,7 @@ CesiumAsync::Future<TileLoadResult> requestTileContent(
std::nullopt,
std::nullopt,
std::nullopt,
std::move(pAssetAccessor),
pAssetAccessor,
std::move(pCompletedRequest),
{},
TileLoadResultState::Success,
Expand Down
8 changes: 4 additions & 4 deletions Cesium3DTilesSelection/src/LayerJsonTerrainLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ LayerJsonTerrainLoader::loadTileContent(const TileLoadInput& loadInput) {
return std::move(finalFuture)
.thenInMainThread([this,
asyncSystem,
pAssetAccessor = std::move(pAssetAccessor),
pAssetAccessor,
ellipsoid,
&currentLayer,
&tile,
Expand All @@ -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);
Expand All @@ -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(),
Expand All @@ -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 &&
Expand Down
16 changes: 8 additions & 8 deletions Cesium3DTilesSelection/src/TilesetJsonLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) {
ellipsoid,
upAxis = _upAxis,
externalContentInitializer = std::move(externalContentInitializer),
pAssetAccessor = pAssetAccessor,
pAssetAccessor,
asyncSystem,
requestHeaders](std::shared_ptr<CesiumAsync::IAssetRequest>&&
pCompletedRequest) mutable {
Expand All @@ -951,7 +951,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) {
tileUrl);
return asyncSystem.createResolvedFuture(
TileLoadResult::createFailedResult(
std::move(pAssetAccessor),
pAssetAccessor,
std::move(pCompletedRequest)));
}

Expand All @@ -964,7 +964,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) {
tileUrl);
return asyncSystem.createResolvedFuture(
TileLoadResult::createFailedResult(
std::move(pAssetAccessor),
pAssetAccessor,
std::move(pCompletedRequest)));
}

Expand Down Expand Up @@ -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{
Expand All @@ -1009,7 +1009,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) {
std::nullopt,
std::nullopt,
std::nullopt,
std::move(pAssetAccessor),
pAssetAccessor,
std::move(pCompletedRequest),
{},
TileLoadResultState::Success,
Expand All @@ -1023,7 +1023,7 @@ TilesetJsonLoader::loadTileContent(const TileLoadInput& loadInput) {
upAxis,
tileRefine,
pLogger,
std::move(pAssetAccessor),
pAssetAccessor,
std::move(pCompletedRequest),
std::move(externalContentInitializer),
ellipsoid));
Expand Down
4 changes: 2 additions & 2 deletions CesiumRasterOverlays/src/RasterOverlayUtilities.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1108,8 +1108,8 @@ bool upsamplePrimitiveForRasterOverlays(
Accessor& accessor =
model.accessors[static_cast<size_t>(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
Expand Down
8 changes: 4 additions & 4 deletions CesiumRasterOverlays/src/WebMapServiceRasterOverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."});
}

Expand All @@ -332,15 +332,15 @@ 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."});
}

tinyxml2::XMLElement* pRoot = doc.RootElement();
if (!pRoot) {
return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{
RasterOverlayLoadType::TileProvider,
std::move(pRequest),
pRequest,
"Web map service XML document does not have a root "
"element."});
}
Expand All @@ -349,7 +349,7 @@ WebMapServiceRasterOverlay::createTileProvider(
if (!validateCapabilities(pRoot, options, validationError)) {
return nonstd::make_unexpected(RasterOverlayLoadFailureDetails{
RasterOverlayLoadType::TileProvider,
std::move(pRequest),
pRequest,
validationError});
}

Expand Down

0 comments on commit 61c1fa5

Please sign in to comment.