natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto convert image format import for vertex colors and alphamaps

Browse Source
This commit is contained in:
T1ti
2023-01-21 22:30:36 +01:00
parent 6ec6fdf093
commit 30eece5897
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/noggit/MapTile.cpp
View File

@@ -1314,8 +1314,10 @@ void MapTile::setHeightmapImage(QImage const& baseimage, float multiplier, int m
}
}
void MapTile::setAlphaImage(QImage const& image, unsigned layer)
void MapTile::setAlphaImage(QImage const& baseimage, unsigned layer)
{
auto image = baseimage.convertToFormat(QImage::Format_RGBA8888);
for (int k = 0; k < 16; ++k)
{
for (int l = 0; l < 16; ++l)
@@ -1383,8 +1385,10 @@ QImage MapTile::getVertexColorsImage()
return std::move(image);
}
void MapTile::setVertexColorImage(QImage const& image, int mode)
void MapTile::setVertexColorImage(QImage const& baseimage, int mode)
{
QImage image = baseimage.convertToFormat(QImage::Format_RGBA8888);
unsigned const LONG{9}, SHORT{8}, SUM{LONG + SHORT}, DSUM{SUM * 2};
for (int k = 0; k < 16; ++k)
@@ -1454,9 +1458,6 @@ void MapTile::setVertexColorImage(QImage const& image, int mode)
}
}
void MapTile::recalcExtents()
{
if (!_extents_dirty)