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

Fixes to statistical variables & other minor changes

Browse Source
This commit is contained in:
Rogier 2015-03-10 12:56:02 +01:00
parent 8c5bc78307
commit d6e08adefe
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
TileGenerator.cpp
View File

@ -174,6 +174,7 @@ TileGenerator::TileGenerator():
m_reqYMaxNode(15), m_reqYMaxNode(15),
m_YMinMapped(MAPBLOCK_MAX), m_YMinMapped(MAPBLOCK_MAX),
m_YMaxMapped(MAPBLOCK_MIN), m_YMaxMapped(MAPBLOCK_MIN),
m_emptyMapArea(0),
m_mapXStartNodeOffset(0), m_mapXStartNodeOffset(0),
m_mapYStartNodeOffset(0), m_mapYStartNodeOffset(0),
m_mapXEndNodeOffset(0), m_mapXEndNodeOffset(0),
@ -824,7 +825,6 @@ void TileGenerator::loadBlocks()
int mapYMin, mapYMax; int mapYMin, mapYMax;
int mapZMin, mapZMax; int mapZMin, mapZMax;
int geomYMin, geomYMax; int geomYMin, geomYMax;
long long world_blocks;
long long map_blocks; long long map_blocks;
if (verboseCoordinates >= 2) { if (verboseCoordinates >= 2) {
bool partialBlocks = (m_mapXStartNodeOffset || m_mapXEndNodeOffset || m_mapYStartNodeOffset || m_mapYEndNodeOffset); bool partialBlocks = (m_mapXStartNodeOffset || m_mapXEndNodeOffset || m_mapYStartNodeOffset || m_mapYEndNodeOffset);
@ -903,21 +903,21 @@ void TileGenerator::loadBlocks()
m_mapYStartNodeOffset = 0; m_mapYStartNodeOffset = 0;
m_mapYEndNodeOffset = 0; m_mapYEndNodeOffset = 0;
} }
if (progressIndicator) mapXMin = MAPBLOCK_MAX;
cout << "Scanning world...\r" << std::flush; mapXMax = MAPBLOCK_MIN;
mapXMin = INT_MAX/16-1; mapYMin = MAPBLOCK_MAX;
mapXMax = -INT_MIN/16+1; mapYMax = MAPBLOCK_MIN;
mapYMin = INT_MAX/16-1; mapZMin = MAPBLOCK_MAX;
mapYMax = -INT_MIN/16+1; mapZMax = MAPBLOCK_MIN;
mapZMin = INT_MAX/16-1; geomYMin = MAPBLOCK_MAX;
mapZMax = -INT_MIN/16+1; geomYMax = MAPBLOCK_MIN;
geomYMin = INT_MAX/16-1; m_worldBlocks = 0;
geomYMax = -INT_MIN/16+1;
const DB::BlockPosList &blocks = m_db->getBlockPos();
world_blocks = 0;
map_blocks = 0; map_blocks = 0;
if (progressIndicator)
cout << "Scanning world (reading block list)...\r" << std::flush;
const DB::BlockPosList &blocks = m_db->getBlockPos();
for(DB::BlockPosList::const_iterator it = blocks.begin(); it != blocks.end(); ++it) { for(DB::BlockPosList::const_iterator it = blocks.begin(); it != blocks.end(); ++it) {
world_blocks ++; m_worldBlocks++;
const BlockPos &pos = *it; const BlockPos &pos = *it;
m_databaseFormatFound[pos.databaseFormat()]++; m_databaseFormatFound[pos.databaseFormat()]++;
if (pos.x() < mapXMin) { if (pos.x() < mapXMin) {
@ -991,7 +991,7 @@ void TileGenerator::loadBlocks()
<< std::setw(6) << mapYMax << "," << std::setw(6) << mapYMax << ","
<< std::setw(6) << mapZMax << std::setw(6) << mapZMax
<< ") blocks: " << ") blocks: "
<< std::setw(10) << world_blocks << "\n"; << std::setw(10) << m_worldBlocks << "\n";
} }
if (m_shrinkGeometry) { if (m_shrinkGeometry) {
if (m_xMin != m_reqXMin) m_mapXStartNodeOffset = 0; if (m_xMin != m_reqXMin) m_mapXStartNodeOffset = 0;
@ -1076,7 +1076,7 @@ void TileGenerator::loadBlocks()
<< std::setw(MESSAGE_WIDTH) << std::left << std::setw(MESSAGE_WIDTH) << std::left
<< "Database block format(s):" << std::endl << "Database block format(s):" << std::endl
<< " " << std::setw(MESSAGE_WIDTH-4) << std::left << "Total blocks:" << " " << std::setw(MESSAGE_WIDTH-4) << std::left << "Total blocks:"
<< std::setw(15) << std::right << world_blocks << std::setw(15) << std::right << m_worldBlocks
<< std::endl; << std::endl;
if (m_databaseFormatFound[BlockPos::Unknown]) { if (m_databaseFormatFound[BlockPos::Unknown]) {
cout cout
@ -1091,7 +1091,7 @@ void TileGenerator::loadBlocks()
<< " " << std::setw(MESSAGE_WIDTH-4) << std::left << "Freeminer-AXYZ:" << " " << std::setw(MESSAGE_WIDTH-4) << std::left << "Freeminer-AXYZ:"
<< std::setw(15) << std::right << m_databaseFormatFound[BlockPos::AXYZ] << std::setw(15) << std::right << m_databaseFormatFound[BlockPos::AXYZ]
<< std::endl; << std::endl;
long long other_blocks = world_blocks long long other_blocks = m_worldBlocks
- m_databaseFormatFound[BlockPos::Unknown] - m_databaseFormatFound[BlockPos::Unknown]
- m_databaseFormatFound[BlockPos::I64] - m_databaseFormatFound[BlockPos::I64]
- m_databaseFormatFound[BlockPos::AXYZ]; - m_databaseFormatFound[BlockPos::AXYZ];
@ -1507,17 +1507,19 @@ void TileGenerator::processMapBlock(const DB::Block &block)
void TileGenerator::renderMap() void TileGenerator::renderMap()
{ {
int unpackErrors = 0; int unpackErrors = 0;
int blocks_rendered = 0; long long blocks_rendered = 0;
int area_rendered = 0; int area_rendered = 0;
BlockPos currentPos; BlockPos currentPos;
currentPos.x() = INT_MIN; currentPos.x() = INT_MIN;
currentPos.y() = 0; currentPos.y() = INT_MAX;
currentPos.z() = INT_MIN; currentPos.z() = INT_MIN;
bool allReaded = false; bool allReaded = false;
for (std::list<BlockPos>::const_iterator position = m_positions.begin(); position != m_positions.end(); ++position) { for (std::list<BlockPos>::const_iterator position = m_positions.begin(); position != m_positions.end(); ++position) {
const BlockPos &pos = *position; const BlockPos &pos = *position;
if (currentPos.x() != pos.x() || currentPos.z() != pos.z()) { if (currentPos.x() != pos.x() || currentPos.z() != pos.z()) {
area_rendered++; area_rendered++;
if (currentPos.y() == m_yMin)
m_emptyMapArea++;
if (currentPos.z() != pos.z()) { if (currentPos.z() != pos.z()) {
if (m_scaleFactor > 1) { if (m_scaleFactor > 1) {
scalePixelRows(m_blockPixelAttributes, m_blockPixelAttributesScaled, pos.z()); scalePixelRows(m_blockPixelAttributes, m_blockPixelAttributesScaled, pos.z());
@ -1542,6 +1544,7 @@ void TileGenerator::renderMap()
else if (allReaded) { else if (allReaded) {
continue; continue;
} }
currentPos.y() = pos.y();
DB::Block block = m_db->getBlockOnPos(pos); DB::Block block = m_db->getBlockOnPos(pos);
if (!block.second.empty()) { if (!block.second.empty()) {
try { try {
@ -1580,6 +1583,8 @@ void TileGenerator::renderMap()
} }
} }
if (currentPos.z() != INT_MIN) { if (currentPos.z() != INT_MIN) {
if (currentPos.y() == m_yMin)
m_emptyMapArea++;
if (m_scaleFactor > 1) { if (m_scaleFactor > 1) {
scalePixelRows(m_blockPixelAttributes, m_blockPixelAttributesScaled, currentPos.z() - 1); scalePixelRows(m_blockPixelAttributes, m_blockPixelAttributesScaled, currentPos.z() - 1);
pushPixelRows(m_blockPixelAttributesScaled, currentPos.z() - 1); pushPixelRows(m_blockPixelAttributesScaled, currentPos.z() - 1);

2
TileGenerator.h
View File

@ -261,6 +261,8 @@ private:
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_YMinMapped; // Lowest block number mapped (not empty or air)
int m_YMaxMapped; // Higher block number mapped (not empty or air) int m_YMaxMapped; // Higher block number mapped (not empty or air)
long long m_emptyMapArea; // Number of blocks that are partly empty in the map
long long m_worldBlocks; // Number of blocks in the world (if known)
int m_storedWidth; int m_storedWidth;
int m_storedHeight; int m_storedHeight;
int m_mapXStartNodeOffset; int m_mapXStartNodeOffset;