mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflict and add properties for friction and interaction parameters.

Browse Source
This commit is contained in:
kbladin
2016-06-30 14:07:51 -04:00
parent d4f89448e0 e40d393824
commit a89f474502
238 changed files with 3637 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/tile/TileProviderManager.cpp
+3 -3
View File
@@ -154,8 +154,8 @@ namespace openspace {
}
void TileProviderManager::update() {
for each (auto layerCategory in _layerCategories) {
for each (auto tileProviderWithName in layerCategory) {
for (auto layerCategory : _layerCategories) {
for (auto tileProviderWithName : layerCategory) {
if (tileProviderWithName.isActive) {
tileProviderWithName.tileProvider->update();
}
@@ -168,7 +168,7 @@ namespace openspace {
LayeredTextures::TextureCategory textureCategory)
{
std::vector<std::shared_ptr<TileProvider> > tileProviders;
for each (auto tileProviderWithName in _layerCategories[textureCategory]) {
for (auto tileProviderWithName : _layerCategories[textureCategory]) {
if (tileProviderWithName.isActive) {
tileProviders.push_back(tileProviderWithName.tileProvider);
}