Skip to content

Commit

Permalink
Added missing const keyword
Browse files Browse the repository at this point in the history 
C26496: The variable ... is assigned only once, mark it as const
  • Loading branch information
@javagl
javagl committed Sep 15, 2021
1 parent a84b09c commit de8145a
Show file tree
Hide file tree
Showing 62 changed files with 709 additions and 709 deletions.
4 changes: 2 additions & 2 deletions Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileSelectionState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class TileSelectionState final {
* @return `true` if the tile was kicked, and `false` otherwise
*/
constexpr bool wasKicked(int32_t frameNumber) const noexcept {
Result result = this->getResult(frameNumber);
const Result result = this->getResult(frameNumber);
return result == Result::RenderedAndKicked ||
result == Result::RefinedAndKicked;
}
Expand All @@ -131,7 +131,7 @@ class TileSelectionState final {
* @return The {@link TileSelectionState::Result} prior to being kicked.
*/
constexpr Result getOriginalResult(int32_t frameNumber) const noexcept {
Result result = this->getResult(frameNumber);
const Result result = this->getResult(frameNumber);

switch (result) {
case Result::RefinedAndKicked:
Expand Down
18 changes: 9 additions & 9 deletions Cesium3DTilesSelection/src/Batched3DModelContent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ rapidjson::Document parseFeatureTableJsonData(
return document;
}

auto rtcIt = document.FindMember("RTC_CENTER");
const auto rtcIt = document.FindMember("RTC_CENTER");
if (rtcIt != document.MemberEnd() && rtcIt->value.IsArray() &&
rtcIt->value.Size() == 3 && rtcIt->value[0].IsDouble() &&
rtcIt->value[1].IsDouble() && rtcIt->value[2].IsDouble()) {
Expand Down Expand Up @@ -158,40 +158,40 @@ std::unique_ptr<TileContentLoadResult> Batched3DModelContent::load(
"size specified in its header.");
}

uint32_t glbStart = headerLength + header.featureTableJsonByteLength +
const uint32_t glbStart = headerLength + header.featureTableJsonByteLength +
header.featureTableBinaryByteLength +
header.batchTableJsonByteLength +
header.batchTableBinaryByteLength;
uint32_t glbEnd = header.byteLength;
const uint32_t glbEnd = header.byteLength;

if (glbEnd <= glbStart) {
throw std::runtime_error("The B3DM is invalid because the start of the "
"glTF model is after the end of the entire B3DM.");
}

gsl::span<const std::byte> glbData =
const gsl::span<const std::byte> glbData =
data.subspan(glbStart, glbEnd - glbStart);
std::unique_ptr<TileContentLoadResult> pResult =
GltfContent::load(pLogger, url, glbData);

if (pResult->model && header.featureTableJsonByteLength > 0) {
CesiumGltf::Model& gltf = pResult->model.value();

gsl::span<const std::byte> featureTableJsonData =
const gsl::span<const std::byte> featureTableJsonData =
data.subspan(headerLength, header.featureTableJsonByteLength);
rapidjson::Document featureTable =
parseFeatureTableJsonData(pLogger, gltf, featureTableJsonData);

int64_t batchTableStart = headerLength + header.featureTableJsonByteLength +
const int64_t batchTableStart = headerLength + header.featureTableJsonByteLength +
header.featureTableBinaryByteLength;
int64_t batchTableLength =
const int64_t batchTableLength =
header.batchTableBinaryByteLength + header.batchTableJsonByteLength;

if (batchTableLength > 0) {
gsl::span<const std::byte> batchTableJsonData = data.subspan(
const gsl::span<const std::byte> batchTableJsonData = data.subspan(
static_cast<size_t>(batchTableStart),
header.batchTableJsonByteLength);
gsl::span<const std::byte> batchTableBinaryData = data.subspan(
const gsl::span<const std::byte> batchTableBinaryData = data.subspan(
static_cast<size_t>(
batchTableStart + header.batchTableJsonByteLength),
header.batchTableBinaryByteLength);
Expand Down
24 changes: 12 additions & 12 deletions Cesium3DTilesSelection/src/BingMapsRasterOverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class BingMapsTileProvider final : public QuadtreeRasterOverlayTileProvider {
tileID.computeInvertedY(this->getTilingScheme()));
}
if (key == "subdomain") {
size_t subdomainIndex =
const size_t subdomainIndex =
(tileID.level + tileID.x + tileID.y) % this->_subdomains.size();
return this->_subdomains[subdomainIndex];
}
Expand All @@ -168,13 +168,13 @@ class BingMapsTileProvider final : public QuadtreeRasterOverlayTileProvider {
options.rectangle = this->getTilingScheme().tileToRectangle(tileID);
std::vector<Credit>& tileCredits = options.credits;

CesiumGeospatial::GlobeRectangle tileRectangle =
const CesiumGeospatial::GlobeRectangle tileRectangle =
CesiumGeospatial::unprojectRectangleSimple(
this->getProjection(),
options.rectangle);

// Cesium levels start at 0, Bing levels start at 1
unsigned int bingTileLevel = tileID.level + 1;
const unsigned int bingTileLevel = tileID.level + 1;

for (const CreditAndCoverageAreas& creditAndCoverageAreas : _credits) {
for (CoverageArea coverageArea : creditAndCoverageAreas.coverageAreas) {
Expand All @@ -195,7 +195,7 @@ class BingMapsTileProvider final : public QuadtreeRasterOverlayTileProvider {
static std::string tileXYToQuadKey(uint32_t level, uint32_t x, uint32_t y) {
std::string quadkey;
for (int32_t i = static_cast<int32_t>(level); i >= 0; --i) {
uint32_t bitmask = static_cast<uint32_t>(1 << i);
const uint32_t bitmask = static_cast<uint32_t>(1 << i);
uint32_t digit = 0;

if ((x & bitmask) != 0) {
Expand Down Expand Up @@ -265,27 +265,27 @@ std::vector<CreditAndCoverageAreas> collectCredits(
const rapidjson::Value* pResource,
const std::shared_ptr<CreditSystem>& pCreditSystem) {
std::vector<CreditAndCoverageAreas> credits;
auto attributionsIt = pResource->FindMember("imageryProviders");
const auto attributionsIt = pResource->FindMember("imageryProviders");
if (attributionsIt != pResource->MemberEnd() &&
attributionsIt->value.IsArray()) {

for (const rapidjson::Value& attribution :
attributionsIt->value.GetArray()) {

std::vector<CoverageArea> coverageAreas;
auto coverageAreasIt = attribution.FindMember("coverageAreas");
const auto coverageAreasIt = attribution.FindMember("coverageAreas");
if (coverageAreasIt != attribution.MemberEnd() &&
coverageAreasIt->value.IsArray()) {

for (const rapidjson::Value& area : coverageAreasIt->value.GetArray()) {

auto bboxIt = area.FindMember("bbox");
const auto bboxIt = area.FindMember("bbox");
if (bboxIt != area.MemberEnd() && bboxIt->value.IsArray() &&
bboxIt->value.Size() == 4) {

auto zoomMinIt = area.FindMember("zoomMin");
auto zoomMaxIt = area.FindMember("zoomMax");
auto bboxArrayIt = bboxIt->value.GetArray();
const auto zoomMinIt = area.FindMember("zoomMin");
const auto zoomMaxIt = area.FindMember("zoomMax");
const auto bboxArrayIt = bboxIt->value.GetArray();
if (zoomMinIt != area.MemberEnd() &&
zoomMaxIt != area.MemberEnd() && zoomMinIt->value.IsUint() &&
zoomMaxIt->value.IsUint() && bboxArrayIt[0].IsNumber() &&
Expand All @@ -307,7 +307,7 @@ std::vector<CreditAndCoverageAreas> collectCredits(
}
}

auto creditString = attribution.FindMember("attribution");
const auto creditString = attribution.FindMember("attribution");
if (creditString != attribution.MemberEnd() &&
creditString->value.IsString()) {
credits.push_back(
Expand Down Expand Up @@ -437,7 +437,7 @@ BingMapsRasterOverlay::createTileProvider(
}

const std::byte* responseBuffer = pResponse->data().data();
size_t responseSize = pResponse->data().size();
const size_t responseSize = pResponse->data().size();

sessionCache[metadataUrl] = std::vector<std::byte>(
pResponse->data().begin(),
Expand Down
8 changes: 4 additions & 4 deletions Cesium3DTilesSelection/src/BoundingVolume.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ BoundingVolume transformBoundingVolume(
const glm::dmat4x4& transform;

BoundingVolume operator()(const OrientedBoundingBox& boundingBox) {
glm::dvec3 center = transform * glm::dvec4(boundingBox.getCenter(), 1.0);
glm::dmat3 halfAxes = glm::dmat3(transform) * boundingBox.getHalfAxes();
const glm::dvec3 center = transform * glm::dvec4(boundingBox.getCenter(), 1.0);
const glm::dmat3 halfAxes = glm::dmat3(transform) * boundingBox.getHalfAxes();
return OrientedBoundingBox(center, halfAxes);
}

Expand All @@ -23,10 +23,10 @@ BoundingVolume transformBoundingVolume(
}

BoundingVolume operator()(const BoundingSphere& boundingSphere) {
glm::dvec3 center =
const glm::dvec3 center =
transform * glm::dvec4(boundingSphere.getCenter(), 1.0);

double uniformScale = glm::max(
const double uniformScale = glm::max(
glm::max(
glm::length(glm::dvec3(transform[0])),
glm::length(glm::dvec3(transform[1]))),
Expand Down
4 changes: 2 additions & 2 deletions Cesium3DTilesSelection/src/CompositeContent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ CompositeContent::load(const TileContentLoadInput& input) {
break;
}

gsl::span<const std::byte> innerData(data.data() + pos, pInner->byteLength);
const gsl::span<const std::byte> innerData(data.data() + pos, pInner->byteLength);

std::unique_ptr<TileContentLoadResult> pInnerLoadResult =
TileContentFactory::createContent(derive(input, innerData));
Expand Down Expand Up @@ -162,4 +162,4 @@ CompositeContent::load(const TileContentLoadInput& input) {
return pResult;
}

} // namespace Cesium3DTilesSelection
} // namespace Cesium3DTilesSelection
34 changes: 17 additions & 17 deletions Cesium3DTilesSelection/src/GltfContent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ static int generateOverlayTextureCoordinates(
std::vector<CesiumGltf::BufferView>& bufferViews = gltf.bufferViews;
std::vector<CesiumGltf::Accessor>& accessors = gltf.accessors;

int uvBufferId = static_cast<int>(buffers.size());
const int uvBufferId = static_cast<int>(buffers.size());
CesiumGltf::Buffer& uvBuffer = buffers.emplace_back();

int uvBufferViewId = static_cast<int>(bufferViews.size());
const int uvBufferViewId = static_cast<int>(bufferViews.size());
bufferViews.emplace_back();

int uvAccessorId = static_cast<int>(accessors.size());
const int uvAccessorId = static_cast<int>(accessors.size());
accessors.emplace_back();

CesiumGltf::AccessorView<glm::vec3> positionView(gltf, positionAccessorIndex);
const CesiumGltf::AccessorView<glm::vec3> positionView(gltf, positionAccessorIndex);
if (positionView.status() != CesiumGltf::AccessorViewStatus::Valid) {
return -1;
}
Expand All @@ -105,13 +105,13 @@ static int generateOverlayTextureCoordinates(
CesiumGltf::AccessorWriter<glm::vec2> uvWriter(gltf, uvAccessorId);
assert(uvWriter.status() == CesiumGltf::AccessorViewStatus::Valid);

double width = rectangle.computeWidth();
double height = rectangle.computeHeight();
const double width = rectangle.computeWidth();
const double height = rectangle.computeHeight();

for (int64_t i = 0; i < positionView.size(); ++i) {
// Get the ECEF position
glm::vec3 position = positionView[i];
glm::dvec3 positionEcef = transform * glm::dvec4(position, 1.0);
const glm::vec3 position = positionView[i];
const glm::dvec3 positionEcef = transform * glm::dvec4(position, 1.0);

// Convert it to cartographic
std::optional<CesiumGeospatial::Cartographic> cartographic =
Expand All @@ -127,8 +127,8 @@ static int generateOverlayTextureCoordinates(
projectPosition(projection, cartographic.value());

double longitude = cartographic.value().longitude;
double latitude = cartographic.value().latitude;
double ellipsoidHeight = cartographic.value().height;
const double latitude = cartographic.value().latitude;
const double ellipsoidHeight = cartographic.value().height;

// If the position is near the anti-meridian and the projected position is
// outside the expected range, try using the equivalent longitude on the
Expand All @@ -143,11 +143,11 @@ static int generateOverlayTextureCoordinates(
cartographic.value().longitude += cartographic.value().longitude < 0.0
? CesiumUtility::Math::TWO_PI
: -CesiumUtility::Math::TWO_PI;
glm::dvec3 projectedPosition2 =
const glm::dvec3 projectedPosition2 =
projectPosition(projection, cartographic.value());

double distance1 = rectangle.computeSignedDistance(projectedPosition);
double distance2 = rectangle.computeSignedDistance(projectedPosition2);
const double distance1 = rectangle.computeSignedDistance(projectedPosition);
const double distance2 = rectangle.computeSignedDistance(projectedPosition2);

if (distance2 < distance1) {
projectedPosition = projectedPosition2;
Expand Down Expand Up @@ -232,13 +232,13 @@ GltfContent::createRasterOverlayTextureCoordinates(
return;
}

int positionAccessorIndex = positionIt->second;
const int positionAccessorIndex = positionIt->second;
if (positionAccessorIndex < 0 ||
positionAccessorIndex >= static_cast<int>(gltf_.accessors.size())) {
return;
}

int textureCoordinateAccessorIndex =
const int textureCoordinateAccessorIndex =
positionAccessorsToTextureCoordinateAccessor[static_cast<size_t>(
positionAccessorIndex)];
if (textureCoordinateAccessorIndex > 0) {
Expand All @@ -252,12 +252,12 @@ GltfContent::createRasterOverlayTextureCoordinates(
return;
}

glm::dmat4 fullTransform =
const glm::dmat4 fullTransform =
transform * CesiumGeometry::AxisTransforms::Y_UP_TO_Z_UP *
nodeTransform;

// Generate new texture coordinates
int nextTextureCoordinateAccessorIndex =
const int nextTextureCoordinateAccessorIndex =
generateOverlayTextureCoordinates(
gltf_,
positionAccessorIndex,
Expand Down
2 changes: 1 addition & 1 deletion Cesium3DTilesSelection/src/IonRasterOverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ IonRasterOverlay::createTileProvider(
"externalType",
"unknown");
if (externalType == "BING") {
auto optionsIt = response.FindMember("options");
const auto optionsIt = response.FindMember("options");
if (optionsIt == response.MemberEnd() ||
!optionsIt->value.IsObject()) {
SPDLOG_LOGGER_ERROR(
Expand Down
Loading

0 comments on commit de8145a

Please sign in to comment.