From bc77baeb02eab341fc6d8dfe6a87e8ffe5f6d59e Mon Sep 17 00:00:00 2001 From: Erik Broberg Date: Tue, 5 Jul 2016 13:35:14 -0400 Subject: [PATCH] Use texture tile padding --- modules/globebrowsing/shaders/tile.hglsl | 2 +- modules/globebrowsing/tile/tiledataset.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/globebrowsing/shaders/tile.hglsl b/modules/globebrowsing/shaders/tile.hglsl index 6cd5403387..e58f93a169 100644 --- a/modules/globebrowsing/shaders/tile.hglsl +++ b/modules/globebrowsing/shaders/tile.hglsl @@ -83,7 +83,7 @@ vec2 compensateSourceTextureSampling(vec2 startOffset, vec2 sizeDiff, const Tile vec2 TileUVToTextureSamplePosition(const Tile tile, vec2 tileUV){ vec2 uv = tile.uvTransform.uvOffset + tile.uvTransform.uvScale * tileUV; - uv = compensateSourceTextureSampling(vec2(0), vec2(0), tile, uv); + uv = compensateSourceTextureSampling(vec2(-2), vec2(4), tile, uv); return uv; } diff --git a/modules/globebrowsing/tile/tiledataset.cpp b/modules/globebrowsing/tile/tiledataset.cpp index 6039292e67..239f2601f3 100644 --- a/modules/globebrowsing/tile/tiledataset.cpp +++ b/modules/globebrowsing/tile/tiledataset.cpp @@ -83,8 +83,8 @@ namespace openspace { // Tile Dataset // ////////////////////////////////////////////////////////////////////////////////// - const glm::ivec2 TileDataset::tilePixelStartOffset = glm::ivec2(0); - const glm::ivec2 TileDataset::tilePixelSizeDifference = glm::ivec2(0); + const glm::ivec2 TileDataset::tilePixelStartOffset = glm::ivec2(-2); + const glm::ivec2 TileDataset::tilePixelSizeDifference = glm::ivec2(4); const PixelRegion TileDataset::padding = PixelRegion(tilePixelStartOffset, tilePixelSizeDifference);