Pass a TilesetSharedAssetSystem into TilesetExternals.
This commit is contained in:
parent
e8fbd40e4b
commit
3435ad6a3c
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include "Library.h"
|
||||
#include "TileOcclusionRendererProxy.h"
|
||||
#include "TilesetSharedAssetSystem.h"
|
||||
#include "spdlog-cesium.h"
|
||||
|
||||
#include <CesiumAsync/AsyncSystem.h>
|
||||
|
|
@ -69,6 +70,13 @@ public:
|
|||
*/
|
||||
std::shared_ptr<TileOcclusionRendererProxyPool> pTileOcclusionProxyPool =
|
||||
nullptr;
|
||||
|
||||
/**
|
||||
* @brief The shared asset system used to facilitate sharing of common assets,
|
||||
* such as images, between and within tilesets.
|
||||
*/
|
||||
CesiumUtility::IntrusivePointer<TilesetSharedAssetSystem> pSharedAssetSystem =
|
||||
TilesetSharedAssetSystem::getDefault();
|
||||
};
|
||||
|
||||
} // namespace Cesium3DTilesSelection
|
||||
|
|
|
|||
|
|
@ -666,7 +666,7 @@ TilesetContentManager::TilesetContentManager(
|
|||
_tileLoadsInProgress{0},
|
||||
_loadedTilesCount{0},
|
||||
_tilesDataUsed{0},
|
||||
_pSharedAssetSystem(TilesetSharedAssetSystem::getDefault()),
|
||||
_pSharedAssetSystem(externals.pSharedAssetSystem),
|
||||
_destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
|
||||
_destructionCompleteFuture{
|
||||
this->_destructionCompletePromise.getFuture().share()},
|
||||
|
|
@ -696,7 +696,7 @@ TilesetContentManager::TilesetContentManager(
|
|||
_tileLoadsInProgress{0},
|
||||
_loadedTilesCount{0},
|
||||
_tilesDataUsed{0},
|
||||
_pSharedAssetSystem(TilesetSharedAssetSystem::getDefault()),
|
||||
_pSharedAssetSystem(externals.pSharedAssetSystem),
|
||||
_destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
|
||||
_destructionCompleteFuture{
|
||||
this->_destructionCompletePromise.getFuture().share()},
|
||||
|
|
@ -848,7 +848,7 @@ TilesetContentManager::TilesetContentManager(
|
|||
_tileLoadsInProgress{0},
|
||||
_loadedTilesCount{0},
|
||||
_tilesDataUsed{0},
|
||||
_pSharedAssetSystem(TilesetSharedAssetSystem::getDefault()),
|
||||
_pSharedAssetSystem(externals.pSharedAssetSystem),
|
||||
_destructionCompletePromise{externals.asyncSystem.createPromise<void>()},
|
||||
_destructionCompleteFuture{
|
||||
this->_destructionCompletePromise.getFuture().share()},
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ struct CESIUMGLTFREADER_API GltfReaderOptions {
|
|||
* that might appear in this glTF.
|
||||
*/
|
||||
CesiumUtility::IntrusivePointer<GltfSharedAssetSystem> pSharedAssetSystem =
|
||||
nullptr;
|
||||
GltfSharedAssetSystem::getDefault();
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue