mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 07:19:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

More work on making use of nested namespaces

Browse Source
This commit is contained in:
Alexander Bock
2017-07-16 01:55:35 -04:00
parent 4dba552fd1
commit 26682669ff
160 changed files with 726 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/tile/tileselector.cpp
+7 -10
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -28,12 +28,11 @@
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <modules/globebrowsing/rendering/layer/layerrendersettings.h>
namespace openspace {
namespace globebrowsing {
namespace tileselector {
namespace openspace::globebrowsing::tileselector {
ChunkTile getHighestResolutionTile(const LayerGroup& layerGroup,
const TileIndex& tileIndex) {
const TileIndex& tileIndex)
{
TileUvTransform uvTransform;
uvTransform.uvScale.x = 0;
ChunkTile mostHighResolution{
@@ -76,7 +75,7 @@ std::vector<ChunkTile> getTilesSortedByHighestResolution(const LayerGroup& layer
}
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
std::vector<std::pair<ChunkTile, const LayerRenderSettings*>>
getTilesAndSettingsSortedByHighestResolution(const LayerGroup& layerGroup,
const TileIndex& tileIndex)
{
@@ -98,7 +97,7 @@ getTilesAndSettingsSortedByHighestResolution(const LayerGroup& layerGroup,
return tilesAndSettings;
}
std::vector<std::pair<ChunkTile, const LayerRenderSettings*> >
std::vector<std::pair<ChunkTile, const LayerRenderSettings*>>
getTilesAndSettingsUnsorted(const LayerGroup& layerGroup,
const TileIndex& tileIndex)
{
@@ -123,6 +122,4 @@ void ascendToParent(TileIndex& tileIndex, TileUvTransform& uv) {
--tileIndex;
}
} // namespace tileselector¢
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::tileselector