Merge pull request #28 from huderlem/multiblock
Add multi-block and smart-path tile painting
This commit is contained in:
yenatch
GitHub
commit
997bfe7fea
4 changed files with 172 additions and 22 deletions
169
editor.cpp
169
editor.cpp
|
|
@ -271,11 +271,6 @@ void MetatilesPixmapItem::draw() {
|
|||
setPixmap(map->renderMetatiles());
|
||||
}
|
||||
|
||||
void MetatilesPixmapItem::pick(uint tile) {
|
||||
map->paint_tile = tile;
|
||||
emit map->paintTileChanged(map);
|
||||
}
|
||||
|
||||
void MetatilesPixmapItem::updateCurHoveredMetatile(QPointF pos) {
|
||||
int x = ((int)pos.x()) / 16;
|
||||
int y = ((int)pos.y()) / 16;
|
||||
|
|
@ -299,19 +294,42 @@ void MetatilesPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
|
|||
QPointF pos = event->pos();
|
||||
int x = ((int)pos.x()) / 16;
|
||||
int y = ((int)pos.y()) / 16;
|
||||
//qDebug() << QString("(%1, %2)").arg(x).arg(y);
|
||||
int width = pixmap().width() / 16;
|
||||
int height = pixmap().height() / 16;
|
||||
if ((x >= 0 && x < width) && (y >=0 && y < height)) {
|
||||
pick(y * width + x);
|
||||
}
|
||||
map->paint_metatile_initial_x = x;
|
||||
map->paint_metatile_initial_y = y;
|
||||
updateSelection(event->pos(), event->button());
|
||||
}
|
||||
void MetatilesPixmapItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
|
||||
updateCurHoveredMetatile(event->pos());
|
||||
mousePressEvent(event);
|
||||
Qt::MouseButton button = event->button();
|
||||
if (button == Qt::MouseButton::NoButton) {
|
||||
Qt::MouseButtons heldButtons = event->buttons();
|
||||
if (heldButtons & Qt::RightButton) {
|
||||
button = Qt::RightButton;
|
||||
} else if (heldButtons & Qt::LeftButton) {
|
||||
button = Qt::LeftButton;
|
||||
}
|
||||
}
|
||||
updateSelection(event->pos(), button);
|
||||
}
|
||||
void MetatilesPixmapItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
|
||||
mousePressEvent(event);
|
||||
updateSelection(event->pos(), event->button());
|
||||
}
|
||||
void MetatilesPixmapItem::updateSelection(QPointF pos, Qt::MouseButton button) {
|
||||
int x = ((int)pos.x()) / 16;
|
||||
int y = ((int)pos.y()) / 16;
|
||||
int width = pixmap().width() / 16;
|
||||
int height = pixmap().height() / 16;
|
||||
if ((x >= 0 && x < width) && (y >=0 && y < height)) {
|
||||
int baseTileX = x < map->paint_metatile_initial_x ? x : map->paint_metatile_initial_x;
|
||||
int baseTileY = y < map->paint_metatile_initial_y ? y : map->paint_metatile_initial_y;
|
||||
map->paint_tile = baseTileY * 8 + baseTileX;
|
||||
map->paint_tile_width = abs(map->paint_metatile_initial_x - x) + 1;
|
||||
map->paint_tile_height = abs(map->paint_metatile_initial_y - y) + 1;
|
||||
map->smart_paths_enabled = button == Qt::RightButton
|
||||
&& map->paint_tile_width == 3
|
||||
&& map->paint_tile_height == 3;
|
||||
emit map->paintTileChanged(map);
|
||||
}
|
||||
}
|
||||
|
||||
void CollisionMetatilesPixmapItem::updateCurHoveredMetatile(QPointF pos) {
|
||||
|
|
@ -345,11 +363,13 @@ void MapPixmapItem::paint(QGraphicsSceneMouseEvent *event) {
|
|||
QPointF pos = event->pos();
|
||||
int x = (int)(pos.x()) / 16;
|
||||
int y = (int)(pos.y()) / 16;
|
||||
Block *block = map->getBlock(x, y);
|
||||
if (block) {
|
||||
block->tile = map->paint_tile;
|
||||
map->_setBlock(x, y, *block);
|
||||
|
||||
if (map->smart_paths_enabled) {
|
||||
paintSmartPath(x, y);
|
||||
} else {
|
||||
paintNormal(x, y);
|
||||
}
|
||||
|
||||
if (event->type() == QEvent::GraphicsSceneMouseRelease) {
|
||||
map->commit();
|
||||
}
|
||||
|
|
@ -357,6 +377,114 @@ void MapPixmapItem::paint(QGraphicsSceneMouseEvent *event) {
|
|||
}
|
||||
}
|
||||
|
||||
void MapPixmapItem::paintNormal(int x, int y) {
|
||||
// Snap the selected position to the top-left of the block boundary.
|
||||
// This allows painting via dragging the mouse to tile the painted region.
|
||||
int xDiff = x - map->paint_tile_initial_x;
|
||||
int yDiff = y - map->paint_tile_initial_y;
|
||||
if (xDiff < 0 && xDiff % map->paint_tile_width != 0) xDiff -= map->paint_tile_width;
|
||||
if (yDiff < 0 && yDiff % map->paint_tile_height != 0) yDiff -= map->paint_tile_height;
|
||||
|
||||
x = map->paint_tile_initial_x + (xDiff / map->paint_tile_width) * map->paint_tile_width;
|
||||
y = map->paint_tile_initial_y + (yDiff / map->paint_tile_height) * map->paint_tile_height;
|
||||
for (int i = 0; i < map->paint_tile_width && i + x < map->getWidth(); i++)
|
||||
for (int j = 0; j < map->paint_tile_height && j + y < map->getHeight(); j++) {
|
||||
int actualX = i + x;
|
||||
int actualY = j + y;
|
||||
Block *block = map->getBlock(actualX, actualY);
|
||||
if (block) {
|
||||
block->tile = map->paint_tile + i + (j * 8);
|
||||
map->_setBlock(actualX, actualY, *block);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// These are tile offsets from the top-left tile in the 3x3 smart path selection.
|
||||
// Each entry is for one possibility from the marching squares value for a tile.
|
||||
// (Marching Squares: https://en.wikipedia.org/wiki/Marching_squares)
|
||||
QList<int> MapPixmapItem::smartPathTable = QList<int>({
|
||||
8 + 1, // 0000
|
||||
8 + 1, // 0001
|
||||
8 + 1, // 0010
|
||||
16 + 0, // 0011
|
||||
8 + 1, // 0100
|
||||
8 + 1, // 0101
|
||||
0 + 0, // 0110
|
||||
8 + 0, // 0111
|
||||
8 + 1, // 1000
|
||||
16 + 2, // 1001
|
||||
8 + 1, // 1010
|
||||
16 + 1, // 1011
|
||||
0 + 2, // 1100
|
||||
8 + 2, // 1101
|
||||
0 + 1, // 1110
|
||||
8 + 1, // 1111
|
||||
});
|
||||
|
||||
#define IS_SMART_PATH_TILE(block) ((block->tile >= map->paint_tile && block->tile < map->paint_tile + 3) \
|
||||
|| (block->tile >= map->paint_tile + 8 && block->tile < map->paint_tile + 11) \
|
||||
|| (block->tile >= map->paint_tile + 16 && block->tile < map->paint_tile + 19))
|
||||
|
||||
void MapPixmapItem::paintSmartPath(int x, int y) {
|
||||
// Smart path should never be enabled without a 3x3 block selection.
|
||||
if (map->paint_tile_width != 3 || map->paint_tile_height != 3) return;
|
||||
|
||||
// Shift to the middle tile of the smart path selection.
|
||||
int openTile = map->paint_tile + 8 + 1;
|
||||
|
||||
// Fill the region with the open tile.
|
||||
for (int i = -1; i <= 1 && i + x < map->getWidth() && i + x >= 0; i++)
|
||||
for (int j = -1; j <= 1 && j + y < map->getHeight() && j + y >= 0; j++) {
|
||||
int actualX = i + x;
|
||||
int actualY = j + y;
|
||||
Block *block = map->getBlock(actualX, actualY);
|
||||
if (block) {
|
||||
block->tile = openTile;
|
||||
map->_setBlock(actualX, actualY, *block);
|
||||
}
|
||||
}
|
||||
|
||||
// Go back and resolve the edge tiles
|
||||
for (int i = -2; i <= 2 && i + x < map->getWidth() && i + x >= 0; i++)
|
||||
for (int j = -2; j <= 2 && j + y < map->getHeight() && j + y >= 0; j++) {
|
||||
// Ignore the corners, which can't possible be affected by the smart path.
|
||||
if ((i == -2 && j == -2) || (i == 2 && j == -2) ||
|
||||
(i == -2 && j == 2) || (i == 2 && j == 2))
|
||||
continue;
|
||||
|
||||
// Ignore tiles that aren't part of the smart path set.
|
||||
int actualX = i + x;
|
||||
int actualY = j + y;
|
||||
Block *block = map->getBlock(actualX, actualY);
|
||||
if (!block || !IS_SMART_PATH_TILE(block)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
int id = 0;
|
||||
Block *top = map->getBlock(actualX, actualY - 1);
|
||||
Block *right = map->getBlock(actualX + 1, actualY);
|
||||
Block *bottom = map->getBlock(actualX, actualY + 1);
|
||||
Block *left = map->getBlock(actualX - 1, actualY);
|
||||
|
||||
// Get marching squares value, to determine which tile to use.
|
||||
if (top && IS_SMART_PATH_TILE(top))
|
||||
id += 1;
|
||||
if (right && IS_SMART_PATH_TILE(right))
|
||||
id += 2;
|
||||
if (bottom && IS_SMART_PATH_TILE(bottom))
|
||||
id += 4;
|
||||
if (left && IS_SMART_PATH_TILE(left))
|
||||
id += 8;
|
||||
|
||||
if (block) {
|
||||
qDebug() << "tile: " << block->tile << "base: " << map->paint_tile << "id: " << id;
|
||||
}
|
||||
|
||||
block->tile = map->paint_tile + smartPathTable[id];;
|
||||
map->_setBlock(actualX, actualY, *block);
|
||||
}
|
||||
}
|
||||
|
||||
void MapPixmapItem::floodFill(QGraphicsSceneMouseEvent *event) {
|
||||
if (map) {
|
||||
QPointF pos = event->pos();
|
||||
|
|
@ -374,6 +502,8 @@ void MapPixmapItem::pick(QGraphicsSceneMouseEvent *event) {
|
|||
Block *block = map->getBlock(x, y);
|
||||
if (block) {
|
||||
map->paint_tile = block->tile;
|
||||
map->paint_tile_width = 1;
|
||||
map->paint_tile_height = 1;
|
||||
emit map->paintTileChanged(map);
|
||||
}
|
||||
}
|
||||
|
|
@ -451,6 +581,11 @@ void MapPixmapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) {
|
|||
map->clearHoveredTile();
|
||||
}
|
||||
void MapPixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
|
||||
QPointF pos = event->pos();
|
||||
int x = ((int)pos.x()) / 16;
|
||||
int y = ((int)pos.y()) / 16;
|
||||
map->paint_tile_initial_x = x;
|
||||
map->paint_tile_initial_y = y;
|
||||
emit mouseEvent(event, this);
|
||||
}
|
||||
void MapPixmapItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
|
||||
|
|
|
|||
6
editor.h
6
editor.h
|
|
@ -204,6 +204,9 @@ public:
|
|||
|
||||
private:
|
||||
void updateCurHoveredTile(QPointF pos);
|
||||
void paintNormal(int x, int y);
|
||||
void paintSmartPath(int x, int y);
|
||||
static QList<int> smartPathTable;
|
||||
|
||||
signals:
|
||||
void mouseEvent(QGraphicsSceneMouseEvent *, MapPixmapItem *);
|
||||
|
|
@ -248,8 +251,9 @@ public:
|
|||
connect(map, SIGNAL(paintTileChanged(Map*)), this, SLOT(paintTileChanged(Map *)));
|
||||
}
|
||||
Map* map = NULL;
|
||||
virtual void pick(uint);
|
||||
virtual void draw();
|
||||
private:
|
||||
void updateSelection(QPointF pos, Qt::MouseButton button);
|
||||
protected:
|
||||
virtual void updateCurHoveredMetatile(QPointF pos);
|
||||
private slots:
|
||||
|
|
|
|||
12
map.cpp
12
map.cpp
|
|
@ -453,11 +453,15 @@ void Map::drawSelection(int i, int w, QPainter *painter) {
|
|||
int x = i % w;
|
||||
int y = i / w;
|
||||
painter->save();
|
||||
painter->setPen(QColor(0xff, 0xff, 0xff));
|
||||
painter->drawRect(x * 16, y * 16, 15, 15);
|
||||
|
||||
QColor penColor = smart_paths_enabled ? QColor(0xff, 0x0, 0xff) : QColor(0xff, 0xff, 0xff);
|
||||
painter->setPen(penColor);
|
||||
int rectWidth = paint_tile_width * 16;
|
||||
int rectHeight = paint_tile_height * 16;
|
||||
painter->drawRect(x * 16, y * 16, rectWidth - 1, rectHeight -1);
|
||||
painter->setPen(QColor(0, 0, 0));
|
||||
painter->drawRect(x * 16 - 1, y * 16 - 1, 17, 17);
|
||||
painter->drawRect(x * 16 + 1, y * 16 + 1, 13, 13);
|
||||
painter->drawRect(x * 16 - 1, y * 16 - 1, rectWidth + 1, rectHeight + 1);
|
||||
painter->drawRect(x * 16 + 1, y * 16 + 1, rectWidth - 3, rectHeight - 3);
|
||||
painter->restore();
|
||||
}
|
||||
|
||||
|
|
|
|||
7
map.h
7
map.h
|
|
@ -138,7 +138,14 @@ public:
|
|||
QImage image;
|
||||
QPixmap pixmap;
|
||||
QList<QImage> metatile_images;
|
||||
bool smart_paths_enabled = false;
|
||||
int paint_metatile_initial_x;
|
||||
int paint_metatile_initial_y;
|
||||
int paint_tile;
|
||||
int paint_tile_width = 1;
|
||||
int paint_tile_height = 1;
|
||||
int paint_tile_initial_x;
|
||||
int paint_tile_initial_y;
|
||||
int paint_collision;
|
||||
int paint_elevation;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue