mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-02 17:51:35 -06:00
f51f293989
* Simplest possible PBO implementation. * Add PBO class * TileLoadJob owns raw tile data * Working on a soluton to cache textures and reuse them * PBO and cached textures working for one texture type. Color textures. * Threadpool for tile requests uses LRU cache as queue * Remove framesUntilRequestFlush * Clean up * Clean up * Use prioritizing concurrent job manager * Use TileTextureInitData to initialize RawTileDataReader. * Class TextureContainer owns the textures to use for tiles. * Using TileTextureInitData to determine if new caches need to be created. * Remove WriteDataDescription * Remove TileDataLayout * Rendering many different layer types again * TileProviderByLevel gives layergroup id to tile providers * Comment away use of PBO * Erase unfinished requests to make room for new ones * Enable choice of PBO or not. * Enable resetting of asynctiledataprovider * Add the ability to use PBO and also load to CPU * Update ghoul * Solve culling issue. * Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider. * Add gpudata * Move fetching of shader preprocessing data to LayerManager * No comparisons to determine shader recompilation. * Show the tile cache size in the GUI * Clean up and comment. * Solve bug where float is interpreted as NaN * Enable ability to blend between layers again * Fix single image provider * Fix windows build error * Fix OSX compile issue. * Some clean up * Showing correct texture data size * Enable use of text tile providers again. No backgroupd image path however. * Change cache size from GUI * Clean up * Solve osx compilation error. * Update ghoul * Make it possible to switch between PBO and not during runtime. * Enable resetting of tile datasets * change function module in moduleengine to identify module by name * MemoryAwareTileCache is no longer a singleton * Update ownership of properties for globe browsing * Logging info about resetting tile reader. * Logging info * Fix requested changes * Fix some compile warnings. * Fix compilation warnings * Add ability to blend values with blend parameter. Also define settings through lua dict. * Fix some comments on pull request. * Change formatting * Change formatting * Change formatting * Fix pull request comments. * Those are details * Make Mercury great again. * Make Earth great again. * Solve conflict * Test to sometimes use valueblending and sometimes not * Not always use value blending * Update ghoul * Change from auto to explicit type. * Update test for LRU Cache * Include algorithm.
115 lines
5.7 KiB
C++
115 lines
5.7 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/globebrowsingmodule.h>
|
|
|
|
#include <modules/globebrowsing/cache/memoryawaretilecache.h>
|
|
#include <modules/globebrowsing/globes/renderableglobe.h>
|
|
#include <modules/globebrowsing/other/distanceswitch.h>
|
|
#include <modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/cachingtileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/singleimageprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/temporaltileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/texttileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/tileindextileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h>
|
|
#include <modules/globebrowsing/tile/tileprovider/presentationslideprovider.h>
|
|
|
|
#include <openspace/engine/openspaceengine.h>
|
|
#include <openspace/rendering/renderable.h>
|
|
#include <openspace/util/factorymanager.h>
|
|
|
|
#include <ghoul/misc/templatefactory.h>
|
|
#include <ghoul/misc/assert.h>
|
|
|
|
#include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
|
|
|
|
namespace openspace {
|
|
|
|
const std::string GlobeBrowsingModule::name = "GlobeBrowsing";
|
|
|
|
GlobeBrowsingModule::GlobeBrowsingModule()
|
|
: OpenSpaceModule(name)
|
|
{ }
|
|
|
|
void GlobeBrowsingModule::internalInitialize() {
|
|
using namespace globebrowsing;
|
|
|
|
OsEng.registerModuleCallback(OpenSpaceEngine::CallbackOption::Initialize, [&] {
|
|
|
|
_tileCache = std::make_unique<globebrowsing::cache::MemoryAwareTileCache>();
|
|
addPropertySubOwner(*_tileCache);
|
|
|
|
#ifdef GLOBEBROWSING_USE_GDAL
|
|
// Convert from MB to Bytes
|
|
GdalWrapper::create(
|
|
16ULL * 1024ULL * 1024ULL, // 16 MB
|
|
CpuCap.installedMainMemory() * 0.25 * 1024 * 1024); // 25% of total RAM
|
|
addPropertySubOwner(GdalWrapper::ref());
|
|
#endif // GLOBEBROWSING_USE_GDAL
|
|
});
|
|
|
|
OsEng.registerModuleCallback(OpenSpaceEngine::CallbackOption::Render, [&]{
|
|
_tileCache->update();
|
|
});
|
|
|
|
|
|
OsEng.registerModuleCallback(OpenSpaceEngine::CallbackOption::Deinitialize, [&]{
|
|
#ifdef GLOBEBROWSING_USE_GDAL
|
|
GdalWrapper::ref().destroy();
|
|
#endif // GLOBEBROWSING_USE_GDAL
|
|
});
|
|
|
|
auto fRenderable = FactoryManager::ref().factory<Renderable>();
|
|
ghoul_assert(fRenderable, "Renderable factory was not created");
|
|
fRenderable->registerClass<globebrowsing::RenderableGlobe>("RenderableGlobe");
|
|
|
|
// add Tile Provider factory
|
|
auto fTileProvider = std::make_unique<ghoul::TemplateFactory<tileprovider::TileProvider>>();
|
|
|
|
fTileProvider->registerClass<tileprovider::CachingTileProvider>("LRUCaching");
|
|
fTileProvider->registerClass<tileprovider::SingleImageProvider>("SingleImage");
|
|
#ifdef GLOBEBROWSING_USE_GDAL
|
|
fTileProvider->registerClass<tileprovider::TemporalTileProvider>("Temporal");
|
|
#endif // GLOBEBROWSING_USE_GDAL
|
|
|
|
fTileProvider->registerClass<tileprovider::TileIndexTileProvider>("TileIndex");
|
|
fTileProvider->registerClass<tileprovider::SizeReferenceTileProvider>("SizeReference");
|
|
|
|
// Combining Tile Providers
|
|
fTileProvider->registerClass<tileprovider::TileProviderByLevel>("ByLevel");
|
|
fTileProvider->registerClass<tileprovider::TileProviderByIndex>("ByIndex");
|
|
fTileProvider->registerClass<tileprovider::PresentationSlideProvider>("PresentationSlides");
|
|
FactoryManager::ref().addFactory(std::move(fTileProvider));
|
|
}
|
|
|
|
globebrowsing::cache::MemoryAwareTileCache* GlobeBrowsingModule::tileCache() {
|
|
return _tileCache.get();
|
|
}
|
|
|
|
} // namespace openspace
|