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

Started switching OpenSpace projects to nested namespaces

Browse Source 
Various cleanups
This commit is contained in:
Alexander Bock
2017-07-15 20:01:55 -04:00
parent 9d4215695d
commit 4dba552fd1
331 changed files with 1126 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/cache/lrucache.h
Vendored
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -29,9 +29,7 @@
#include <unordered_map>
#include <vector>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace openspace::globebrowsing::cache {
/**
* Templated class implementing a Least-Recently-Used Cache.
@@ -83,9 +81,7 @@ private:
size_t _maximumCacheSize;
};
} // namespace cache
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::cache
#include <modules/globebrowsing/cache/lrucache.inl>
modules/globebrowsing/cache/lrucache.inl
Vendored
+3 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -24,9 +24,7 @@
#include <ghoul/misc/assert.h>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace openspace::globebrowsing::cache {
template<typename KeyType, typename ValueType, typename HasherType>
LRUCache<KeyType, ValueType, HasherType>::LRUCache(size_t size)
@@ -163,6 +161,4 @@ LRUCache<KeyType, ValueType, HasherType>::cleanAndFetchPopped()
return toReturn;
}
} // namespace cache
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::cache
modules/globebrowsing/cache/memoryawaretilecache.h
Vendored
+3 -8
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -41,9 +41,7 @@
#include <vector>
#include <unordered_map>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace openspace::globebrowsing::cache {
struct ProviderTileKey {
TileIndex tileIndex;
@@ -87,7 +85,6 @@ struct ProviderTileHasher {
class MemoryAwareTileCache : public properties::PropertyOwner {
public:
MemoryAwareTileCache();
~MemoryAwareTileCache();
@@ -131,8 +128,6 @@ private:
properties::BoolProperty _usePbo;
};
} // namespace cache
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::cache
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___MEMORY_AWARE_TILE_CACHE___H__
modules/globebrowsing/cache/texturecontainer.h
Vendored
+4 -9
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,16 +30,13 @@
#include <memory>
#include <vector>
namespace openspace {
namespace globebrowsing {
namespace cache {
namespace openspace::globebrowsing::cache {
/**
* Owner of texture data used for tiles. Instead of dynamically allocating textures one
* by one, they are created once and reused.
*/
class TextureContainer
{
class TextureContainer {
public:
/**
* \param initData is the description of the texture type.
@@ -74,8 +71,6 @@ private:
size_t _numTextures;
};
} // namespace cache
} // namespace globebrowsing
} // namespace openspace
} // namespace openspace::globebrowsing::cache
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXTURE_CONTAINER___H__