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

Tiles now have the same size even if padding is enabled.

Browse Source
This commit is contained in:
Kalle Bladin
2017-08-08 16:11:16 +02:00
parent 559a8063bc
commit 71f811fcd8
12 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/tile/tiletextureinitdata.cpp
+16 -22
View File
@@ -28,8 +28,8 @@
namespace openspace::globebrowsing {
const glm::ivec2 TileTextureInitData::TilePixelStartOffset = glm::ivec2(-1);
const glm::ivec2 TileTextureInitData::TilePixelSizeDifference = glm::ivec2(2);
const glm::ivec2 TileTextureInitData::TilePixelStartOffset = glm::ivec2(-2);
const glm::ivec2 TileTextureInitData::TilePixelSizeDifference = glm::ivec2(4);
TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum glType,
Format textureFormat, bool padTiles, ShouldAllocateDataOnCPU shouldAllocateDataOnCPU)
@@ -41,14 +41,12 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum glT
_tilePixelStartOffset = padTiles ? TilePixelStartOffset : glm::ivec2(0);
_tilePixelSizeDifference = padTiles ? TilePixelSizeDifference : glm::ivec2(0);
_dimensionsWithoutPadding = glm::ivec3(width, height, 1);
_dimensionsWithPadding = glm::ivec3( width + _tilePixelSizeDifference.x, height + _tilePixelSizeDifference.y,
1);
_dimensions = glm::ivec3(width, height, 1);
_nRasters = tiledatatype::numberOfRasters(_ghoulTextureFormat);
_bytesPerDatum = tiledatatype::numberOfBytes(glType);
_bytesPerPixel = _nRasters * _bytesPerDatum;
_bytesPerLine = _bytesPerPixel * _dimensionsWithPadding.x;
_totalNumBytes = _bytesPerLine * _dimensionsWithPadding.y;
_bytesPerLine = _bytesPerPixel * _dimensions.x;
_totalNumBytes = _bytesPerLine * _dimensions.y;
_glTextureFormat = tiledatatype::glTextureFormat(_glType,
_ghoulTextureFormat);
calculateHashKey();
@@ -56,20 +54,16 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum glT
TileTextureInitData::TileTextureInitData(const TileTextureInitData& original)
: TileTextureInitData(
original.dimensionsWithoutPadding().x,
original.dimensionsWithoutPadding().y,
original.dimensions().x,
original.dimensions().y,
original.glType(),
original.ghoulTextureFormat(),
original._padTiles,
original.shouldAllocateDataOnCPU() ? ShouldAllocateDataOnCPU::Yes : ShouldAllocateDataOnCPU::No)
{ };
glm::ivec3 TileTextureInitData::dimensionsWithPadding() const {
return _dimensionsWithPadding;
}
glm::ivec3 TileTextureInitData::dimensionsWithoutPadding() const {
return _dimensionsWithoutPadding;
glm::ivec3 TileTextureInitData::dimensions() const {
return _dimensions;
}
glm::ivec2 TileTextureInitData::tilePixelStartOffset() const {
@@ -121,18 +115,18 @@ TileTextureInitData::HashKey TileTextureInitData::hashKey() const {
}
void TileTextureInitData::calculateHashKey() {
ghoul_assert(_dimensionsWithPadding.x > 0, "Incorrect dimension");
ghoul_assert(_dimensionsWithPadding.y > 0, "Incorrect dimension");
ghoul_assert(_dimensionsWithPadding.x <= 1024, "Incorrect dimension");
ghoul_assert(_dimensionsWithPadding.y <= 1024, "Incorrect dimension");
ghoul_assert(_dimensionsWithPadding.z == 1, "Incorrect dimension");
ghoul_assert(_dimensions.x > 0, "Incorrect dimension");
ghoul_assert(_dimensions.y > 0, "Incorrect dimension");
ghoul_assert(_dimensions.x <= 1024, "Incorrect dimension");
ghoul_assert(_dimensions.y <= 1024, "Incorrect dimension");
ghoul_assert(_dimensions.z == 1, "Incorrect dimension");
unsigned int format = getUniqueIdFromTextureFormat(_ghoulTextureFormat);
ghoul_assert(format < 256, "Incorrect format");
_hashKey = 0LL;
_hashKey |= _dimensionsWithPadding.x;
_hashKey |= _dimensionsWithPadding.y << 10;
_hashKey |= _dimensions.x;
_hashKey |= _dimensions.y << 10;
_hashKey |= static_cast<std::underlying_type_t<GLenum>>(_glType) << (10 + 16);
_hashKey |= format << (10 + 16 + 4);
};