minetest
/
minetestmapper
mirror of https://github.com/minetest/minetestmapper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added reading of data.

This commit is contained in:
Miroslav Bendík 2012-08-24 09:46:14 +02:00
parent 1dc09c4830
commit 6e653648b5
2 changed files with 65 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
TileGenerator.cpp
View File

@ -11,11 +11,16 @@
#include <cstdlib> #include <cstdlib>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <sstream>
#include "TileGenerator.h" #include "TileGenerator.h"
using namespace std; using namespace std;
TileGenerator::TileGenerator(): TileGenerator::TileGenerator():
m_bgColor(255, 255, 255),
m_scaleColor(0, 0, 0),
m_originColor(255, 0, 0),
m_playerColor(255, 0, 0),
m_drawOrigin(false), m_drawOrigin(false),
m_drawPlayers(false), m_drawPlayers(false),
m_drawScale(false), m_drawScale(false),
@ -27,10 +32,6 @@ TileGenerator::TileGenerator():
m_zMin(0), m_zMin(0),
m_zMax(0) m_zMax(0)
{ {
m_bgColor = {255, 255, 255};
m_scaleColor = {0, 0, 0};
m_originColor = {255, 0, 0};
m_playerColor = {255, 0, 0};
} }
TileGenerator::~TileGenerator() TileGenerator::~TileGenerator()
@ -189,7 +190,7 @@ void TileGenerator::loadBlocks()
} }
} }
inline BlockPos TileGenerator::decodeBlockPos(sqlite3_int64 blockId) inline BlockPos TileGenerator::decodeBlockPos(sqlite3_int64 blockId) const
{ {
BlockPos pos; BlockPos pos;
pos.x = unsignedToSigned(blockId % 4096, 2048); pos.x = unsignedToSigned(blockId % 4096, 2048);
@ -200,12 +201,12 @@ inline BlockPos TileGenerator::decodeBlockPos(sqlite3_int64 blockId)
return pos; return pos;
} }
inline sqlite3_int64 TileGenerator::encodeBlockPos(int x, int y, int z) inline sqlite3_int64 TileGenerator::encodeBlockPos(int x, int y, int z) const
{ {
return sqlite3_int64(z) * 16777216l + sqlite3_int64(y) * 4096l + sqlite3_int64(x); return sqlite3_int64(z) * 16777216l + sqlite3_int64(y) * 4096l + sqlite3_int64(x);
} }
inline int TileGenerator::unsignedToSigned(long i, long max_positive) inline int TileGenerator::unsignedToSigned(long i, long max_positive) const
{ {
if (i < max_positive) { if (i < max_positive) {
return i; return i;
@ -227,35 +228,69 @@ void TileGenerator::createImage()
void TileGenerator::renderMap() void TileGenerator::renderMap()
{ {
sqlite3_stmt *statement; sqlite3_stmt *statement;
//string sql = "SELECT pos, data FROM blocks WHERE pos >= ? AND pos <= ? AND (pos - ?) % 4096 = 0";
string sql = "SELECT pos, data FROM blocks WHERE pos >= ? AND pos <= ?"; string sql = "SELECT pos, data FROM blocks WHERE pos >= ? AND pos <= ?";
std::list<int> zlist;
for (std::list<std::pair<int, int> >::iterator position = m_positions.begin(); position != m_positions.end(); ++position) {
zlist.push_back(position->second);
}
zlist.sort();
zlist.unique();
if (sqlite3_prepare_v2(m_db, sql.c_str(), sql.length(), &statement, 0) != SQLITE_OK) { if (sqlite3_prepare_v2(m_db, sql.c_str(), sql.length(), &statement, 0) != SQLITE_OK) {
throw DbError(); throw DbError();
} }
std::list<int> zlist = getZValueList();
for (std::list<int>::iterator position = zlist.begin(); position != zlist.end(); ++position) { for (std::list<int>::iterator position = zlist.begin(); position != zlist.end(); ++position) {
int zPos = *position; int zPos = *position;
getBlocksOnZ(zPos, statement);
}
}
sqlite3_int64 psMin = encodeBlockPos(-2048, -2048, zPos); inline std::list<int> TileGenerator::getZValueList() const
sqlite3_int64 psMax = encodeBlockPos( 2047, 2047, zPos); {
sqlite3_bind_int64(statement, 1, psMin); std::list<int> zlist;
sqlite3_bind_int64(statement, 2, psMax); for (std::list<std::pair<int, int> >::const_iterator position = m_positions.begin(); position != m_positions.end(); ++position) {
int result = 0; zlist.push_back(position->second);
while (true) { }
result = sqlite3_step(statement); zlist.sort();
if(result == SQLITE_ROW) { zlist.unique();
return zlist;
}
void TileGenerator::getBlocksOnZ(int zPos, sqlite3_stmt *statement) const
{
map <int, list <pair <BlockPos, string> > > blocks;
sqlite3_int64 psMin = encodeBlockPos(-2048, -2048, zPos);
sqlite3_int64 psMax = encodeBlockPos( 2047, 2047, zPos);
std::stringstream minStream;
std::stringstream maxStream;
minStream << psMin;
maxStream << psMax;
string minStr = minStream.str();
string maxStr = maxStream.str();
sqlite3_bind_text(statement, 1, minStr.c_str(), -1, SQLITE_TRANSIENT);
sqlite3_bind_text(statement, 2, maxStr.c_str(), -1, SQLITE_TRANSIENT);
int result = 0;
while (true) {
result = sqlite3_step(statement);
if(result == SQLITE_ROW) {
sqlite3_int64 blocknum = sqlite3_column_int64(statement, 0);
const void *data = sqlite3_column_blob(statement, 1);
uint8_t version = static_cast<const uint8_t *>(data)[0];
uint8_t flags = static_cast<const uint8_t *>(data)[1];
if (version >= 22) {
data += 4;
} }
else { else {
break; data += 2;
} }
BlockPos pos = decodeBlockPos(blocknum);
blocks[pos.x].push_back(pair<BlockPos, string> (pos, ""));
}
else {
break;
} }
} }
sqlite3_reset(statement);
} }
void TileGenerator::writeImage(const std::string &output) void TileGenerator::writeImage(const std::string &output)

10
TileGenerator.h
View File

@ -18,6 +18,8 @@
#include <string> #include <string>
struct Color { struct Color {
Color() {};
Color(uint8_t r, uint8_t g, uint8_t b): r(r), g(g), b(b) {};
uint8_t r; uint8_t r;
uint8_t g; uint8_t g;
uint8_t b; uint8_t b;
@ -58,11 +60,13 @@ public:
private: private:
void openDb(const std::string &input); void openDb(const std::string &input);
void loadBlocks(); void loadBlocks();
BlockPos decodeBlockPos(sqlite3_int64 blockId); BlockPos decodeBlockPos(sqlite3_int64 blockId) const;
sqlite3_int64 encodeBlockPos(int x, int y, int z); sqlite3_int64 encodeBlockPos(int x, int y, int z) const;
int unsignedToSigned(long i, long max_positive); int unsignedToSigned(long i, long max_positive) const;
void createImage(); void createImage();
void renderMap(); void renderMap();
std::list<int> getZValueList() const;
void getBlocksOnZ(int zPos, sqlite3_stmt *statement) const;
void writeImage(const std::string &output); void writeImage(const std::string &output);
private: private: