mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globe-generalization' of github.com:OpenSpace/OpenSpace into feature/globe-generalization

Browse Source
This commit is contained in:
Kalle Bladin
2017-08-15 11:03:38 +02:00
parent 52b257a62c 1fb5273b85
commit 59694c8213
38 changed files with 684 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/cache/memoryawaretilecache.cpp
Vendored
+1 -1
View File
@@ -143,7 +143,7 @@ void MemoryAwareTileCache::clear() {
void MemoryAwareTileCache::createDefaultTextureContainers() {
for (int id = 0; id < layergroupid::NUM_LAYER_GROUPS; id++) {
TileTextureInitData initData =
LayerManager::getTileTextureInitData(layergroupid::GroupID(id));
LayerManager::getTileTextureInitData(layergroupid::GroupID(id), true);
assureTextureContainerExists(initData);
}
}
modules/globebrowsing/cache/texturecontainer.cpp
Vendored
+1 -1
View File
@@ -45,7 +45,7 @@ void TextureContainer::reset() {
for (size_t i = 0; i < _numTextures; ++i)
{
auto tex = std::make_unique<ghoul::opengl::Texture>(
_initData.dimensionsWithPadding(),
_initData.dimensions(),
_initData.ghoulTextureFormat(),
_initData.glTextureFormat(),
_initData.glType(),