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

Preserve invalid metatile selections

Browse source
This commit is contained in:
GriffinR 2021-12-19 17:25:44 -05:00 committed by huderlem
parent a6fb7eaeca
commit c6cec5f848
2 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ui/metatileselector.h
View file

@ -50,6 +50,7 @@ private:
QList<uint16_t> *externalSelectedMetatiles; QList<uint16_t> *externalSelectedMetatiles;
void updateSelectedMetatiles(); void updateSelectedMetatiles();
void updateExternalSelectedMetatiles();
uint16_t getMetatileId(int x, int y); uint16_t getMetatileId(int x, int y);
QPoint getMetatileIdCoords(uint16_t); QPoint getMetatileIdCoords(uint16_t);
bool shouldAcceptEvent(QGraphicsSceneMouseEvent*); bool shouldAcceptEvent(QGraphicsSceneMouseEvent*);

56
src/ui/metatileselector.cpp
View file

@ -64,26 +64,15 @@ bool MetatileSelector::selectFromMap(uint16_t metatileId, uint16_t collision, ui
void MetatileSelector::setTilesets(Tileset *primaryTileset, Tileset *secondaryTileset) { void MetatileSelector::setTilesets(Tileset *primaryTileset, Tileset *secondaryTileset) {
this->primaryTileset = primaryTileset; this->primaryTileset = primaryTileset;
this->secondaryTileset = secondaryTileset; this->secondaryTileset = secondaryTileset;
if (!this->selectionIsValid()) { if (this->externalSelection)
if (this->externalSelection) { this->updateExternalSelectedMetatiles();
this->select(0); else
} else { this->updateSelectedMetatiles();
this->select(Project::getNumMetatilesPrimary() + this->secondaryTileset->metatiles.length() - 1);
}
} else if (this->externalSelection) {
emit selectedMetatilesChanged();
} else {
updateSelectedMetatiles();
}
this->draw(); this->draw();
} }
QList<uint16_t>* MetatileSelector::getSelectedMetatiles() { QList<uint16_t>* MetatileSelector::getSelectedMetatiles() {
if (this->externalSelection) { return this->selectedMetatiles;
return this->externalSelectedMetatiles;
} else {
return this->selectedMetatiles;
}
} }
QList<QPair<uint16_t, uint16_t>>* MetatileSelector::getSelectedCollisions() { QList<QPair<uint16_t, uint16_t>>* MetatileSelector::getSelectedCollisions() {
@ -95,10 +84,15 @@ void MetatileSelector::setExternalSelection(int width, int height, QList<uint16_
this->externalSelectionWidth = width; this->externalSelectionWidth = width;
this->externalSelectionHeight = height; this->externalSelectionHeight = height;
this->externalSelectedMetatiles->clear(); this->externalSelectedMetatiles->clear();
this->selectedMetatiles->clear();
this->selectedCollisions->clear(); this->selectedCollisions->clear();
for (int i = 0; i < metatiles.length(); i++) { for (int i = 0; i < metatiles.length(); i++) {
this->externalSelectedMetatiles->append(metatiles.at(i));
this->selectedCollisions->append(collisions.at(i)); this->selectedCollisions->append(collisions.at(i));
uint16_t metatileId = metatiles.at(i);
this->externalSelectedMetatiles->append(metatileId);
if (!Tileset::metatileIsValid(metatileId, this->primaryTileset, this->secondaryTileset))
metatileId = 0;
this->selectedMetatiles->append(metatileId);
} }
this->draw(); this->draw();
@ -151,31 +145,23 @@ void MetatileSelector::updateSelectedMetatiles() {
for (int j = 0; j < dimensions.y(); j++) { for (int j = 0; j < dimensions.y(); j++) {
for (int i = 0; i < dimensions.x(); i++) { for (int i = 0; i < dimensions.x(); i++) {
uint16_t metatileId = this->getMetatileId(origin.x() + i, origin.y() + j); uint16_t metatileId = this->getMetatileId(origin.x() + i, origin.y() + j);
if (!Tileset::metatileIsValid(metatileId, this->primaryTileset, this->secondaryTileset))
metatileId = 0;
this->selectedMetatiles->append(metatileId); this->selectedMetatiles->append(metatileId);
} }
} }
emit selectedMetatilesChanged(); emit selectedMetatilesChanged();
} }
bool MetatileSelector::selectionIsValid() { void MetatileSelector::updateExternalSelectedMetatiles() {
if (this->externalSelection) { this->selectedMetatiles->clear();
for (int i = 0; i < this->externalSelectedMetatiles->count(); ++i) { for (int i = 0; i < this->externalSelectedMetatiles->count(); ++i) {
int tileId = this->externalSelectedMetatiles->at(i); uint16_t metatileId = this->externalSelectedMetatiles->at(i);
if (!Tileset::metatileIsValid(tileId, this->primaryTileset, this->secondaryTileset)) if (!Tileset::metatileIsValid(metatileId, this->primaryTileset, this->secondaryTileset))
return false; metatileId = 0;
} this->selectedMetatiles->append(metatileId);
return true;
} else {
QPoint origin = this->getSelectionStart();
QPoint dimensions = this->getSelectionDimensions();
for (int j = 0; j < dimensions.y(); j++) {
for (int i = 0; i < dimensions.x(); i++) {
if (!Tileset::metatileIsValid(this->getMetatileId(origin.x() + i, origin.y() + j), this->primaryTileset, this->secondaryTileset))
return false;
}
}
return true;
} }
emit selectedMetatilesChanged();
} }
uint16_t MetatileSelector::getMetatileId(int x, int y) { uint16_t MetatileSelector::getMetatileId(int x, int y) {