mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 04:18:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change prerender() to update() in TileProvider and related classes

Browse Source
This commit is contained in:
Erik Broberg
2016-06-22 19:11:14 -04:00
parent 1f62736bc6
commit d7c45fcf60
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -177,7 +177,7 @@ namespace openspace {
_chunkedLodGlobe->lodScaleFactor = lodScaleFactor.value();
_chunkedLodGlobe->atmosphereEnabled = atmosphereEnabled.value();
_tileProviderManager->prerender();
_tileProviderManager->update();
}
glm::dvec3 RenderableGlobe::projectOnEllipsoid(glm::dvec3 position) {

4
modules/globebrowsing/tile/TileProviderManager.cpp
View File

@@ -138,11 +138,11 @@ namespace openspace {
return _layerCategories[category];
}
void TileProviderManager::prerender() {
void TileProviderManager::update() {
for each (auto layerCategory in _layerCategories) {
for each (auto tileProviderWithName in layerCategory) {
if (tileProviderWithName.isActive) {
tileProviderWithName.tileProvider->prerender();
tileProviderWithName.tileProvider->update();
}
}
}

2
modules/globebrowsing/tile/TileProviderManager.h
View File

@@ -64,7 +64,7 @@ namespace openspace {
const std::vector<std::shared_ptr<TileProvider> >
getActivatedLayerCategory(LayeredTextures::TextureCategory);
void prerender();
void update();
private:
static void initTexures(std::vector<TileProviderWithName>& destination,

20
modules/globebrowsing/tile/temporaltileprovider.cpp
View File

@@ -109,8 +109,8 @@ namespace openspace {
TileDepthTransform TemporalTileProvider::depthTransform() {
if (_currentTileProvider == nullptr) {
LDEBUG("Warning: had to call prerender from depthTransform()");
prerender();
LDEBUG("Warning: had to call update from depthTransform()");
update();
}
return _currentTileProvider->depthTransform();
@@ -118,8 +118,8 @@ namespace openspace {
Tile::Status TemporalTileProvider::getTileStatus(const ChunkIndex& chunkIndex) {
if (_currentTileProvider == nullptr) {
LDEBUG("Warning: had to call prerender from getTileStatus()");
prerender();
LDEBUG("Warning: had to call update from getTileStatus()");
update();
}
return _currentTileProvider->getTileStatus(chunkIndex);
@@ -127,8 +127,8 @@ namespace openspace {
Tile TemporalTileProvider::getTile(const ChunkIndex& chunkIndex) {
if (_currentTileProvider == nullptr) {
LDEBUG("Warning: had to call prerender from getTile()");
prerender();
LDEBUG("Warning: had to call update from getTile()");
update();
}
return _currentTileProvider->getTile(chunkIndex);
@@ -136,15 +136,15 @@ namespace openspace {
void TemporalTileProvider::prerender() {
void TemporalTileProvider::update() {
_currentTileProvider = getTileProvider();
_currentTileProvider->prerender();
_currentTileProvider->update();
}
std::shared_ptr<AsyncTileDataProvider> TemporalTileProvider::getAsyncTileReader() {
if (_currentTileProvider == nullptr) {
LDEBUG("Warning: had to call prerender from getAsyncTileReader()");
prerender();
LDEBUG("Warning: had to call update from getAsyncTileReader()");
update();
}
return _currentTileProvider->getAsyncTileReader();

2
modules/globebrowsing/tile/temporaltileprovider.h
View File

@@ -123,7 +123,7 @@ namespace openspace {
virtual Tile getTile(const ChunkIndex& chunkIndex);
virtual Tile::Status getTileStatus(const ChunkIndex& chunkIndex);
virtual TileDepthTransform depthTransform();
virtual void prerender();
virtual void update();
virtual std::shared_ptr<AsyncTileDataProvider> getAsyncTileReader();

2
modules/globebrowsing/tile/tileprovider.cpp
View File

@@ -68,7 +68,7 @@ namespace openspace {
}
void CachingTileProvider::prerender() {
void CachingTileProvider::update() {
initTexturesFromLoadedData();
if (_framesSinceLastRequestFlush++ > _framesUntilRequestFlush) {
clearRequestQueue();

4
modules/globebrowsing/tile/tileprovider.h
View File

@@ -70,7 +70,7 @@ namespace openspace {
virtual Tile getTile(const ChunkIndex& chunkIndex) = 0;
virtual Tile::Status getTileStatus(const ChunkIndex& index) = 0;
virtual TileDepthTransform depthTransform() = 0;
virtual void prerender() = 0;
virtual void update() = 0;
virtual std::shared_ptr<AsyncTileDataProvider> getAsyncTileReader() = 0;
};
@@ -96,7 +96,7 @@ namespace openspace {
virtual Tile getTile(const ChunkIndex& chunkIndex);
virtual Tile::Status getTileStatus(const ChunkIndex& index);
virtual TileDepthTransform depthTransform();
virtual void prerender();
virtual void update();
virtual std::shared_ptr<AsyncTileDataProvider> getAsyncTileReader();