Merge remote-tracking branch 'origin/main' into load-tracing

This commit is contained in:
Kevin Ring 2021-06-30 09:17:27 +10:00
commit 46c01f0d10
1 changed files with 3 additions and 1 deletions

View File

@ -10,6 +10,7 @@
#include "CesiumGeospatial/Projection.h"
#include "CesiumGltf/GltfReader.h"
#include "CesiumUtility/IntrusivePointer.h"
#include <cassert>
#include <optional>
#include <spdlog/fwd.h>
#include <unordered_map>
@ -300,6 +301,7 @@ public:
* @brief Returns the number of tiles that are currently loading.
*/
uint32_t getNumberOfTilesLoading() const noexcept {
assert(this->_totalTilesCurrentlyLoading > -1);
return this->_totalTilesCurrentlyLoading;
}
@ -318,7 +320,7 @@ public:
/**
* @brief Get the per-TileProvider {@link Credit} if one exists.
*/
const std::optional<Credit> getCredit() const noexcept { return _credit; }
const std::optional<Credit>& getCredit() const noexcept { return _credit; }
/**
* @brief Loads a tile immediately, without throttling requests.