Mirrorlandia_minetest/minetestmapper
1
0
Fork 0
mirror of https://github.com/minetest/minetestmapper.git synced 2024-11-29 02:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix --drawalpha

Browse Source
This commit is contained in:
sfan5 2014-07-08 14:58:40 +02:00
parent 20691186b5
commit e85a49873a
2 changed files with 57 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
TileGenerator.cpp
View File

@ -360,6 +360,14 @@ void TileGenerator::renderMap()
for (int i = 0; i < 16; ++i) { for (int i = 0; i < 16; ++i) {
m_readedPixels[i] = 0; m_readedPixels[i] = 0;
m_readInfo[i] = 0;
}
for (int i = 0; i < 16; i++) {
for (int j = 0; j < 16; j++) {
m_col[i][j] = m_bgColor; // This will be drawn by renderMapBlockBottom() for y-rows with only 'air', 'ignore' or unknown nodes if --drawalpha is used
m_col[i][j].a = 0; // ..but set alpha to 0 to tell renderMapBlock() not to use this color to mix a shade
m_th[i][j] = 0;
}
} }
int xPos = position->first; int xPos = position->first;
@ -460,6 +468,15 @@ void TileGenerator::renderMap()
break; break;
} }
} }
bool allReaded = true;
for (int i = 0; i < 16; ++i) {
if (m_readedPixels[i] != 0xffff) {
allReaded = false;
}
}
if (!allReaded) {
renderMapBlockBottom(blockStack.begin()->first);
}
} }
if(m_shading) if(m_shading)
renderShading(zPos); renderShading(zPos);
@ -473,8 +490,6 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
const unsigned char *mapData = mapBlock.c_str(); const unsigned char *mapData = mapBlock.c_str();
int minY = (pos.y * 16 > m_yMin) ? 0 : m_yMin - pos.y * 16; int minY = (pos.y * 16 > m_yMin) ? 0 : m_yMin - pos.y * 16;
int maxY = (pos.y * 16 < m_yMax) ? 15 : m_yMax - pos.y * 16; int maxY = (pos.y * 16 < m_yMax) ? 15 : m_yMax - pos.y * 16;
Color col;
uint8_t th;
for (int z = 0; z < 16; ++z) { for (int z = 0; z < 16; ++z) {
int imageY = getImageY(zBegin + 15 - z); int imageY = getImageY(zBegin + 15 - z);
for (int x = 0; x < 16; ++x) { for (int x = 0; x < 16; ++x) {
@ -482,10 +497,6 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
continue; continue;
} }
int imageX = getImageX(xBegin + x); int imageX = getImageX(xBegin + x);
if(m_drawAlpha) {
col = Color(0,0,0,0);
th = 0;
}
for (int y = maxY; y >= minY; --y) { for (int y = maxY; y >= minY; --y) {
int position = x + (y << 4) + (z << 8); int position = x + (y << 4) + (z << 8);
@ -501,21 +512,26 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
if (color != m_colors.end()) { if (color != m_colors.end()) {
const Color c = color->second.to_color(); const Color c = color->second.to_color();
if (m_drawAlpha) { if (m_drawAlpha) {
if (col.a == 0) if (m_col[z][x].a == 0)
col = c; m_col[z][x] = c;
else else
col = mixColors(col, c); m_col[z][x] = mixColors(m_col[z][x], c);
if(col.a == 0xFF || y == minY) { if(m_col[z][x].a == 0xFF) {
m_image->tpixels[imageY][imageX] = color2int(col); m_image->tpixels[imageY][imageX] = color2int(m_col[z][x]);
m_blockPixelAttributes.attribute(15 - z, xBegin + x).thicken = th; m_readedPixels[z] |= (1 << x);
m_blockPixelAttributes.attribute(15 - z, xBegin + x).thicken = m_th[z][x];
} else { } else {
th = (th + color->second.t) / 2.0; m_th[z][x] = (m_th[z][x] + color->second.t) / 2.0;
continue; continue;
} }
} else } else {
m_image->tpixels[imageY][imageX] = color2int(c); m_image->tpixels[imageY][imageX] = color2int(c);
m_readedPixels[z] |= (1 << x); m_readedPixels[z] |= (1 << x);
m_blockPixelAttributes.attribute(15 - z, xBegin + x).height = pos.y * 16 + y; }
if(!(m_readInfo[z] & (1 << x))) {
m_blockPixelAttributes.attribute(15 - z, xBegin + x).height = pos.y * 16 + y;
m_readInfo[z] |= (1 << x);
}
} else { } else {
m_unknownNodes.insert(name); m_unknownNodes.insert(name);
continue; continue;
@ -526,6 +542,27 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
} }
} }
inline void TileGenerator::renderMapBlockBottom(const BlockPos &pos)
{
int xBegin = (pos.x - m_xMin) * 16;
int zBegin = (m_zMax - pos.z) * 16;
for (int z = 0; z < 16; ++z) {
int imageY = getImageY(zBegin + 15 - z);
for (int x = 0; x < 16; ++x) {
if (m_readedPixels[z] & (1 << x)) {
continue;
}
int imageX = getImageX(xBegin + x);
if (m_drawAlpha) {
m_image->tpixels[imageY][imageX] = color2int(m_col[z][x]);
m_readedPixels[z] |= (1 << x);
m_blockPixelAttributes.attribute(15 - z, xBegin + x).thicken = m_th[z][x];
}
}
}
}
inline void TileGenerator::renderShading(int zPos) inline void TileGenerator::renderShading(int zPos)
{ {
int zBegin = (m_zMax - zPos) * 16; int zBegin = (m_zMax - zPos) * 16;

4
TileGenerator.h
View File

@ -66,6 +66,7 @@ private:
void renderMap(); void renderMap();
std::list<int> getZValueList() const; std::list<int> getZValueList() const;
void renderMapBlock(const ustring &mapBlock, const BlockPos &pos, int version); void renderMapBlock(const ustring &mapBlock, const BlockPos &pos, int version);
void renderMapBlockBottom(const BlockPos &pos);
void renderShading(int zPos); void renderShading(int zPos);
void renderScale(); void renderScale();
void renderOrigin(); void renderOrigin();
@ -106,7 +107,10 @@ private:
std::map<int, std::string> m_nameMap; std::map<int, std::string> m_nameMap;
ColorMap m_colors; ColorMap m_colors;
uint16_t m_readedPixels[16]; uint16_t m_readedPixels[16];
uint16_t m_readInfo[16];
std::set<std::string> m_unknownNodes; std::set<std::string> m_unknownNodes;
Color m_col[16][16];
uint8_t m_th[16][16];
int m_blockAirId; int m_blockAirId;
int m_blockIgnoreId; int m_blockIgnoreId;