mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-07 12:10:52 -06:00
* Solve bug related to corrupted texture tiles for certain sizes. * Regard layer settings when sampling height map. * Make Tile in to a class instead of a struct. * Memory aware lru cache. Needs cleanup. * Clean up and comment. * Clean up and comment. * Clean up * Clean up and comment. * Fix compilation error on Windows. * Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242 * Update the key type for the memory aware lru cache and use a unordered map instead of a map. * Solve pixel row size bug. * Solve initialization bug. * Add cache size as property of the globe browsing module. * Use memory aware tile cache for text tile provider. * Log GDAL errors as GHOUL messages * Add the ability to toggle tile level limiting by available data * Add ability to toggle GDAL logging * Add lock guard to memory aware tile cache * create base class rawtiledatareader that can be extended with different implementations than GDAL. * Let GdalWrapper take care of global GDAL settings. * Move iodescription to separate file * Move some functionality from gdalrawtiledatareader to rawtiledatareader * Move functionality from gdalrawtiledatareader to rawtiledatareader. * GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed. * Add ifdef check for GLOBEBROWSING_USE_GDAL * Implement SimpleRawTileDataReader. Currently can only read pow 2 textures. * Change ints to unsigned long longs * Limit number of texture creations per tile provider per frame * Solve linker error on windows * Fix Windows build errors * Fix crash in reading local patches * Update lodglobe descriptions * Abstract away overviews in gdal raw tile data reader * Update Mars and Moon configs. * Update screenshot script * Update ghoul version * Remove use of interaction depth below ellipsoid * Normalize direction vector * Use scale for distance swotch * Go back to use of interaction depth below ellipsoid * Fix comments on pull request. * TileProviderByLevel error does not propagate up. * Comment on mars and moon mod file * Add model space cut off level as a property * Update ChunkTile struct * Minor clean up * Go back tu constructor for ChunkTile
104 lines
4.8 KiB
C++
104 lines
4.8 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#include <modules/globebrowsing/tile/asynctiledataprovider.h>
|
|
|
|
#include <modules/globebrowsing/tile/loadjob/tileloadjob.h>
|
|
#include <modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h>
|
|
#include <modules/globebrowsing/tile/tilediskcache.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
AsyncTileDataProvider::AsyncTileDataProvider(
|
|
const std::shared_ptr<RawTileDataReader> rawTileDataReader,
|
|
std::shared_ptr<ThreadPool> pool)
|
|
: _rawTileDataReader(rawTileDataReader)
|
|
, _concurrentJobManager(pool)
|
|
{}
|
|
|
|
std::shared_ptr<RawTileDataReader> AsyncTileDataProvider::getRawTileDataReader() const {
|
|
return _rawTileDataReader;
|
|
}
|
|
|
|
bool AsyncTileDataProvider::enqueueTileIO(const TileIndex& tileIndex) {
|
|
if (satisfiesEnqueueCriteria(tileIndex)) {
|
|
auto job = std::make_shared<TileLoadJob>(_rawTileDataReader, tileIndex);
|
|
//auto job = std::make_shared<DiskCachedTileLoadJob>(_tileDataset, tileIndex, tileDiskCache, "ReadAndWrite");
|
|
_concurrentJobManager.enqueueJob(job);
|
|
_enqueuedTileRequests[tileIndex.hashKey()] = tileIndex;
|
|
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
std::vector<std::shared_ptr<RawTile>> AsyncTileDataProvider::getRawTiles() {
|
|
std::vector<std::shared_ptr<RawTile>> readyResults;
|
|
while (_concurrentJobManager.numFinishedJobs() > 0) {
|
|
readyResults.push_back(_concurrentJobManager.popFinishedJob()->product());
|
|
}
|
|
return readyResults;
|
|
}
|
|
|
|
std::shared_ptr<RawTile> AsyncTileDataProvider::popFinishedRawTile() {
|
|
if (_concurrentJobManager.numFinishedJobs() > 0)
|
|
return _concurrentJobManager.popFinishedJob()->product();
|
|
else
|
|
return nullptr;
|
|
}
|
|
|
|
bool AsyncTileDataProvider::satisfiesEnqueueCriteria(const TileIndex& tileIndex) const {
|
|
// only allow tile to be enqueued if it's not already enqueued
|
|
//return _futureTileIOResults.find(tileIndex.hashKey()) == _futureTileIOResults.end();
|
|
return _enqueuedTileRequests.find(tileIndex.hashKey()) == _enqueuedTileRequests.end();
|
|
|
|
}
|
|
|
|
void AsyncTileDataProvider::reset() {
|
|
//_futureTileIOResults.clear();
|
|
//_threadPool->stop(ghoul::ThreadPool::RunRemainingTasks::No);
|
|
//_threadPool->start();
|
|
_enqueuedTileRequests.clear();
|
|
_concurrentJobManager.reset();
|
|
while (_concurrentJobManager.numFinishedJobs() > 0) {
|
|
_concurrentJobManager.popFinishedJob();
|
|
}
|
|
_rawTileDataReader->reset();
|
|
}
|
|
|
|
void AsyncTileDataProvider::clearRequestQueue() {
|
|
//_threadPool->clearRemainingTasks();
|
|
//_futureTileIOResults.clear();
|
|
_concurrentJobManager.clearEnqueuedJobs();
|
|
_enqueuedTileRequests.clear();
|
|
}
|
|
|
|
float AsyncTileDataProvider::noDataValueAsFloat() const {
|
|
return _rawTileDataReader->noDataValueAsFloat();
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|