diff --git a/data/scene/lodearth/lodearth.mod b/data/scene/lodearth/lodearth.mod index 039ad48c39..693c0c6e6d 100644 --- a/data/scene/lodearth/lodearth.mod +++ b/data/scene/lodearth/lodearth.mod @@ -49,11 +49,6 @@ return { CameraMinHeight = 300, InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values SegmentsPerPatch = 64, - TextureInitData = { - ColorTextureMinimumSize = 512,--512, - OverlayMinimumSize = 512, - HeightMapMinimumSize = 64, - }, Textures = { ColorTextures = { { diff --git a/data/scene/lodmars/lodmars.mod b/data/scene/lodmars/lodmars.mod index cdea432ffc..dd03008a86 100644 --- a/data/scene/lodmars/lodmars.mod +++ b/data/scene/lodmars/lodmars.mod @@ -34,11 +34,6 @@ return { CameraMinHeight = 1000, InteractionDepthBelowEllipsoid = 10000, -- Useful when having negative height map values SegmentsPerPatch = 64, - TextureInitData = { - ColorTextureMinimumSize = 512, - OverlayMinimumSize = 512, - HeightMapMinimumSize = 64, - }, Textures = { ColorTextures = { { diff --git a/data/scene/lodmercury/lodmercury.mod b/data/scene/lodmercury/lodmercury.mod index 5874525f16..f5a818a0bb 100644 --- a/data/scene/lodmercury/lodmercury.mod +++ b/data/scene/lodmercury/lodmercury.mod @@ -37,11 +37,6 @@ return { CameraMinHeight = 300, InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values SegmentsPerPatch = 64, - TextureInitData = { - ColorTextureMinimumSize = 512, - OverlayMinimumSize = 512, - HeightMapMinimumSize = 64, - }, Textures = { ColorTextures = { { diff --git a/data/scene/lodmoon/lodmoon.mod b/data/scene/lodmoon/lodmoon.mod index 710d69045c..9e41a56ae7 100644 --- a/data/scene/lodmoon/lodmoon.mod +++ b/data/scene/lodmoon/lodmoon.mod @@ -22,11 +22,6 @@ return { CameraMinHeight = 300, InteractionDepthBelowEllipsoid = 5000, -- Useful when having negative height map values SegmentsPerPatch = 64, - TextureInitData = { - ColorTextureMinimumSize = 512,--512, - OverlayMinimumSize = 512, - HeightMapMinimumSize = 64, - }, Textures = { ColorTextures = { diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp index 7efdb0535f..3569309725 100644 --- a/modules/globebrowsing/globes/renderableglobe.cpp +++ b/modules/globebrowsing/globes/renderableglobe.cpp @@ -50,7 +50,6 @@ namespace { "InteractionDepthBelowEllipsoid"; const std::string keyCameraMinHeight = "CameraMinHeight"; const std::string keySegmentsPerPatch = "SegmentsPerPatch"; - const std::string keyTextureInitData = "TextureInitData"; const std::string keyTextures = "Textures"; const std::string keyColorTextures = "ColorTextures"; const std::string keyHeightMaps = "HeightMaps"; @@ -160,13 +159,10 @@ namespace globebrowsing { _generalProperties.cameraMinHeight.set(cameraMinHeight); // Init tile provider manager - ghoul::Dictionary textureInitDataDictionary; ghoul::Dictionary texturesDictionary; - dictionary.getValue(keyTextureInitData, textureInitDataDictionary); dictionary.getValue(keyTextures, texturesDictionary); - _tileProviderManager = std::make_shared( - texturesDictionary, textureInitDataDictionary); + _tileProviderManager = std::make_shared(texturesDictionary); _chunkedLodGlobe = std::make_shared( *this, patchSegments, _tileProviderManager); diff --git a/modules/globebrowsing/tile/tileprovidermanager.cpp b/modules/globebrowsing/tile/tileprovidermanager.cpp index 0f1d79b5ca..83997a682d 100644 --- a/modules/globebrowsing/tile/tileprovidermanager.cpp +++ b/modules/globebrowsing/tile/tileprovidermanager.cpp @@ -72,8 +72,7 @@ namespace globebrowsing { // Tile Provider Manager // ////////////////////////////////////////////////////////////////////////////////////// TileProviderManager::TileProviderManager( - const ghoul::Dictionary& textureCategoriesDictionary, - const ghoul::Dictionary& textureInitDictionary){ + const ghoul::Dictionary& textureCategoriesDictionary){ // Create all the categories of tile providers for (size_t i = 0; i < textureCategoriesDictionary.size(); i++) { ghoul::Dictionary texturesDict = textureCategoriesDictionary.value( @@ -86,22 +85,7 @@ namespace globebrowsing { TileProviderInitData initData; - if (i == LayeredTextures::ColorTextures || - i == LayeredTextures::NightTextures || - i == LayeredTextures::WaterMasks || - i == LayeredTextures::GrayScaleOverlays) { - initData.minimumPixelSize = textureInitDictionary.value("ColorTextureMinimumSize"); - } - else if (i == LayeredTextures::Overlays) { - initData.minimumPixelSize = textureInitDictionary.value("OverlayMinimumSize"); - } - else if (i == LayeredTextures::HeightMaps) { - initData.minimumPixelSize = textureInitDictionary.value("HeightMapMinimumSize"); - } - else { - initData.minimumPixelSize = 512; - } - + initData.minimumPixelSize = 512; initData.threads = 1; initData.cacheSize = 5000; initData.framesUntilRequestQueueFlush = 60; diff --git a/modules/globebrowsing/tile/tileprovidermanager.h b/modules/globebrowsing/tile/tileprovidermanager.h index 43495e7058..07f0c074ca 100644 --- a/modules/globebrowsing/tile/tileprovidermanager.h +++ b/modules/globebrowsing/tile/tileprovidermanager.h @@ -62,9 +62,7 @@ namespace globebrowsing { class TileProviderManager { public: - TileProviderManager( - const ghoul::Dictionary& textureCategoriesDictionary, - const ghoul::Dictionary& textureInitDictionary); + TileProviderManager(const ghoul::Dictionary& textureCategoriesDictionary); ~TileProviderManager(); TileProviderGroup& getTileProviderGroup(size_t groupId);