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

Fix metatile label saving

Browse source
This commit is contained in:
GriffinR 2023-05-18 21:29:27 -04:00
parent 0b6d61e3f1
commit ea704c8ef7
2 changed files with 81 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/project.h
View file

@ -77,6 +77,7 @@ public:
QStringList trainerTypes; QStringList trainerTypes;
QStringList globalScriptLabels; QStringList globalScriptLabels;
QMap<QString, QMap<QString, int>> metatileLabelsMap; QMap<QString, QMap<QString, int>> metatileLabelsMap;
QMap<QString, int> unusedMetatileLabels;
QMap<QString, int> metatileBehaviorMap; QMap<QString, int> metatileBehaviorMap;
QMap<int, QString> metatileBehaviorMapInverse; QMap<int, QString> metatileBehaviorMapInverse;
QMap<QString, QString> facingDirections; QMap<QString, QString> facingDirections;
@ -216,6 +217,10 @@ public:
QString getDefaultPrimaryTilesetLabel(); QString getDefaultPrimaryTilesetLabel();
QString getDefaultSecondaryTilesetLabel(); QString getDefaultSecondaryTilesetLabel();
void updateTilesetMetatileLabels(Tileset *tileset);
QString buildMetatileLabelsText(const QMap<QString, int> defines);
QString findMetatileLabelsTileset(QString label);
void setImportExportPath(QString filename); void setImportExportPath(QString filename);
static int getNumTilesPrimary(); static int getNumTilesPrimary();

156
src/project.cpp
View file

