Skip to content

Commit aed82a6

Browse files
kringkring
committed
Slight reorg and renames.
1 parent 4796e16 commit aed82a6

File tree

6 files changed

+43
-41
lines changed

6 files changed

+43
-41
lines changed

‎Cesium3DTilesSelection/include/Cesium3DTilesSelection/GltfModifier.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,26 +161,26 @@ class GltfModifier {
161161
/**
162162
* @brief Checks if the given tile needs to be processed by the given
163163
* `GltfModifier` in a worker thread.
164-
* @param tile The tile to check.
165164
* @param pModifier The `GltfModifier` to check.
165+
* @param tile The tile to check.
166166
* @returns `true` if the tile needs to be processed by the `GltfModifier` in
167167
* a worker thread, or `false` otherwise.
168168
*/
169169
static bool needsWorkerThreadModification(
170-
const Tile& tile,
171-
const std::shared_ptr<GltfModifier>& pModifier);
170+
const std::shared_ptr<GltfModifier>& pModifier,
171+
const Tile& tile);
172172

173173
/**
174174
* @brief Checks if the given tile needs to be processed by the given
175175
* `GltfModifier` in the main thread.
176-
* @param tile The tile to check.
177176
* @param pModifier The `GltfModifier` to check.
177+
* @param tile The tile to check.
178178
* @returns `true` if the tile needs to be processed by the `GltfModifier` in
179179
* the main thread, or `false` otherwise.
180180
*/
181181
static bool needsMainThreadModification(
182-
const Tile& tile,
183-
const std::shared_ptr<GltfModifier>& pModifier);
182+
const std::shared_ptr<GltfModifier>& pModifier,
183+
const Tile& tile);
184184

185185
protected:
186186
GltfModifier();

