Flip parameter order.
This commit is contained in:
parent
4552af8541
commit
726b621ca3
|
|
@ -176,14 +176,14 @@ public:
|
|||
*
|
||||
* Any existing raster overlays on the tile will be cleared.
|
||||
*
|
||||
* @param tile The tile for which to add the overlays.
|
||||
* @param tilesetOptions The {@link TilesetOptions} for the tileset to which
|
||||
* the tile belongs.
|
||||
* @param tile The tile for which to add the overlays.
|
||||
* @returns The list of projections required by the overlays that were added
|
||||
* to the tile.
|
||||
*/
|
||||
std::vector<CesiumGeospatial::Projection>
|
||||
addTileOverlays(const TilesetOptions& tilesetOptions, Tile& tile) noexcept;
|
||||
addTileOverlays(Tile& tile, const TilesetOptions& tilesetOptions) noexcept;
|
||||
|
||||
/**
|
||||
* @brief Updates the raster overlays associated with a tile.
|
||||
|
|
@ -194,13 +194,13 @@ public:
|
|||
* this tile should be upsampled in order to attach further raster overlay
|
||||
* detail.
|
||||
*
|
||||
* @param tile The tile for which to update the overlays.
|
||||
* @param tilesetOptions The {@link TilesetOptions} for the tileset to which
|
||||
* the tile belongs.
|
||||
* @param tile The tile for which to update the overlays.
|
||||
* @returns Details of the raster overlays attached to this tile.
|
||||
*/
|
||||
TileRasterOverlayStatus
|
||||
updateTileOverlays(const TilesetOptions& tilesetOptions, Tile& tile) noexcept;
|
||||
updateTileOverlays(Tile& tile, const TilesetOptions& tilesetOptions) noexcept;
|
||||
|
||||
private:
|
||||
struct GetOverlayFunctor;
|
||||
|
|
|
|||
|
|
@ -155,8 +155,8 @@ void RasterOverlayCollection::remove(
|
|||
|
||||
std::vector<CesiumGeospatial::Projection>
|
||||
RasterOverlayCollection::addTileOverlays(
|
||||
const TilesetOptions& tilesetOptions,
|
||||
Tile& tile) noexcept {
|
||||
Tile& tile,
|
||||
const TilesetOptions& tilesetOptions) noexcept {
|
||||
// When a tile temporarily fails to load, it may still
|
||||
// have mapped raster tiles, so clear them here
|
||||
tile.getMappedRasterTiles().clear();
|
||||
|
|
@ -184,8 +184,8 @@ RasterOverlayCollection::addTileOverlays(
|
|||
}
|
||||
|
||||
TileRasterOverlayStatus RasterOverlayCollection::updateTileOverlays(
|
||||
const TilesetOptions& tilesetOptions,
|
||||
Tile& tile) noexcept {
|
||||
Tile& tile,
|
||||
const TilesetOptions& tilesetOptions) noexcept {
|
||||
TileRasterOverlayStatus result{};
|
||||
|
||||
std::vector<RasterMappedTo3DTile>& rasterTiles = tile.getMappedRasterTiles();
|
||||
|
|
|
|||
|
|
@ -1044,7 +1044,7 @@ void TilesetContentManager::loadTileContent(
|
|||
|
||||
// map raster overlay to tile
|
||||
std::vector<CesiumGeospatial::Projection> projections =
|
||||
this->_overlayCollection.addTileOverlays(tilesetOptions, tile);
|
||||
this->_overlayCollection.addTileOverlays(tile, tilesetOptions);
|
||||
|
||||
// begin loading tile
|
||||
notifyTileStartLoading(&tile);
|
||||
|
|
@ -1829,7 +1829,7 @@ void TilesetContentManager::updateDoneState(
|
|||
const TileRenderContent* pRenderContent = content.getRenderContent();
|
||||
if (pRenderContent) {
|
||||
TileRasterOverlayStatus status =
|
||||
this->_overlayCollection.updateTileOverlays(tilesetOptions, tile);
|
||||
this->_overlayCollection.updateTileOverlays(tile, tilesetOptions);
|
||||
|
||||
if (status.firstIndexWithMissingProjection) {
|
||||
// The mesh doesn't have the right texture coordinates for this
|
||||
|
|
|
|||
Loading…
Reference in New Issue