@ -890,86 +890,70 @@ void Project::saveTilesets(Tileset *primaryTileset, Tileset *secondaryTileset) {
saveTilesetPalettes(secondaryTileset); saveTilesetPalettes(secondaryTileset);
} }
void Project::updateTilesetMetatileLabels(Tileset *tileset) {
// Erase old labels, then repopulate with new labels
const QString prefix = tileset->getMetatileLabelPrefix();
metatileLabelsMap[tileset->name].clear();
for (int metatileId : tileset->metatileLabels.keys()) {
QString label = prefix + tileset->metatileLabels[metatileId];
metatileLabelsMap[tileset->name][label] = metatileId;
}
}
// Given a map of define names to define values, returns a formatted list of #defines
QString Project::buildMetatileLabelsText(const QMap<QString, int> defines) {
QStringList labels = defines.keys();
// Setup for pretty formatting.
int longestLength = 0;
for (QString label : labels) {
if (label.size() > longestLength)
longestLength = label.size();
}
// Generate defines text
QString output = QString();
for (QString label : labels) {
int metatileId = defines[label];
QString line = QString("#define %1 0x%2\n")
.arg(label, -1 * longestLength)
.arg(QString("%1").arg(metatileId, 3, 16, QChar('0')).toUpper());
output += line;
}
return output;
}
void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *secondaryTileset) { void Project::saveTilesetMetatileLabels(Tileset *primaryTileset, Tileset *secondaryTileset) {
QString primaryPrefix = primaryTileset->getMetatileLabelPrefix(); // Skip writing the file if there are no labels in both the new and old sets
QString secondaryPrefix = secondaryTileset->getMetatileLabelPrefix(); if (metatileLabelsMap[primaryTileset->name].size() == 0 && primaryTileset->metatileLabels.size() == 0
&& metatileLabelsMap[secondaryTileset->name].size() == 0 && secondaryTileset->metatileLabels.size() == 0)
QMap<QString, int> defines;
bool definesFileModified = false;
QString metatileLabelsFilename = projectConfig.getFilePath(ProjectFilePath::constants_metatile_labels);
defines = parser.readCDefines(metatileLabelsFilename, (QStringList() << "METATILE_"));
// Purge old entries from the file.
QStringList definesToRemove;
for (QString defineName : defines.keys()) {
if (defineName.startsWith(primaryPrefix) || defineName.startsWith(secondaryPrefix)) {
definesToRemove << defineName;
}
}
for (QString defineName : definesToRemove) {
defines.remove(defineName);
definesFileModified = true;
}
// Add the new labels.
for (int metatileId : primaryTileset->metatileLabels.keys()) {
QString label = primaryTileset->metatileLabels.value(metatileId);
if (label.isEmpty()) continue;
QString defineName = QString("%1%2").arg(primaryPrefix, label);
defines.insert(defineName, metatileId);
definesFileModified = true;
}
for (int metatileId : secondaryTileset->metatileLabels.keys()) {
QString label = secondaryTileset->metatileLabels.value(metatileId);
if (label.isEmpty()) continue;
QString defineName = QString("%1%2").arg(secondaryPrefix, label);
defines.insert(defineName, metatileId);
definesFileModified = true;
}
if (!definesFileModified) {
return; return;
updateTilesetMetatileLabels(primaryTileset);
updateTilesetMetatileLabels(secondaryTileset);
// Recreate metatile labels file
const QString guardName = "GUARD_METATILE_LABELS_H";
QString outputText = QString("#ifndef %1\n#define %1\n").arg(guardName);
for (QString tilesetName : metatileLabelsMap.keys()) {
if (metatileLabelsMap[tilesetName].size() == 0)
continue;
outputText += QString("\n// %1\n").arg(tilesetName);
outputText += buildMetatileLabelsText(metatileLabelsMap[tilesetName]);
} }
auto getTilesetFromLabel = [](QString labelName) { if (unusedMetatileLabels.size() != 0) {
static const QRegularExpression re_tilesetName("METATILE_(?<tileset>[A-Za-z0-9]+)_"); // Append any defines originally read from the file that aren't associated with any tileset.
return re_tilesetName.match(labelName).captured("tileset"); outputText += QString("\n// Other\n");
}; outputText += buildMetatileLabelsText(unusedMetatileLabels);
QString outputText = "#ifndef GUARD_METATILE_LABELS_H\n";
outputText += "#define GUARD_METATILE_LABELS_H\n";
for (int i = 0; i < defines.size();) {
QString defineName = defines.keys()[i];
QString currentTileset = getTilesetFromLabel(defineName);
outputText += QString("\n// gTileset_%1\n").arg(currentTileset);
int j = 0, longestLength = 0;
QMap<QString, int> definesOut;
// Setup for pretty formatting.
while (i + j < defines.size() && getTilesetFromLabel(defines.keys()[i + j]) == currentTileset) {
defineName = defines.keys()[i + j];
if (defineName.size() > longestLength)
longestLength = defineName.size();
definesOut.insert(defineName, defines[defineName]);
j++;
}
for (QString defineName : definesOut.keys()) {
int value = defines[defineName];
QString line = QString("#define %1 0x%2\n")
.arg(defineName, -1 * longestLength)
.arg(QString("%1").arg(value, 3, 16, QChar('0')).toUpper());
outputText += line;
}
i += j;
} }
outputText += "\n#endif // GUARD_METATILE_LABELS_H\n"; outputText += QString("\n#endif // %1\n").arg(guardName);
ignoreWatchedFileTemporarily(root + "/" + metatileLabelsFilename); QString filename = projectConfig.getFilePath(ProjectFilePath::constants_metatile_labels);
saveTextFile(root + "/" + metatileLabelsFilename, outputText); ignoreWatchedFileTemporarily(root + "/" + filename);
saveTextFile(root + "/" + filename, outputText);
} }
void Project::saveTilesetMetatileAttributes(Tileset *tileset) { void Project::saveTilesetMetatileAttributes(Tileset *tileset) {
@ -1496,20 +1480,32 @@ void Project::loadTilesetMetatiles(Tileset* tileset) {
} }
} }
QString Project::findMetatileLabelsTileset(QString label) {
for (QString tilesetName : this->tilesetLabelsOrdered) {
QString metatileLabelPrefix = Tileset::getMetatileLabelPrefix(tilesetName);
if (label.startsWith(metatileLabelPrefix))
return tilesetName;
}
return QString();
}
bool Project::readTilesetMetatileLabels() { bool Project::readTilesetMetatileLabels() {
metatileLabelsMap.clear(); metatileLabelsMap.clear();
unusedMetatileLabels.clear();
QString metatileLabelsFilename = projectConfig.getFilePath(ProjectFilePath::constants_metatile_labels); QString metatileLabelsFilename = projectConfig.getFilePath(ProjectFilePath::constants_metatile_labels);
fileWatcher.addPath(root + "/" + metatileLabelsFilename); fileWatcher.addPath(root + "/" + metatileLabelsFilename);
QMap<QString, int> labels = parser.readCDefines(metatileLabelsFilename, QStringList() << "METATILE_"); QMap<QString, int> defines = parser.readCDefines(metatileLabelsFilename, QStringList() << "METATILE_");
for (QString tilesetLabel : this->tilesetLabelsOrdered) { for (QString label : defines.keys()) {
QString metatileLabelPrefix = Tileset::getMetatileLabelPrefix(tilesetLabel); QString tilesetName = findMetatileLabelsTileset(label);
for (QString key : labels.keys()) { if (!tilesetName.isEmpty()) {
if (key.startsWith(metatileLabelPrefix)) { metatileLabelsMap[tilesetName][label] = defines[label];
metatileLabelsMap[tilesetLabel][key] = labels[key]; } else {
} // This #define name does not match any existing tileset.
// Save it separately to be outputted later.
unusedMetatileLabels[label] = defines[label];
} }
} }