adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report minimum and maximum Y coordinate mapped (hint for --min-y and --max-y)

Browse Source
This commit is contained in:
Rogier 2015-03-04 00:09:56 +01:00
parent 047c2f4ec8
commit a3f01d5a1e
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
TileGenerator.cpp
View File

@ -33,6 +33,8 @@
#include "db-redis.h" #include "db-redis.h"
#endif #endif
#define MESSAGE_WIDTH 25
using namespace std; using namespace std;
static inline int64_t pythonmodulo(int64_t i, int64_t mod) static inline int64_t pythonmodulo(int64_t i, int64_t mod)
@ -170,6 +172,8 @@ TileGenerator::TileGenerator():
m_reqZMax(MAPBLOCK_MAX), m_reqZMax(MAPBLOCK_MAX),
m_reqYMinNode(0), m_reqYMinNode(0),
m_reqYMaxNode(15), m_reqYMaxNode(15),
m_YMinMapped(MAPBLOCK_MAX),
m_YMaxMapped(MAPBLOCK_MIN),
m_mapXStartNodeOffset(0), m_mapXStartNodeOffset(0),
m_mapYStartNodeOffset(0), m_mapYStartNodeOffset(0),
m_mapXEndNodeOffset(0), m_mapXEndNodeOffset(0),
@ -815,7 +819,6 @@ void TileGenerator::openDb(const std::string &input)
void TileGenerator::loadBlocks() void TileGenerator::loadBlocks()
{ {
#define MESSAGE_WIDTH 25
int mapXMin, mapXMax; int mapXMin, mapXMax;
int mapYMin, mapYMax; int mapYMin, mapYMax;
int mapZMin, mapZMax; int mapZMin, mapZMax;
@ -1065,7 +1068,6 @@ void TileGenerator::loadBlocks()
<< std::setw(10) << map_blocks << "\n"; << std::setw(10) << map_blocks << "\n";
} }
m_positions.sort(); m_positions.sort();
#undef MESSAGE_WIDTH
} }
void TileGenerator::scalePixelRows(PixelAttributes &pixelAttributes, PixelAttributes &pixelAttributesScaled, int zPosLimit) { void TileGenerator::scalePixelRows(PixelAttributes &pixelAttributes, PixelAttributes &pixelAttributesScaled, int zPosLimit) {
@ -1551,6 +1553,27 @@ void TileGenerator::renderMap()
pushPixelRows(m_blockPixelAttributes, currentPos.z() - 1); pushPixelRows(m_blockPixelAttributes, currentPos.z() - 1);
} }
} }
if (verboseCoordinates >= 1) {
cout
<< std::setw(MESSAGE_WIDTH) << std::left
<< "Mapped Vertical Range:" << std::right
<< std::setw(7) << "x" << ","
<< std::setw(7) << m_YMinMapped*16 << ","
<< std::setw(7) << "z"
<< " .. "
<< std::setw(7) << "x" << ","
<< std::setw(7) << m_YMaxMapped*16+15 << ","
<< std::setw(7) << "z"
<< " ("
<< std::setw(6) << "x" << ","
<< std::setw(6) << m_YMinMapped << ","
<< std::setw(6) << "z"
<< " .. "
<< std::setw(6) << "x" << ","
<< std::setw(6) << m_YMaxMapped << ","
<< std::setw(6) << "z"
<< ")\n";
}
if (verboseStatistics) { if (verboseStatistics) {
cout << "Statistics" cout << "Statistics"
<< ": blocks read/queried: " << m_db->getBlocksReadCount() << ": blocks read/queried: " << m_db->getBlocksReadCount()
@ -1598,6 +1621,7 @@ 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() < m_reqYMin) ? 16 : (pos.y() > m_reqYMin) ? 0 : m_reqYMinNode; int minY = (pos.y() < m_reqYMin) ? 16 : (pos.y() > m_reqYMin) ? 0 : m_reqYMinNode;
int maxY = (pos.y() > m_reqYMax) ? -1 : (pos.y() < m_reqYMax) ? 15 : m_reqYMaxNode; int maxY = (pos.y() > m_reqYMax) ? -1 : (pos.y() < m_reqYMax) ? 15 : m_reqYMaxNode;
bool renderedAnything = false;
for (int z = 0; z < 16; ++z) { for (int z = 0; z < 16; ++z) {
bool rowIsEmpty = true; bool rowIsEmpty = true;
for (int x = 0; x < 16; ++x) { for (int x = 0; x < 16; ++x) {
@ -1627,6 +1651,7 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
if (height < m_surfaceDepth) m_surfaceDepth = height; if (height < m_surfaceDepth) m_surfaceDepth = height;
} }
rowIsEmpty = false; rowIsEmpty = false;
renderedAnything = true;
pixel = PixelAttribute(computeMapHeightColor(height), height); pixel = PixelAttribute(computeMapHeightColor(height), height);
m_readedPixels[z] |= (1 << x); m_readedPixels[z] |= (1 << x);
break; break;
@ -1634,6 +1659,7 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
} }
else if (m_nodeIDColor[content]) { else if (m_nodeIDColor[content]) {
rowIsEmpty = false; rowIsEmpty = false;
renderedAnything = true;
pixel.mixUnder(PixelAttribute(nodeColor, height)); pixel.mixUnder(PixelAttribute(nodeColor, height));
if ((m_drawAlpha && nodeColor.a == 0xff) || (!m_drawAlpha && nodeColor.a != 0)) { if ((m_drawAlpha && nodeColor.a == 0xff) || (!m_drawAlpha && nodeColor.a != 0)) {
m_readedPixels[z] |= (1 << x); m_readedPixels[z] |= (1 << x);
@ -1651,6 +1677,12 @@ inline void TileGenerator::renderMapBlock(const ustring &mapBlock, const BlockPo
if (!rowIsEmpty) if (!rowIsEmpty)
m_blockPixelAttributes.attribute(zBegin + 15 - z,xBegin).nextEmpty = false; m_blockPixelAttributes.attribute(zBegin + 15 - z,xBegin).nextEmpty = false;
} }
if (renderedAnything) {
if (pos.y() < m_YMinMapped)
m_YMinMapped = pos.y();
if (pos.y() > m_YMaxMapped)
m_YMaxMapped = pos.y();
}
} }
void TileGenerator::renderScale() void TileGenerator::renderScale()

2
TileGenerator.h
View File

@ -258,6 +258,8 @@ private:
int m_reqZMax; int m_reqZMax;
int m_reqYMinNode; // Node offset within a map block int m_reqYMinNode; // Node offset within a map block
int m_reqYMaxNode; // Node offset within a map block int m_reqYMaxNode; // Node offset within a map block
int m_YMinMapped; // Lowest block number mapped (not empty or air)
int m_YMaxMapped; // Higher block number mapped (not empty or air)
int m_storedWidth; int m_storedWidth;
int m_storedHeight; int m_storedHeight;
int m_mapXStartNodeOffset; int m_mapXStartNodeOffset;