Cleanup of the globebrowsing support code

This commit is contained in:
Alexander Bock
2022-07-27 15:57:21 +02:00
parent 104ae386ca
commit edb8bc2fdc
28 changed files with 518 additions and 430 deletions

View File

@@ -105,11 +105,11 @@ openspace::globebrowsing::TileTextureInitData::HashKey calculateHashKey(
namespace openspace::globebrowsing {
TileTextureInitData tileTextureInitData(layergroupid::GroupID id, bool shouldPadTiles,
size_t preferredTileSize)
TileTextureInitData tileTextureInitData(layers::Group::ID id, bool shouldPadTiles,
size_t preferredTileSize)
{
switch (id) {
case layergroupid::GroupID::HeightLayers: {
case layers::Group::ID::HeightLayers: {
const size_t tileSize = preferredTileSize ? preferredTileSize : 64;
return TileTextureInitData(
tileSize,
@@ -120,7 +120,7 @@ TileTextureInitData tileTextureInitData(layergroupid::GroupID id, bool shouldPad
TileTextureInitData::ShouldAllocateDataOnCPU::Yes
);
}
case layergroupid::GroupID::ColorLayers: {
case layers::Group::ID::ColorLayers: {
const size_t tileSize = preferredTileSize ? preferredTileSize : 512;
return TileTextureInitData(
tileSize,
@@ -130,7 +130,7 @@ TileTextureInitData tileTextureInitData(layergroupid::GroupID id, bool shouldPad
TileTextureInitData::PadTiles(shouldPadTiles)
);
}
case layergroupid::GroupID::Overlays: {
case layers::Group::ID::Overlays: {
const size_t tileSize = preferredTileSize ? preferredTileSize : 512;
return TileTextureInitData(
tileSize,
@@ -140,7 +140,7 @@ TileTextureInitData tileTextureInitData(layergroupid::GroupID id, bool shouldPad
TileTextureInitData::PadTiles(shouldPadTiles)
);
}
case layergroupid::GroupID::NightLayers: {
case layers::Group::ID::NightLayers: {
const size_t tileSize = preferredTileSize ? preferredTileSize : 512;
return TileTextureInitData(
tileSize,
@@ -150,7 +150,7 @@ TileTextureInitData tileTextureInitData(layergroupid::GroupID id, bool shouldPad
TileTextureInitData::PadTiles(shouldPadTiles)
);
}
case layergroupid::GroupID::WaterMasks: {
case layers::Group::ID::WaterMasks: {
const size_t tileSize = preferredTileSize ? preferredTileSize : 512;
return TileTextureInitData(
tileSize,