feedc0de/QtGameMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also update object collisions when an object is renamed or removed

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-12-29 18:16:09 +01:00
parent 42575e5d5a
commit ba10f806a5
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/editor/models/projecttreemodel.cpp
View File

@@ -961,6 +961,9 @@ template<> void ProjectTreeModel::onBeforeRemove<Sprite>(const Sprite &sprite)
template<> void ProjectTreeModel::onBeforeRemove<Object>(const Object &object) template<> void ProjectTreeModel::onBeforeRemove<Object>(const Object &object)
{ {
for (auto &object : m_project->objects)
object.collisionEvents.erase(object.name);
for (auto &room : m_project->rooms) for (auto &room : m_project->rooms)
for (auto iter = std::begin(room.objects); iter != std::end(room.objects); ) for (auto iter = std::begin(room.objects); iter != std::end(room.objects); )
if (iter->objectName == object.name) if (iter->objectName == object.name)
@@ -999,20 +1002,28 @@ template<> void ProjectTreeModel::onAfterRename<Sprite>(const Sprite &sprite, co
} }
} }
template<> void ProjectTreeModel::onAfterRename<Object>(const Object &object, const QString &oldName) template<> void ProjectTreeModel::onBeforeRename<Object>(const Object &object, const QString &newName)
{ {
for (auto &object : m_project->objects)
{
if (const auto iter = object.collisionEvents.find(object.name); iter != std::end(object.collisionEvents))
{
auto node = object.collisionEvents.extract(iter);
node.key() = newName;
object.collisionEvents.insert(std::move(node));
}
}
for (auto &room : m_project->rooms) for (auto &room : m_project->rooms)
{ {
for (auto &obj : room.objects) for (auto &obj : room.objects)
{ {
if (obj.objectName != oldName) if (obj.objectName != object.name)
continue; continue;
obj.objectName = object.name; obj.objectName = object.name;
} }
} }
// TODO object collision events
} }
template<typename T> template<typename T>