657 lines
16 KiB
C++
657 lines
16 KiB
C++
/*
|
|
* =====================================================================
|
|
* Version: 1.0
|
|
* Created: 23.08.2012 12:35:53
|
|
* Author: Miroslav Bendík
|
|
* Company: LinuxOS.sk
|
|
* =====================================================================
|
|
*/
|
|
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <climits>
|
|
#include <fstream>
|
|
#include <gdfontmb.h>
|
|
#include <iostream>
|
|
#include <sstream>
|
|
#include <stdexcept>
|
|
#include "config.h"
|
|
#include "PlayerAttributes.h"
|
|
#include "TileGenerator.h"
|
|
#include "ZlibDecompressor.h"
|
|
#include "colors.h"
|
|
#include "db-sqlite3.h"
|
|
#if USE_LEVELDB
|
|
#include "db-leveldb.h"
|
|
#endif
|
|
|
|
using namespace std;
|
|
|
|
static inline int64_t pythonmodulo(int64_t i, int64_t mod)
|
|
{
|
|
if (i >= 0) {
|
|
return i % mod;
|
|
}
|
|
else {
|
|
return mod - ((-i) % mod);
|
|
}
|
|
}
|
|
|
|
static inline int unsignedToSigned(long i, long max_positive)
|
|
{
|
|
if (i < max_positive) {
|
|
return i;
|
|
}
|
|
else {
|
|
return i - 2l * max_positive;
|
|
}
|
|
}
|
|
|
|
static inline uint16_t readU16(const unsigned char *data)
|
|
{
|
|
return data[0] << 8 | data[1];
|
|
}
|
|
|
|
static inline int rgb2int(uint8_t r, uint8_t g, uint8_t b)
|
|
{
|
|
return (r << 16) + (g << 8) + b;
|
|
}
|
|
|
|
static inline int readBlockContent(const unsigned char *mapData, int version, int datapos)
|
|
{
|
|
if (version >= 24) {
|
|
size_t index = datapos << 1;
|
|
return (mapData[index] << 8) | mapData[index + 1];
|
|
}
|
|
else if (version >= 20) {
|
|
if (mapData[datapos] <= 0x80) {
|
|
return mapData[datapos];
|
|
}
|
|
else {
|
|
return (int(mapData[datapos]) << 4) | (int(mapData[datapos + 0x2000]) >> 4);
|
|
}
|
|
}
|
|
else {
|
|
std::ostringstream oss;
|
|
oss << "Unsupported map version " << version;
|
|
throw std::runtime_error(oss.str());
|
|
}
|
|
}
|
|
|
|
static inline int colorSafeBounds(int color)
|
|
{
|
|
if (color > 255) {
|
|
return 255;
|
|
}
|
|
else if (color < 0) {
|
|
return 0;
|
|
}
|
|
else {
|
|
return color;
|
|
}
|
|
}
|
|
|
|
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_drawPlayers(false),
|
|
m_drawScale(false),
|
|
m_shading(true),
|
|
m_border(0),
|
|
m_backend("sqlite3"),
|
|
m_image(0),
|
|
m_xMin(INT_MAX),
|
|
m_xMax(INT_MIN),
|
|
m_zMin(INT_MAX),
|
|
m_zMax(INT_MIN),
|
|
m_yMin(-30000),
|
|
m_yMax(30000),
|
|
m_geomX(-50),
|
|
m_geomY(-50),
|
|
m_geomX2(50),
|
|
m_geomY2(50)
|
|
{
|
|
string colors_txt_data(reinterpret_cast<char *>(colors_txt), colors_txt_len);
|
|
istringstream colors_stream(colors_txt_data);
|
|
parseColorsStream(colors_stream);
|
|
}
|
|
|
|
TileGenerator::~TileGenerator()
|
|
{
|
|
}
|
|
|
|
void TileGenerator::setBgColor(const std::string &bgColor)
|
|
{
|
|
m_bgColor = parseColor(bgColor);
|
|
}
|
|
|
|
void TileGenerator::setScaleColor(const std::string &scaleColor)
|
|
{
|
|
m_scaleColor = parseColor(scaleColor);
|
|
}
|
|
|
|
void TileGenerator::setOriginColor(const std::string &originColor)
|
|
{
|
|
m_originColor = parseColor(originColor);
|
|
}
|
|
|
|
void TileGenerator::setPlayerColor(const std::string &playerColor)
|
|
{
|
|
m_playerColor = parseColor(playerColor);
|
|
}
|
|
|
|
Color TileGenerator::parseColor(const std::string &color)
|
|
{
|
|
Color parsed;
|
|
if (color.length() != 7) {
|
|
throw std::runtime_error("Color not 7 characters long");
|
|
}
|
|
if (color[0] != '#') {
|
|
throw std::runtime_error("Color does not begin with #");
|
|
}
|
|
long col = strtol(color.c_str() + 1, NULL, 16);
|
|
parsed.b = col % 256;
|
|
col = col / 256;
|
|
parsed.g = col % 256;
|
|
col = col / 256;
|
|
parsed.r = col % 256;
|
|
return parsed;
|
|
}
|
|
|
|
void TileGenerator::setDrawOrigin(bool drawOrigin)
|
|
{
|
|
m_drawOrigin = drawOrigin;
|
|
}
|
|
|
|
void TileGenerator::setDrawPlayers(bool drawPlayers)
|
|
{
|
|
m_drawPlayers = drawPlayers;
|
|
}
|
|
|
|
void TileGenerator::setDrawScale(bool drawScale)
|
|
{
|
|
m_drawScale = drawScale;
|
|
if (m_drawScale) {
|
|
m_border = 40;
|
|
}
|
|
}
|
|
|
|
void TileGenerator::setShading(bool shading)
|
|
{
|
|
m_shading = shading;
|
|
}
|
|
|
|
void TileGenerator::setGeometry(int x, int y, int w, int h)
|
|
{
|
|
if (x > 0) {
|
|
m_geomX = (x + 15) / 16;
|
|
}
|
|
else {
|
|
m_geomX = (x - 15) / 16;
|
|
}
|
|
if (y > 0) {
|
|
m_geomY = (y + 15) / 16;
|
|
}
|
|
else {
|
|
m_geomY = (y - 15) / 16;
|
|
}
|
|
|
|
int x2 = x + w;
|
|
int y2 = y + h;
|
|
|
|
if (x2 > 0) {
|
|
m_geomX2 = (x2 + 15) / 16;
|
|
}
|
|
else {
|
|
m_geomX2 = (x2 - 15) / 16;
|
|
}
|
|
if (y2 > 0) {
|
|
m_geomY2 = (y2 + 15) / 16;
|
|
}
|
|
else {
|
|
m_geomY2 = (y2 - 15) / 16;
|
|
}
|
|
}
|
|
|
|
void TileGenerator::setMinY(int y)
|
|
{
|
|
m_yMin = y;
|
|
}
|
|
|
|
void TileGenerator::setMaxY(int y)
|
|
{
|
|
m_yMax = y;
|
|
}
|
|
|
|
void TileGenerator::parseColorsFile(const std::string &fileName)
|
|
{
|
|
ifstream in;
|
|
in.open(fileName.c_str(), ifstream::in);
|
|
if (!in.is_open()) {
|
|
return;
|
|
}
|
|
parseColorsStream(in);
|
|
}
|
|
|
|
void TileGenerator::setBackend(std::string backend)
|
|
{
|
|
m_backend = backend;
|
|
}
|
|
|
|
void TileGenerator::generate(const std::string &input, const std::string &output)
|
|
{
|
|
string input_path = input;
|
|
if (input_path[input.length() - 1] != PATH_SEPARATOR) {
|
|
input_path += PATH_SEPARATOR;
|
|
}
|
|
|
|
openDb(input_path);
|
|
loadBlocks();
|
|
createImage();
|
|
renderMap();
|
|
if (m_drawScale) {
|
|
renderScale();
|
|
}
|
|
if (m_drawOrigin) {
|
|
renderOrigin();
|
|
}
|
|
if (m_drawPlayers) {
|
|
renderPlayers(input_path);
|
|
}
|
|
writeImage(output);
|
|
printUnknown();
|
|
}
|
|
|
|
void TileGenerator::parseColorsStream(std::istream &in)
|
|
{
|
|
while (in.good()) {
|
|
string name;
|
|
Color color;
|
|
in >> name;
|
|
if (name[0] == '#') {
|
|
in.ignore(65536, '\n');
|
|
in >> name;
|
|
}
|
|
while (name == "\n" && in.good()) {
|
|
in >> name;
|
|
}
|
|
int r, g, b;
|
|
in >> r;
|
|
in >> g;
|
|
in >> b;
|
|
if (in.good()) {
|
|
color.r = r;
|
|
color.g = g;
|
|
color.b = b;
|
|
m_colors[name] = color;
|
|
}
|
|
}
|
|
}
|
|
|
|
void TileGenerator::openDb(const std::string &input)
|
|
{
|
|
if(m_backend == "sqlite3")
|
|
m_db = new DBSQLite3(input);
|
|
#if USE_LEVELDB
|
|
else if(m_backend == "leveldb")
|
|
m_db = new DBLevelDB(input);
|
|
#endif
|
|
else
|
|
throw std::runtime_error(((std::string) "Unknown map backend: ") + m_backend);
|
|
}
|
|
|
|
void TileGenerator::loadBlocks()
|
|
{
|
|
std::vector<int64_t> vec = m_db->getBlockPos();
|
|
for(unsigned int i = 0; i < vec.size(); i++) {
|
|
BlockPos pos = decodeBlockPos(vec[i]);
|
|
if (pos.x < m_geomX || pos.x >= m_geomX2 || pos.z < m_geomY || pos.z >= m_geomY2) {
|
|
continue;
|
|
}
|
|
if (pos.y < m_yMin) {
|
|
continue;
|
|
}
|
|
if (pos.y > m_yMax) {
|
|
continue;
|
|
}
|
|
if (pos.x < m_xMin) {
|
|
m_xMin = pos.x;
|
|
}
|
|
if (pos.x > m_xMax) {
|
|
m_xMax = pos.x;
|
|
}
|
|
if (pos.z < m_zMin) {
|
|
m_zMin = pos.z;
|
|
}
|
|
if (pos.z > m_zMax) {
|
|
m_zMax = pos.z;
|
|
}
|
|
m_positions.push_back(std::pair<int, int>(pos.x, pos.z));
|
|
m_positions.sort();
|
|
m_positions.unique();
|
|
}
|
|
}
|
|
|
|
inline BlockPos TileGenerator::decodeBlockPos(int64_t blockId) const
|
|
{
|
|
BlockPos pos;
|
|
pos.x = unsignedToSigned(pythonmodulo(blockId, 4096), 2048);
|
|
blockId = (blockId - pos.x) / 4096;
|
|
pos.y = unsignedToSigned(pythonmodulo(blockId, 4096), 2048);
|
|
blockId = (blockId - pos.y) / 4096;
|
|
pos.z = unsignedToSigned(pythonmodulo(blockId, 4096), 2048);
|
|
return pos;
|
|
}
|
|
|
|
void TileGenerator::createImage()
|
|
{
|
|
m_mapWidth = (m_xMax - m_xMin + 1) * 16;
|
|
m_mapHeight = (m_zMax - m_zMin + 1) * 16;
|
|
m_image = gdImageCreateTrueColor(m_mapWidth + m_border, m_mapHeight + m_border);
|
|
m_blockPixelAttributes.setWidth(m_mapWidth);
|
|
// Background
|
|
gdImageFilledRectangle(m_image, 0, 0, m_mapWidth + m_border - 1, m_mapHeight + m_border -1, rgb2int(m_bgColor.r, m_bgColor.g, m_bgColor.b));
|
|
}
|
|
|
|
std::map<int, TileGenerator::BlockList> TileGenerator::getBlocksOnZ(int zPos)
|
|
{
|
|
DBBlockList in = m_db->getBlocksOnZ(zPos);
|
|
std::map<int, BlockList> out;
|
|
for(DBBlockList::const_iterator it = in.begin(); it != in.end(); ++it) {
|
|
Block b = Block(decodeBlockPos(it->first), it->second);
|
|
if(out.find(b.first.x) == out.end()) {
|
|
BlockList bl;
|
|
out[b.first.x] = bl;
|
|
}
|
|
out[b.first.x].push_back(b);
|
|
}
|
|
return out;
|
|
}
|
|
|
|
void TileGenerator::renderMap()
|
|
{
|
|
std::list<int> zlist = getZValueList();
|
|
for (std::list<int>::iterator zPosition = zlist.begin(); zPosition != zlist.end(); ++zPosition) {
|
|
int zPos = *zPosition;
|
|
std::map<int, BlockList> blocks = getBlocksOnZ(zPos);
|
|
for (std::list<std::pair<int, int> >::const_iterator position = m_positions.begin(); position != m_positions.end(); ++position) {
|
|
if (position->second != zPos) {
|
|
continue;
|
|
}
|
|
|
|
for (int i = 0; i < 16; ++i) {
|
|
m_readedPixels[i] = 0;
|
|
}
|
|
|
|
int xPos = position->first;
|
|
blocks[xPos].sort();
|
|
const BlockList &blockStack = blocks[xPos];
|
|
for (BlockList::const_iterator it = blockStack.begin(); it != blockStack.end(); ++it) {
|
|
const BlockPos &pos = it->first;
|
|
const unsigned char *data = it->second.c_str();
|
|
size_t length = it->second.length();
|
|
|
|
uint8_t version = data[0];
|
|
//uint8_t flags = data[1];
|
|
|
|
size_t dataOffset = 0;
|
|
if (version >= 22) {
|
|
dataOffset = 4;
|
|
}
|
|
else {
|
|
dataOffset = 2;
|
|
}
|
|
|
|
ZlibDecompressor decompressor(data, length);
|
|
decompressor.setSeekPos(dataOffset);
|
|
ZlibDecompressor::string mapData = decompressor.decompress();
|
|
ZlibDecompressor::string mapMetadata = decompressor.decompress();
|
|
dataOffset = decompressor.seekPos();
|
|
|
|
// Skip unused data
|
|
if (version <= 21) {
|
|
dataOffset += 2;
|
|
}
|
|
if (version == 23) {
|
|
dataOffset += 1;
|
|
}
|
|
if (version == 24) {
|
|
uint8_t ver = data[dataOffset++];
|
|
if (ver == 1) {
|
|
uint16_t num = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
dataOffset += 10 * num;
|
|
}
|
|
}
|
|
|
|
// Skip unused static objects
|
|
dataOffset++; // Skip static object version
|
|
int staticObjectCount = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
for (int i = 0; i < staticObjectCount; ++i) {
|
|
dataOffset += 13;
|
|
uint16_t dataSize = readU16(data + dataOffset);
|
|
dataOffset += dataSize + 2;
|
|
}
|
|
dataOffset += 4; // Skip timestamp
|
|
|
|
m_blockAirId = -1;
|
|
m_blockIgnoreId = -1;
|
|
// Read mapping
|
|
if (version >= 22) {
|
|
dataOffset++; // mapping version
|
|
uint16_t numMappings = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
for (int i = 0; i < numMappings; ++i) {
|
|
uint16_t nodeId = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
uint16_t nameLen = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
string name = string(reinterpret_cast<const char *>(data) + dataOffset, nameLen);
|
|
if (name == "air") {
|
|
m_blockAirId = nodeId;
|
|
}
|
|
else if (name == "ignore") {
|
|
m_blockIgnoreId = nodeId;
|
|
}
|
|
else {
|
|
m_nameMap[nodeId] = name;
|
|
}
|
|
dataOffset += nameLen;
|
|
}
|
|
}
|
|
|
|
// Node timers
|
|
if (version >= 25) {
|
|
dataOffset++;
|
|
uint16_t numTimers = readU16(data + dataOffset);
|
|
dataOffset += 2;
|
|
dataOffset += numTimers * 10;
|
|
}
|
|
|
|
renderMapBlock(mapData, pos, version);
|
|
|
|
bool allReaded = true;
|
|
for (int i = 0; i < 16; ++i) {
|
|
if (m_readedPixels[i] != 0xffff) {
|
|
allReaded = false;
|
|
}
|
|
}
|
|
if (allReaded) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if(m_shading)
|
|
renderShading(zPos);
|
|
}
|
|
}
|
|
|
|
inline void TileGenerator::renderMapBlock(const unsigned_string &mapBlock, const BlockPos &pos, int version)
|
|
{
|
|
int xBegin = (pos.x - m_xMin) * 16;
|
|
int zBegin = (m_zMax - pos.z) * 16;
|
|
const unsigned char *mapData = mapBlock.c_str();
|
|
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);
|
|
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;
|
|
for (int y = maxY; y >= minY; --y) {
|
|
int position = x + (y << 4) + (z << 8);
|
|
int content = readBlockContent(mapData, version, position);
|
|
if (content == m_blockIgnoreId || content == m_blockAirId) {
|
|
continue;
|
|
}
|
|
std::map<int, std::string>::iterator blockName = m_nameMap.find(content);
|
|
if (blockName != m_nameMap.end()) {
|
|
const string &name = blockName->second;
|
|
ColorMap::const_iterator color = m_colors.find(name);
|
|
if (color != m_colors.end()) {
|
|
const Color &c = color->second;
|
|
m_image->tpixels[imageY][imageX] = rgb2int(c.r, c.g, c.b);
|
|
m_readedPixels[z] |= (1 << x);
|
|
m_blockPixelAttributes.attribute(15 - z, xBegin + x).height = pos.y * 16 + y;
|
|
} else {
|
|
m_unknownNodes.insert(name);
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
inline void TileGenerator::renderShading(int zPos)
|
|
{
|
|
int zBegin = (m_zMax - zPos) * 16;
|
|
for (int z = 0; z < 16; ++z) {
|
|
int imageY = zBegin + z;
|
|
if (imageY >= m_mapHeight) {
|
|
continue;
|
|
}
|
|
imageY = getImageY(imageY);
|
|
for (int x = 0; x < m_mapWidth; ++x) {
|
|
if (!m_blockPixelAttributes.attribute(z, x).valid_height() || !m_blockPixelAttributes.attribute(z, x - 1).valid_height() || !m_blockPixelAttributes.attribute(z - 1, x).valid_height()) {
|
|
continue;
|
|
}
|
|
int y = m_blockPixelAttributes.attribute(z, x).height;
|
|
int y1 = m_blockPixelAttributes.attribute(z, x - 1).height;
|
|
int y2 = m_blockPixelAttributes.attribute(z - 1, x).height;
|
|
int d = ((y - y1) + (y - y2)) * 12;
|
|
if (d > 36) {
|
|
d = 36;
|
|
}
|
|
int sourceColor = m_image->tpixels[imageY][getImageX(x)] & 0xffffff;
|
|
int r = (sourceColor & 0xff0000) >> 16;
|
|
int g = (sourceColor & 0x00ff00) >> 8;
|
|
int b = (sourceColor & 0x0000ff);
|
|
r = colorSafeBounds(r + d);
|
|
g = colorSafeBounds(g + d);
|
|
b = colorSafeBounds(b + d);
|
|
m_image->tpixels[imageY][getImageX(x)] = rgb2int(r, g, b);
|
|
}
|
|
}
|
|
m_blockPixelAttributes.scroll();
|
|
}
|
|
|
|
void TileGenerator::renderScale()
|
|
{
|
|
int color = rgb2int(m_scaleColor.r, m_scaleColor.g, m_scaleColor.b);
|
|
gdImageString(m_image, gdFontGetMediumBold(), 24, 0, reinterpret_cast<unsigned char *>(const_cast<char *>("X")), color);
|
|
gdImageString(m_image, gdFontGetMediumBold(), 2, 24, reinterpret_cast<unsigned char *>(const_cast<char *>("Z")), color);
|
|
|
|
string scaleText;
|
|
|
|
for (int i = (m_xMin / 4) * 4; i <= m_xMax; i += 4) {
|
|
stringstream buf;
|
|
buf << i * 16;
|
|
scaleText = buf.str();
|
|
|
|
int xPos = m_xMin * -16 + i * 16 + m_border;
|
|
gdImageString(m_image, gdFontGetMediumBold(), xPos + 2, 0, reinterpret_cast<unsigned char *>(const_cast<char *>(scaleText.c_str())), color);
|
|
gdImageLine(m_image, xPos, 0, xPos, m_border - 1, color);
|
|
}
|
|
|
|
for (int i = (m_zMax / 4) * 4; i >= m_zMin; i -= 4) {
|
|
stringstream buf;
|
|
buf << i * 16;
|
|
scaleText = buf.str();
|
|
|
|
int yPos = m_mapHeight - 1 - (i * 16 - m_zMin * 16) + m_border;
|
|
gdImageString(m_image, gdFontGetMediumBold(), 2, yPos, reinterpret_cast<unsigned char *>(const_cast<char *>(scaleText.c_str())), color);
|
|
gdImageLine(m_image, 0, yPos, m_border - 1, yPos, color);
|
|
}
|
|
}
|
|
|
|
void TileGenerator::renderOrigin()
|
|
{
|
|
int imageX = -m_xMin * 16 + m_border;
|
|
int imageY = m_mapHeight - m_zMin * -16 + m_border;
|
|
gdImageArc(m_image, imageX, imageY, 12, 12, 0, 360, rgb2int(m_originColor.r, m_originColor.g, m_originColor.b));
|
|
}
|
|
|
|
void TileGenerator::renderPlayers(const std::string &inputPath)
|
|
{
|
|
int color = rgb2int(m_playerColor.r, m_playerColor.g, m_playerColor.b);
|
|
|
|
PlayerAttributes players(inputPath);
|
|
for (PlayerAttributes::Players::iterator player = players.begin(); player != players.end(); ++player) {
|
|
int imageX = player->x / 10 - m_xMin * 16 + m_border;
|
|
int imageY = m_mapHeight - (player->z / 10 - m_zMin * 16) + m_border;
|
|
|
|
gdImageArc(m_image, imageX, imageY, 5, 5, 0, 360, color);
|
|
gdImageString(m_image, gdFontGetMediumBold(), imageX + 2, imageY + 2, reinterpret_cast<unsigned char *>(const_cast<char *>(player->name.c_str())), color);
|
|
}
|
|
}
|
|
|
|
inline std::list<int> TileGenerator::getZValueList() const
|
|
{
|
|
std::list<int> zlist;
|
|
for (std::list<std::pair<int, int> >::const_iterator position = m_positions.begin(); position != m_positions.end(); ++position) {
|
|
zlist.push_back(position->second);
|
|
}
|
|
zlist.sort();
|
|
zlist.unique();
|
|
zlist.reverse();
|
|
return zlist;
|
|
}
|
|
|
|
void TileGenerator::writeImage(const std::string &output)
|
|
{
|
|
FILE *out;
|
|
out = fopen(output.c_str(), "wb");
|
|
gdImagePng(m_image, out);
|
|
fclose(out);
|
|
gdImageDestroy(m_image);
|
|
}
|
|
|
|
void TileGenerator::printUnknown()
|
|
{
|
|
if (m_unknownNodes.size() > 0) {
|
|
std::cerr << "Unknown nodes:" << std::endl;
|
|
for (std::set<std::string>::iterator node = m_unknownNodes.begin(); node != m_unknownNodes.end(); ++node) {
|
|
std::cerr << *node << std::endl;
|
|
}
|
|
}
|
|
}
|
|
|
|
inline int TileGenerator::getImageX(int val) const
|
|
{
|
|
return val + m_border;
|
|
}
|
|
|
|
inline int TileGenerator::getImageY(int val) const
|
|
{
|
|
return val + m_border;
|
|
}
|
|
|