atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Some connection TODO cleanup

Browse source
This commit is contained in:
GriffinR 2024-08-03 20:52:10 -04:00
parent 2bb01a9988
commit 7eb3c17f4a
3 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/editor.h
View file

@ -190,7 +190,6 @@ private:
void updateConnectionItem(ConnectionPixmapItem* connectionItem);
void updateConnectionItemPos(ConnectionPixmapItem* connectionItem);
void createConnectionItem(MapConnection* connection);
void addConnectionToList(ConnectionPixmapItem* connection);
void createDiveEmergeConnection(MapConnection* connection);
void setDiveEmergeMapName(QString mapName, QString direction);
MapConnectionMirror getMirroredConnection(MapConnection*);

2
src/core/mapconnection.cpp
View file

@ -13,7 +13,7 @@ MapConnection MapConnection::mirror(const MapConnection &source, const QString &
};
MapConnection mirror;
mirror.direction = oppositeDirections.value(source.direction/*, source.direction*/);
mirror.direction = oppositeDirections.value(source.direction, source.direction);
mirror.map_name = mapName;
mirror.offset = -source.offset;

55
src/editor.cpp
View file

@ -728,27 +728,25 @@ void Editor::updateEncounterFields(EncounterFields newFields) {
void Editor::createConnectionItem(MapConnection* connection) {
if (!connection)
return;
// Create connection image
QPixmap pixmap = getConnectionPixmap(*connection);
QPoint pos = calculateConnectionPosition(*connection, pixmap);
ConnectionPixmapItem *item = new ConnectionPixmapItem(pixmap, connection, pos.x(), pos.y());
item->render();
scene->addItem(item);
ConnectionPixmapItem *connectionItem = new ConnectionPixmapItem(pixmap, connection, pos.x(), pos.y());
connectionItem->render();
scene->addItem(connectionItem);
connect(item, &ConnectionPixmapItem::selectionChanged, [this, item](bool selected) {
if (selected) setSelectedConnection(item);
});
connect(item, &ConnectionPixmapItem::connectionItemDoubleClicked, [this, item] {
emit this->connectionItemDoubleClicked(item->connection->map_name, map->name);
});
connection_items.append(item);
addConnectionToList(item);
}
void Editor::addConnectionToList(ConnectionPixmapItem * connectionItem) {
// Create item for the list panel
ConnectionsListItem *listItem = new ConnectionsListItem(ui->scrollAreaContents_ConnectionsList, connectionItem->connection, project->mapNames);
ui->layout_ConnectionsList->insertWidget(ui->layout_ConnectionsList->count() - 1, listItem); // Insert above the vertical spacer
connect(connectionItem, &ConnectionPixmapItem::selectionChanged, [this, connectionItem](bool selected) {
if (selected) setSelectedConnection(connectionItem);
});
connect(connectionItem, &ConnectionPixmapItem::connectionItemDoubleClicked, [this, connectionItem] {
emit this->connectionItemDoubleClicked(connectionItem->connection->map_name, map->name);
});
// Sync the selection highlight between the list UI and the graphical map connection
connect(connectionItem, &ConnectionPixmapItem::selectionChanged, listItem, &ConnectionsListItem::setSelected);
connect(listItem, &ConnectionsListItem::selected, [this, connectionItem] {
@ -789,6 +787,8 @@ void Editor::addConnectionToList(ConnectionPixmapItem * connectionItem) {
connect(listItem, &ConnectionsListItem::doubleClicked, [this](QString connectedMapName) {
emit connectionItemDoubleClicked(connectedMapName, map->name);
});
connection_items.append(connectionItem);
}
@ -924,13 +924,17 @@ MapConnectionMirror Editor::getMirroredConnection(MapConnection* source) {
}
void Editor::addMirroredConnection(MapConnection* source) {
MapConnectionMirror mirror = getMirroredConnection(source);
if (!mirror.map)
if (!map || !source || !ui->checkBox_MirrorConnections->isChecked())
return;
mirror.connection = new MapConnection; // TODO: Are we leaking memory here if mirror.connection != nullptr
*mirror.connection = MapConnection::mirror(*source, map->name);
addConnection(mirror.map, mirror.connection, false);
// Note: It's possible (and ok) for connectedMap == this->map
Map* connectedMap = project->getMap(source->map_name);
if (!connectedMap)
return;
MapConnection *mirror = new MapConnection;
*mirror = MapConnection::mirror(*source, map->name);
addConnection(connectedMap, mirror, false);
}
void Editor::removeMirroredConnection(MapConnection* source) {
@ -938,19 +942,22 @@ void Editor::removeMirroredConnection(MapConnection* source) {
removeConnection(mirror.map, mirror.connection, false);
}
// TODO: Self-connecting a Dive/Emerge map connection will not actually replace any existing Dive/Emerge connection, if there is one.
void Editor::createDiveEmergeConnection(MapConnection* connection) {
if (!connection)
return;
QGraphicsPixmapItem *item;
// Create image of Dive/Emerge map
QPixmap pixmap;
Map *connectedMap = project->getMap(connection->map_name);
if (!connectedMap || connectedMap == this->map) {
// There's no point in rendering a map on top of itself.
// We create an empty image anyway to allow for changes later.
item = new QGraphicsPixmapItem(QPixmap());
pixmap = QPixmap();
} else {
item = new QGraphicsPixmapItem(connectedMap->render());
pixmap = connectedMap->render();
}
QGraphicsPixmapItem *item = new QGraphicsPixmapItem(pixmap);
scene->addItem(item);
if (connection->direction == "dive") {
@ -1986,7 +1993,7 @@ void Editor::displayMapBorder() {
item->setX(x * 16);
item->setY(y * 16);
item->setZValue(-3);
scene->addItem(item); // TODO: If the scene is taking ownership here is a double-free possible?
scene->addItem(item);
borderItems.append(item);
}
}