Add onTilesetUpdated to scripting callbacks

This commit is contained in:
GriffinR
2021-11-30 17:24:46 -05:00
committed by huderlem
parent 5a5d16bdc6
commit 6bae415fc1
6 changed files with 24 additions and 2 deletions

View File

@@ -1361,6 +1361,12 @@ void Editor::displayMetatileSelector() {
metatile_selector_item->select(0);
} else {
metatile_selector_item->setMap(map);
if (metatile_selector_item->primaryTileset
&& metatile_selector_item->primaryTileset->name != map->layout->tileset_primary->name)
emit tilesetUpdated(map->layout->tileset_primary->name);
if (metatile_selector_item->secondaryTileset
&& metatile_selector_item->secondaryTileset->name != map->layout->tileset_secondary->name)
emit tilesetUpdated(map->layout->tileset_secondary->name);
metatile_selector_item->setTilesets(map->layout->tileset_primary, map->layout->tileset_secondary);
}

View File

@@ -258,6 +258,7 @@ void MainWindow::initEditor() {
connect(this->editor, &Editor::wildMonDataChanged, this, &MainWindow::onWildMonDataChanged);
connect(this->editor, &Editor::mapRulerStatusChanged, this, &MainWindow::onMapRulerStatusChanged);
connect(this->editor, &Editor::editedMapData, this, &MainWindow::markMapEdited);
connect(this->editor, &Editor::tilesetUpdated, this, &Scripting::cb_TilesetUpdated);
connect(ui->toolButton_Open_Scripts, &QToolButton::pressed, this->editor, &Editor::openMapScripts);
connect(ui->actionOpen_Project_in_Text_Editor, &QAction::triggered, this->editor, &Editor::openProjectInTextEditor);
@@ -2701,12 +2702,14 @@ void MainWindow::onTilesetsSaved(QString primaryTilesetLabel, QString secondaryT
bool updated = false;
if (primaryTilesetLabel == this->editor->map->layout->tileset_primary_label) {
this->editor->updatePrimaryTileset(primaryTilesetLabel, true);
Scripting::cb_TilesetUpdated(primaryTilesetLabel);
updated = true;
} else {
this->editor->project->getTileset(primaryTilesetLabel, true);
}
if (secondaryTilesetLabel == this->editor->map->layout->tileset_secondary_label) {
this->editor->updateSecondaryTileset(secondaryTilesetLabel, true);
Scripting::cb_TilesetUpdated(secondaryTilesetLabel);
updated = true;
} else {
this->editor->project->getTileset(secondaryTilesetLabel, true);

View File

@@ -6,6 +6,7 @@ QMap<CallbackType, QString> callbackFunctions = {
{OnProjectClosed, "onProjectClosed"},
{OnBlockChanged, "onBlockChanged"},
{OnMapOpened, "onMapOpened"},
{OnTilesetUpdated, "onTilesetUpdated"},
};
Scripting *instance = nullptr;
@@ -140,6 +141,15 @@ void Scripting::cb_MapOpened(QString mapName) {
instance->invokeCallback(OnMapOpened, args);
}
void Scripting::cb_TilesetUpdated(QString tilesetName) {
if (!instance) return;
QJSValueList args {
tilesetName,
};
instance->invokeCallback(OnTilesetUpdated, args);
}
QJSValue Scripting::fromBlock(Block block) {
QJSValue obj = instance->engine->newObject();
obj.setProperty("metatileId", block.metatileId);