mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58: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/tile/tile.cpp
-22
View File
@@ -38,26 +38,4 @@ Tile::Tile(ghoul::opengl::Texture* texture,
, _status(status)
{ }
glm::vec2 Tile::compensateSourceTextureSampling(glm::vec2 startOffset, glm::vec2 sizeDiff,
glm::uvec2 resolution, glm::vec2 tileUV)
{
glm::vec2 sourceSize = glm::vec2(resolution) + sizeDiff;
glm::vec2 currentSize = glm::vec2(resolution);
glm::vec2 sourceToCurrentSize = currentSize / sourceSize;
tileUV = sourceToCurrentSize * (tileUV - startOffset / sourceSize);
return tileUV;
}
glm::vec2 Tile::TileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
glm::vec2 tileUV, glm::uvec2 resolution)
{
glm::vec2 uv = uvTransform.uvOffset + uvTransform.uvScale * tileUV;
uv = compensateSourceTextureSampling(
TileTextureInitData::tilePixelStartOffset,
TileTextureInitData::tilePixelSizeDifference,
resolution,
uv);
return uv;
}
} // namespace openspace::globebrowsing