‎Cesium3DTilesSelection/include/Cesium3DTilesSelection/TileContent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class CESIUM3DTILESSELECTION_API TileRenderContent {
238238
* been determined to be outdated and have been freed with
239239
* {@link IPrepareRendererResources::free}.
240240
*/
241-
void resetModifiedRenderResources() noexcept;
241+
void resetModifiedModelAndRenderResources() noexcept;
242242

243243
/**
244244
* @brief Overwrites this instance's model and renderer resources with the

‎Cesium3DTilesSelection/src/GltfModifier.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ void GltfModifier::trigger() {
6464
}
6565

6666
/*static*/ bool GltfModifier::needsWorkerThreadModification(
67-
const Tile& tile,
68-
const std::shared_ptr<GltfModifier>& pModifier) {
67+
const std::shared_ptr<GltfModifier>& pModifier,
68+
const Tile& tile) {
6969
if (!pModifier)
7070
return false;
7171

@@ -112,8 +112,8 @@ void GltfModifier::trigger() {
112112
}
113113

114114
/*static*/ bool GltfModifier::needsMainThreadModification(
115-
const Tile& tile,
116-
const std::shared_ptr<GltfModifier>& pModifier) {
115+
const std::shared_ptr<GltfModifier>& pModifier,
116+
const Tile& tile) {
117117
if (!pModifier)
118118
return false;
119119

‎Cesium3DTilesSelection/src/Tile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ bool Tile::needsWorkerThreadLoading(
278278
const std::shared_ptr<GltfModifier>& pModifier) const noexcept {
279279
return this->getState() == TileLoadState::Unloaded ||
280280
this->getState() == TileLoadState::FailedTemporarily ||
281-
GltfModifier::needsWorkerThreadModification(*this, pModifier) ||
281+
GltfModifier::needsWorkerThreadModification(pModifier, *this) ||
282282
anyRasterOverlaysNeedLoading(*this);
283283
}
284284

285285
bool Tile::needsMainThreadLoading(
286286
const std::shared_ptr<GltfModifier>& pModifier) const noexcept {
287287
return this->isRenderContent() &&
288288
(this->getState() == TileLoadState::ContentLoaded ||
289-
GltfModifier::needsMainThreadModification(*this, pModifier));
289+
GltfModifier::needsMainThreadModification(pModifier, *this));
290290
}
291291

292292
void Tile::setParent(Tile* pParent) noexcept {

‎Cesium3DTilesSelection/src/TileContent.cpp

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,46 +25,47 @@ TileRenderContent::TileRenderContent(CesiumGltf::Model&& model)
2525
_lodTransitionFadePercentage{0.0f} {}
2626

2727
const CesiumGltf::Model& TileRenderContent::getModel() const noexcept {
28-
return _model;
28+
return this->_model;
2929
}
3030

3131
CesiumGltf::Model& TileRenderContent::getModel() noexcept { return _model; }
3232

3333
void TileRenderContent::setModel(const CesiumGltf::Model& model) {
34-
_model = model;
34+
this->_model = model;
3535
}
3636

3737
void TileRenderContent::setModel(CesiumGltf::Model&& model) {
38-
_model = std::move(model);
38+
this->_model = std::move(model);
3939
}
4040

4141
GltfModifier::State TileRenderContent::getGltfModifierState() const noexcept {
42-
return _modifierState;
42+
return this->_modifierState;
4343
}
4444

4545
void TileRenderContent::setGltfModifierState(
4646
GltfModifier::State modifierState) noexcept {
47-
_modifierState = modifierState;
47+
this->_modifierState = modifierState;
4848
}
4949

5050
const std::optional<CesiumGltf::Model>&
5151
TileRenderContent::getModifiedModel() const noexcept {
52-
return _modifiedModel;
52+
return this->_modifiedModel;
5353
}
5454

5555
void TileRenderContent::setModifiedModelAndRenderResources(
5656
CesiumGltf::Model&& modifiedModel,
5757
void* pModifiedRenderResources) noexcept {
58-
_modifiedModel = std::move(modifiedModel);
59-
_pModifiedRenderResources = pModifiedRenderResources;
58+
this->_modifiedModel = std::move(modifiedModel);
59+
this->_pModifiedRenderResources = pModifiedRenderResources;
6060
}
6161

6262
void* TileRenderContent::getModifiedRenderResources() const noexcept {
63-
return _pModifiedRenderResources;
63+
return this->_pModifiedRenderResources;
6464
}
6565

66-
void TileRenderContent::resetModifiedRenderResources() noexcept {
67-
_pModifiedRenderResources = nullptr;
66+
void TileRenderContent::resetModifiedModelAndRenderResources() noexcept {
67+
this->_pModifiedRenderResources = nullptr;
68+
this->_modifiedModel.reset();
6869
}
6970

7071
void TileRenderContent::replaceWithModifiedModel() noexcept {
@@ -138,20 +139,20 @@ TileContent::TileContent(std::unique_ptr<TileExternalContent>&& content)
138139
: _contentKind{std::move(content)} {}
139140

140141
void TileContent::setContentKind(TileUnknownContent content) {
141-
_contentKind = content;
142+
this->_contentKind = content;
142143
}
143144

144145
void TileContent::setContentKind(TileEmptyContent content) {
145-
_contentKind = content;
146+
this->_contentKind = content;
146147
}
147148

148149
void TileContent::setContentKind(
149150
std::unique_ptr<TileExternalContent>&& content) {
150-
_contentKind = std::move(content);
151+
this->_contentKind = std::move(content);
151152
}
152153

153154
void TileContent::setContentKind(std::unique_ptr<TileRenderContent>&& content) {
154-
_contentKind = std::move(content);
155+
this->_contentKind = std::move(content);
155156
}
156157

157158
bool TileContent::isUnknownContent() const noexcept {

‎Cesium3DTilesSelection/src/TilesetContentManager.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,8 +1250,8 @@ void TilesetContentManager::loadTileContent(
12501250
CESIUM_TRACE("TilesetContentManager::loadTileContent");
12511251

12521252
if (GltfModifier::needsWorkerThreadModification(
1253-
tile,
1254-
this->_externals.pGltfModifier)) {
1253+
this->_externals.pGltfModifier,
1254+
tile)) {
12551255
TileRenderContent* pRenderContent = tile.getContent().getRenderContent();
12561256
CESIUM_ASSERT(pRenderContent != nullptr);
12571257
this->reapplyGltfModifier(tile, tilesetOptions, pRenderContent);
@@ -1466,21 +1466,22 @@ UnloadTileContentResult TilesetContentManager::unloadTileContent(Tile& tile) {
14661466

14671467
TileLoadState state = tile.getState();
14681468
// Test if a glTF modifier is in progress.
1469-
if (_externals.pGltfModifier) {
1470-
auto* renderContent = tile.getContent().getRenderContent();
1471-
if (renderContent) {
1472-
switch (renderContent->getGltfModifierState()) {
1469+
if (this->_externals.pGltfModifier) {
1470+
TileRenderContent* pRenderContent = tile.getContent().getRenderContent();
1471+
if (pRenderContent) {
1472+
switch (pRenderContent->getGltfModifierState()) {
14731473
case GltfModifier::State::WorkerRunning:
14741474
// Worker thread is running, we cannot unload yet.
14751475
return UnloadTileContentResult::Keep;
14761476
case GltfModifier::State::WorkerDone:
14771477
// Free temporary render resources.
1478-
CESIUM_ASSERT(renderContent->getModifiedRenderResources());
1479-
_externals.pPrepareRendererResources->free(
1478+
CESIUM_ASSERT(pRenderContent->getModifiedRenderResources());
1479+
this->_externals.pPrepareRendererResources->free(
14801480
tile,
1481-
renderContent->getModifiedRenderResources(),
1481+
pRenderContent->getModifiedRenderResources(),
14821482
nullptr);
1483-
renderContent->resetModifiedRenderResources();
1483+
pRenderContent->resetModifiedModelAndRenderResources();
1484+
pRenderContent->setGltfModifierState(GltfModifier::State::Idle);
14841485
break;
14851486
default:
14861487
break;
@@ -1682,7 +1683,7 @@ bool TilesetContentManager::discardOutdatedRenderResources(
16821683
: renderContent.getRenderResources(),
16831684
nullptr);
16841685
if (maybeModifiedModel)
1685-
renderContent.resetModifiedRenderResources();
1686+
renderContent.resetModifiedModelAndRenderResources();
16861687
else
16871688
renderContent.setRenderResources(nullptr);
16881689
renderContent.setGltfModifierState(GltfModifier::State::Idle);
@@ -1702,8 +1703,8 @@ void TilesetContentManager::finishLoading(
17021703
// Case of a tile previously loaded that went outdated with respect to the
17031704
// glTF modifier version => main-thread phase should be performed.
17041705
if (GltfModifier::needsMainThreadModification(
1705-
tile,
1706-
this->_externals.pGltfModifier)) {
1706+
this->_externals.pGltfModifier,
1707+
tile)) {
17071708
CESIUM_ASSERT( // see matching condition in Tile::needsMainThreadLoading
17081709
this->_externals.pGltfModifier &&
17091710
pRenderContent->getGltfModifierState() ==

0 commit comments

Comments
 (0)