Skip to content

Commit c063103

Browse files
committed
Remove more unused version parameters.
1 parent f7e116b commit c063103

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

Cesium3DTilesSelection/include/Cesium3DTilesSelection/Tileset.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,6 @@ class CESIUM3DTILESSELECTION_API Tileset final {
594594
float deltaTime,
595595
ViewUpdateResult& result) const noexcept;
596596

597-
std::optional<int> getGltfModifierVersion() const;
598-
599597
TilesetExternals _externals;
600598
CesiumAsync::AsyncSystem _asyncSystem;
601599

@@ -624,8 +622,7 @@ class CESIUM3DTILESSELECTION_API Tileset final {
624622

625623
static TraversalDetails createTraversalDetailsForSingleTile(
626624
const TilesetFrameState& frameState,
627-
const Tile& tile,
628-
std::optional<int> modelVersion);
625+
const Tile& tile);
629626
};
630627

631628
} // namespace Cesium3DTilesSelection

Cesium3DTilesSelection/src/Tileset.cpp

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -972,10 +972,8 @@ Tileset::TraversalDetails Tileset::_visitTileIfNeeded(
972972
TileLoadPriorityGroup::Normal,
973973
tilePriority);
974974

975-
traversalDetails = Tileset::createTraversalDetailsForSingleTile(
976-
frameState,
977-
tile,
978-
getGltfModifierVersion());
975+
traversalDetails =
976+
Tileset::createTraversalDetailsForSingleTile(frameState, tile);
979977
} else if (this->_options.preloadSiblings) {
980978
// Preload this culled sibling as requested.
981979
addTileToLoadQueue(
@@ -1030,10 +1028,7 @@ Tileset::TraversalDetails Tileset::_renderLeaf(
10301028
TileLoadPriorityGroup::Normal,
10311029
tilePriority);
10321030

1033-
return Tileset::createTraversalDetailsForSingleTile(
1034-
frameState,
1035-
tile,
1036-
getGltfModifierVersion());
1031+
return Tileset::createTraversalDetailsForSingleTile(frameState, tile);
10371032
}
10381033

10391034
namespace {
@@ -1078,17 +1073,7 @@ Tileset::TraversalDetails Tileset::_renderInnerTile(
10781073
TileSelectionState(TileSelectionState::Result::Rendered);
10791074
result.tilesToRenderThisFrame.emplace_back(&tile);
10801075

1081-
return Tileset::createTraversalDetailsForSingleTile(
1082-
frameState,
1083-
tile,
1084-
getGltfModifierVersion());
1085-
}
1086-
1087-
std::optional<int> Tileset::getGltfModifierVersion() const {
1088-
if (_externals.pGltfModifier)
1089-
return _externals.pGltfModifier->getCurrentVersion();
1090-
else
1091-
return std::nullopt;
1076+
return Tileset::createTraversalDetailsForSingleTile(frameState, tile);
10921077
}
10931078

10941079
bool Tileset::_loadAndRenderAdditiveRefinedTile(
@@ -1175,7 +1160,6 @@ bool Tileset::_kickDescendantsAndRenderTile(
11751160
getPreviousState(frameState.viewGroup, tile).getResult();
11761161
const bool wasRenderedLastFrame =
11771162
lastFrameSelectionState == TileSelectionState::Result::Rendered;
1178-
auto const modifierVersion = getGltfModifierVersion();
11791163
const bool wasReallyRenderedLastFrame =
11801164
wasRenderedLastFrame && tile.isRenderable();
11811165

@@ -1557,8 +1541,7 @@ void Tileset::addTileToLoadQueue(
15571541

15581542
Tileset::TraversalDetails Tileset::createTraversalDetailsForSingleTile(
15591543
const TilesetFrameState& frameState,
1560-
const Tile& tile,
1561-
std::optional<int> /* modelVersion */) {
1544+
const Tile& tile) {
15621545
TileSelectionState::Result lastFrameResult =
15631546
getPreviousState(frameState.viewGroup, tile).getResult();
15641547

0 commit comments

Comments
 (0)