mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

TileProvider enqueues tiles at lower level first

Browse Source
This commit is contained in:
Erik Broberg
2016-05-16 19:10:39 -04:00
parent 33d1d1a31d
commit 025a221df2
6 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/patchrenderer.cpp
+8 -8
View File
@@ -172,7 +172,7 @@ namespace openspace {
{
auto tileProvider = it->second;
// Get the texture that should be used for rendering
Tile tile = tileProvider->getMostHiResTile(chunk.index());
Tile tile = tileProvider->getHighestResolutionTile(chunk.index());
TileDepthTransform depthTransform = tileProvider->depthTransform();
// The texture needs a unit to sample from
@@ -206,7 +206,7 @@ namespace openspace {
{
auto tileProvider = it->second;
// Get the texture that should be used for rendering
Tile tile = tileProvider->getMostHiResTile(chunk.index());
Tile tile = tileProvider->getHighestResolutionTile(chunk.index());
// The texture needs a unit to sample from
texUnitColor.activate();
@@ -271,7 +271,7 @@ namespace openspace {
//auto tileProviderHeight = heightMapProviders.begin()->second;
// Get the textures that should be used for rendering
Tile heightTile = tileProviderHeight->getMostHiResTile(chunk.index());
Tile heightTile = tileProviderHeight->getHighestResolutionTile(chunk.index());
// Bind and use the texture
@@ -291,7 +291,7 @@ namespace openspace {
// Pick the first color texture
auto colorTextureProviders = _tileProviderManager->colorTextureProviders();
auto tileProviderColor = colorTextureProviders.begin()->second;
Tile colorTile = tileProviderColor->getMostHiResTile(chunk.index());
Tile colorTile = tileProviderColor->getHighestResolutionTile(chunk.index());
// Bind and use the texture
@@ -364,7 +364,7 @@ namespace openspace {
{
auto tileProvider = it->second;
// Get the texture that should be used for rendering
Tile tile = tileProvider->getMostHiResTile(chunk.index());
Tile tile = tileProvider->getHighestResolutionTile(chunk.index());
TileDepthTransform depthTransform = tileProvider->depthTransform();
// The texture needs a unit to sample from
@@ -398,7 +398,7 @@ namespace openspace {
{
auto tileProvider = it->second;
// Get the texture that should be used for rendering
Tile tile = tileProvider->getMostHiResTile(chunk.index());
Tile tile = tileProvider->getHighestResolutionTile(chunk.index());
// The texture needs a unit to sample from
texUnitColor.activate();
@@ -502,7 +502,7 @@ namespace openspace {
auto tileProviderHeight = heightMapProviders.begin()->second;
// Get the textures that should be used for rendering
Tile heightTile = tileProviderHeight->getMostHiResTile(chunk.index());
Tile heightTile = tileProviderHeight->getHighestResolutionTile(chunk.index());
// Bind and use the texture
ghoul::opengl::TextureUnit texUnitHeight;
@@ -519,7 +519,7 @@ namespace openspace {
// Pick the first color texture
auto colorTextureProviders = _tileProviderManager->colorTextureProviders();
auto tileProviderColor = colorTextureProviders.begin()->second;
Tile colorTile = tileProviderColor->getMostHiResTile(chunk.index());
Tile colorTile = tileProviderColor->getHighestResolutionTile(chunk.index());
// Bind and use the texture