root
/
cesium-native
mirror of https://github.com/CesiumGS/cesium-native.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

change method names

This commit is contained in:
Bao Tran 2022-08-22 12:35:44 -04:00
parent d5283bd6e7
commit f28e84b6af
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cesium3DTilesSelection/src/Tileset.cpp
View File

@ -166,7 +166,7 @@ Tileset::updateViewOffline(const std::vector<ViewState>& frustums) {
this->_updateResult.tilesToRenderThisFrame;
this->updateView(frustums);
while (this->_pTilesetContentManager->getNumOfTilesLoading() > 0) {
while (this->_pTilesetContentManager->getNumberOfTilesLoading() > 0) {
this->_externals.pAssetAccessor->tick();
this->updateView(frustums);
}
@ -313,9 +313,9 @@ float Tileset::computeLoadProgress() noexcept {
this->_loadQueueLow.size() + this->_loadQueueMedium.size() +
this->_loadQueueHigh.size());
uint32_t numOfTilesLoading = static_cast<uint32_t>(
this->_pTilesetContentManager->getNumOfTilesLoading());
this->_pTilesetContentManager->getNumberOfTilesLoading());
uint32_t numOfTilesLoaded = static_cast<uint32_t>(
this->_pTilesetContentManager->getNumOfTilesLoaded());
this->_pTilesetContentManager->getNumberOfTilesLoaded());
uint32_t inProgressSum = numOfTilesLoading + queueSizeSum;
uint32_t totalNum = numOfTilesLoaded + inProgressSum;
float percentage =
@ -1314,7 +1314,7 @@ void Tileset::addTileToLoadQueue(
std::vector<Tileset::LoadRecord>& loadQueue,
Tile& tile,
double tilePriority) {
if (this->_pTilesetContentManager->doesTileNeedLoading(tile)) {
if (this->_pTilesetContentManager->tileNeedsLoading(tile)) {
loadQueue.push_back({&tile, tilePriority});
}
}
@ -1322,7 +1322,7 @@ void Tileset::addTileToLoadQueue(
void Tileset::processQueue(
std::vector<Tileset::LoadRecord>& queue,
int32_t maximumLoadsInProgress) {
if (this->_pTilesetContentManager->getNumOfTilesLoading() >=
if (this->_pTilesetContentManager->getNumberOfTilesLoading() >=
maximumLoadsInProgress) {
return;
}
@ -1331,7 +1331,7 @@ void Tileset::processQueue(
for (LoadRecord& record : queue) {
this->_pTilesetContentManager->loadTileContent(*record.pTile, _options);
if (this->_pTilesetContentManager->getNumOfTilesLoading() >=
if (this->_pTilesetContentManager->getNumberOfTilesLoading() >=
maximumLoadsInProgress) {
break;
}

7
Cesium3DTilesSelection/src/TilesetContentManager.cpp
View File

@ -959,11 +959,11 @@ TilesetContentManager::getTilesetCredits() const noexcept {
return this->_tilesetCredits;
}
int32_t TilesetContentManager::getNumOfTilesLoading() const noexcept {
int32_t TilesetContentManager::getNumberOfTilesLoading() const noexcept {
return this->_tilesLoadOnProgress;
}
int32_t TilesetContentManager::getNumOfTilesLoaded() const noexcept {
int32_t TilesetContentManager::getNumberOfTilesLoaded() const noexcept {
return this->_loadedTilesCount;
}
@ -979,8 +979,7 @@ int64_t TilesetContentManager::getTotalDataUsed() const noexcept {
return bytes;
}
bool TilesetContentManager::doesTileNeedLoading(
const Tile& tile) const noexcept {
bool TilesetContentManager::tileNeedsLoading(const Tile& tile) const noexcept {
auto state = tile.getState();
return state == TileLoadState::Unloaded ||
state == TileLoadState::FailedTemporarily ||

6
Cesium3DTilesSelection/src/TilesetContentManager.h
View File

@ -68,13 +68,13 @@ public:
const std::vector<Credit>& getTilesetCredits() const noexcept;
int32_t getNumOfTilesLoading() const noexcept;
int32_t getNumberOfTilesLoading() const noexcept;
int32_t getNumOfTilesLoaded() const noexcept;
int32_t getNumberOfTilesLoaded() const noexcept;
int64_t getTotalDataUsed() const noexcept;
bool doesTileNeedLoading(const Tile& tile) const noexcept;
bool tileNeedsLoading(const Tile& tile) const noexcept;
private:
static void setTileContent(

26
Cesium3DTilesSelection/test/TestTilesetContentManager.cpp
View File

@ -240,7 +240,7 @@ TEST_CASE("Test tile state machine") {
SECTION("Load tile from ContentLoading -> Done") {
// Unloaded -> ContentLoading
// check the state of the tile before main thread get called
CHECK(manager.getNumOfTilesLoading() == 1);
CHECK(manager.getNumberOfTilesLoading() == 1);
CHECK(tile.getState() == TileLoadState::ContentLoading);
CHECK(tile.getContent().isUnknownContent());
CHECK(!tile.getContent().isRenderContent());
@ -252,7 +252,7 @@ TEST_CASE("Test tile state machine") {
// ContentLoading -> ContentLoaded
// check the state of the tile after main thread get called
manager.waitUntilIdle();
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getState() == TileLoadState::ContentLoaded);
CHECK(tile.getContent().isRenderContent());
CHECK(tile.getContent().getRenderContent()->getRenderResources());
@ -279,7 +279,7 @@ TEST_CASE("Test tile state machine") {
SECTION("Try to unload tile when it's still loading") {
// unload tile to move from Done -> Unload
manager.unloadTileContent(tile);
CHECK(manager.getNumOfTilesLoading() == 1);
CHECK(manager.getNumberOfTilesLoading() == 1);
CHECK(tile.getState() == TileLoadState::ContentLoading);
CHECK(tile.getContent().isUnknownContent());
CHECK(!tile.getContent().isRenderContent());
@ -288,13 +288,13 @@ TEST_CASE("Test tile state machine") {
CHECK(!tile.getContent().getRenderContent());
manager.waitUntilIdle();
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getState() == TileLoadState::ContentLoaded);
CHECK(tile.getContent().isRenderContent());
CHECK(tile.getContent().getRenderContent()->getRenderResources());
manager.unloadTileContent(tile);
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getState() == TileLoadState::Unloaded);
CHECK(tile.getContent().isUnknownContent());
CHECK(!tile.getContent().isRenderContent());
@ -340,7 +340,7 @@ TEST_CASE("Test tile state machine") {
manager.loadTileContent(tile, options);
// Unloaded -> ContentLoading
CHECK(manager.getNumOfTilesLoading() == 1);
CHECK(manager.getNumberOfTilesLoading() == 1);
CHECK(tile.getState() == TileLoadState::ContentLoading);
CHECK(tile.getChildren().empty());
CHECK(tile.getContent().isUnknownContent());
@ -349,7 +349,7 @@ TEST_CASE("Test tile state machine") {
// ContentLoading -> FailedTemporarily
manager.waitUntilIdle();
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getChildren().empty());
CHECK(tile.getState() == TileLoadState::FailedTemporarily);
CHECK(tile.getContent().isUnknownContent());
@ -360,7 +360,7 @@ TEST_CASE("Test tile state machine") {
// FailedTemporarily -> FailedTemporarily
// tile is failed temporarily but the loader can still add children to it
manager.updateTileContent(tile, options);
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getChildren().size() == 1);
CHECK(tile.getChildren().front().isEmptyContent());
CHECK(tile.getState() == TileLoadState::FailedTemporarily);
@ -371,7 +371,7 @@ TEST_CASE("Test tile state machine") {
// FailedTemporarily -> ContentLoading
manager.loadTileContent(tile, options);
CHECK(manager.getNumOfTilesLoading() == 1);
CHECK(manager.getNumberOfTilesLoading() == 1);
CHECK(tile.getState() == TileLoadState::ContentLoading);
}
@ -413,7 +413,7 @@ TEST_CASE("Test tile state machine") {
manager.loadTileContent(tile, options);
// Unloaded -> ContentLoading
CHECK(manager.getNumOfTilesLoading() == 1);
CHECK(manager.getNumberOfTilesLoading() == 1);
CHECK(tile.getState() == TileLoadState::ContentLoading);
CHECK(tile.getChildren().empty());
CHECK(tile.getContent().isUnknownContent());
@ -422,7 +422,7 @@ TEST_CASE("Test tile state machine") {
// ContentLoading -> Failed
manager.waitUntilIdle();
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getChildren().empty());
CHECK(tile.getState() == TileLoadState::Failed);
CHECK(tile.getContent().isUnknownContent());
@ -433,7 +433,7 @@ TEST_CASE("Test tile state machine") {
// Failed -> Failed
// tile is failed but the loader can still add children to it
manager.updateTileContent(tile, options);
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getChildren().size() == 1);
CHECK(tile.getChildren().front().isEmptyContent());
CHECK(tile.getState() == TileLoadState::Failed);
@ -444,7 +444,7 @@ TEST_CASE("Test tile state machine") {
// cannot transition from Failed -> ContentLoading
manager.loadTileContent(tile, options);
CHECK(manager.getNumOfTilesLoading() == 0);
CHECK(manager.getNumberOfTilesLoading() == 0);
CHECK(tile.getState() == TileLoadState::Failed);
CHECK(tile.getContent().isUnknownContent());
CHECK(!tile.getContent().isRenderContent());