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

fix merge conflicts

Browse Source
This commit is contained in:
T1ti
2023-07-11 01:37:18 +02:00
parent 935a532fcd
commit 4c7b742ac1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/noggit/MapTile.cpp
View File

@@ -1228,11 +1228,11 @@ QImage MapTile::getAlphamapImage(std::string const& filename)
return std::move(image);
}
void MapTile::setHeightmapImage(QImage const& baseimage, float multiplier, int mode) // image
void MapTile::setHeightmapImage(QImage const& baseimage, float multiplier, int mode, bool tiledEdges) // image
{
// convert to RGBA64 to properly load all type of images (grayscales don't load properly otherwise)
// auto image = baseimage.convertToFormat(QImage::Format_RGBA64);
auto image = baseimage.convertToFormat(QImage::Format_Grayscale16);
auto image = baseimage.convertToFormat(QImage::Format_RGBA64);
// auto image = baseimage.convertToFormat(QImage::Format_Grayscale16);
unsigned const LONG{9}, SHORT{8}, SUM{LONG + SHORT}, DSUM{SUM * 2};
for (int k = 0; k < 16; ++k)
@@ -1454,7 +1454,7 @@ QImage MapTile::getVertexColorsImage()
return std::move(image);
}
void MapTile::setVertexColorImage(QImage const& baseimage, int mode)
void MapTile::setVertexColorImage(QImage const& baseimage, int mode, bool tiledEdges)
{
QImage image = baseimage.convertToFormat(QImage::Format_RGBA8888);

2
src/noggit/MapTile.h
View File

@@ -141,7 +141,7 @@ public:
QImage getAlphamapImage(std::string const& filename);
QImage getVertexColorsImage();
QImage getNormalmapImage();
void setHeightmapImage(QImage const& image, float multiplier, int mode, bool tiledEdges);
void setHeightmapImage(QImage const& baseimage, float multiplier, int mode, bool tiledEdges);
void setAlphaImage(QImage const& image, unsigned layer);
void setVertexColorImage(QImage const& image, int mode, bool tiledEdges);
void registerChunkUpdate(unsigned flags) { _chunk_update_flags |= flags; };