support overlapping moves

Author: nschimme

src/display/mapcanvas.cpp

@@ -660,16 +660,7 @@ void MapCanvas::mouseMoveEvent(QMouseEvent *const event)
                 auto &map = this->m_data;
                 auto isMovable = [&map](RoomSelection &sel, const Coordinate &offset) -> bool {
                     sel.removeMissing(map);
-                    for (const RoomId id : sel) {
-                        const Coordinate &here = map.getRoomHandle(id).getPosition();
-                        const Coordinate target = here + offset;
-                        if (const auto &other = map.findRoomHandle(target)) {
-                            if (!sel.contains(other.getId())) {
-                                return false;
-                            }
-                        }
-                    }
-                    return true;
+                    return map.getCurrentMap().wouldAllowRelativeMove(sel.getRoomIds(), offset);
                 };
 
                 const auto diff = getSel2().pos.truncate() - getSel1().pos.truncate();
@@ -823,10 +814,8 @@ void MapCanvas::mouseReleaseEvent(QMouseEvent *const event)
                 m_roomSelectionMove.reset();
                 if (!wrongPlace && (m_roomSelection != nullptr)) {
                     const Coordinate moverel{pos, 0};
-                    m_data.applyChangesToList(
-                        *m_roomSelection, [&moverel](const RawRoom &room) -> Change {
-                            return Change{room_change_types::MoveRelative{room.getId(), moverel}};
-                        });
+                    m_data.applySingleChange(Change{
+                        room_change_types::MoveRelative2{m_roomSelection->getRoomIds(), moverel}});
                 }
 
             } else {

src/map/ChangePrinter.cpp

@@ -561,6 +561,18 @@ void ChangePrinter::print(const RoomFieldVariant &var)
 #undef X_NOP
 }
 
+void ChangePrinter::print(const RoomIdSet &set)
+{
+    auto prefix = "";
+    m_os << "RoomIdSet{";
+    for (auto id : set) {
+        m_os << prefix;
+        prefix = ", ";
+        print(id);
+    }
+    m_os << "}";
+}
+
 void ChangePrinter::print(const ParseEvent &event)
 {
     BEGIN_STRUCT_HELPER("ParseEvent")
@@ -663,6 +675,15 @@ void ChangePrinter::virt_accept(const MoveRelative &change)
     }
 }
 
+void ChangePrinter::virt_accept(const MoveRelative2 &change)
+{
+    BEGIN_STRUCT_HELPER("MoveRelative2")
+    {
+        HELPER_ADD_MEMBER(rooms);
+        HELPER_ADD_MEMBER(offset);
+    }
+}
+
 void ChangePrinter::virt_accept(const TryMoveCloseTo &change)
 {
     BEGIN_STRUCT_HELPER("TryMoveCloseTo")

src/map/ChangePrinter.h

@@ -88,6 +88,9 @@ struct NODISCARD ChangePrinter final : public AbstractChangeVisitor
     void print(const ExitFieldVariant &var);
     void print(const RoomFieldVariant &var);
 
+private:
+    void print(const RoomIdSet &set);
+
 private:
     void print(const ParseEvent &ev);
 

src/map/ChangeTypes.h

@@ -101,6 +101,12 @@ struct NODISCARD MoveRelative final
     Coordinate offset;
 };
 
+struct NODISCARD MoveRelative2 final
+{
+    RoomIdSet rooms;
+    Coordinate offset;
+};
+
 struct NODISCARD MergeRelative final
 {
     RoomId room = INVALID_ROOMID;
@@ -261,6 +267,8 @@ struct NODISCARD ConnectToNeighborsArgs final
     SEP() \
     X(room_change_types::MoveRelative) \
     SEP() \
+    X(room_change_types::MoveRelative2) \
+    SEP() \
     X(room_change_types::RemoveRoom) \
     SEP() \
     X(room_change_types::SetServerId) \

src/map/Map.cpp

@@ -1078,6 +1078,11 @@ void Map::foreachChangedRoom(ProgressCounter &pc,
     }
 }
 
+NODISCARD bool Map::wouldAllowRelativeMove(const RoomIdSet &set, const Coordinate &offset) const
+{
+    return getWorld().wouldAllowRelativeMove(set, offset);
+}
+
 BasicDiffStats getBasicDiffStats(const Map &baseMap, const Map &modMap)
 {
     const auto &base = baseMap.getWorld();

src/map/Map.h

@@ -140,6 +140,9 @@ class NODISCARD Map final
                                    const Map &saved,
                                    const Map &current,
                                    const std::function<void(const RawRoom &room)> &callback);
+
+public:
+    NODISCARD bool wouldAllowRelativeMove(const RoomIdSet &set, const Coordinate &offset) const;
 };
 
 struct NODISCARD MapApplyResult final

src/map/World.cpp

@@ -841,11 +841,75 @@ void World::setPosition(const RoomId id, const Coordinate &coord)
     m_rooms.setPosition(id, coord);
 }
 
+bool World::wouldAllowRelativeMove(const RoomIdSet &rooms, const Coordinate &offset) const
+{
+    if (rooms.empty()) {
+        return false;
+    }
+    for (const auto id : rooms) {
+        if (!hasRoom(id)) {
+            return false; // avoid throwing
+        }
+        const auto &here = getPosition(id); // throws if missing
+        const auto there = here + offset;
+        if (auto other = findRoom(there)) {
+            if (!rooms.contains(*other)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
 void World::moveRelative(const RoomId id, const Coordinate &offset)
 {
     setPosition(id, getPosition(id) + offset);
 }
 
+void World::moveRelative(const RoomIdSet &rooms, const Coordinate &offset)
+{
+    if (rooms.empty()) {
+        throw std::runtime_error("no rooms specified");
+    }
+
+    if (!wouldAllowRelativeMove(rooms, offset)) {
+        throw std::runtime_error("invalid batch movement");
+    }
+
+    volatile bool use_hack = false;
+    if (use_hack) {
+        // This isn't advised, since it doesn't handle potential signed integer under/overflow.
+        int zimpossible = 1;
+        if (auto bounds = getBounds()) {
+            zimpossible = std::max(0, bounds->max.z - bounds->min.z) + 1;
+        }
+        qInfo() << "zimpossible = " << zimpossible;
+        for (const auto id : rooms) {
+            moveRelative(id, Coordinate{0, 0, -zimpossible});
+        }
+        for (const auto id : rooms) {
+            moveRelative(id, offset + Coordinate{0, 0, zimpossible});
+        }
+    } else {
+        struct NODISCARD MoveInfo final
+        {
+            RoomId id;
+            Coordinate newPos;
+        };
+        std::vector<MoveInfo> infos;
+        infos.reserve(rooms.size());
+        for (const auto id : rooms) {
+            const auto &oldPos = getPosition(id);
+            infos.emplace_back(MoveInfo{id, oldPos + offset});
+            m_spatialDb.remove(id, oldPos);
+        }
+        for (const auto &x : infos) {
+            m_spatialDb.add(x.id, x.newPos);
+            m_rooms.setPosition(x.id, x.newPos);
+        }
+    }
+}
+
 void World::updateRoom(const RawRoom &newRoom)
 {
     const RoomId id = newRoom.id;
@@ -1669,6 +1733,12 @@ void World::apply(ProgressCounter & /*pc*/, const room_change_types::MoveRelativ
     moveRelative(change.room, change.offset);
 }
 
+void World::apply(ProgressCounter & /*pc*/, const room_change_types::MoveRelative2 &change)
+{
+    //
+    moveRelative(change.rooms, change.offset);
+}
+
 void World::apply(ProgressCounter & /*pc*/, const room_change_types::MergeRelative &change)
 {
     //

src/map/World.h

@@ -216,6 +216,7 @@ class NODISCARD World final
 
 private:
     void moveRelative(RoomId id, const Coordinate &offset);
+    void moveRelative(const RoomIdSet &rooms, const Coordinate &offset);
     void setPosition(RoomId id, const Coordinate &coord);
     void setServerId(RoomId id, ServerRoomId serverId);
 
@@ -280,4 +281,7 @@ class NODISCARD World final
 
 private:
     NODISCARD bool containsRoomsNotIn(const World &other) const;
+
+public:
+    NODISCARD bool wouldAllowRelativeMove(const RoomIdSet &set, const Coordinate &offset) const;
 };

src/mapdata/roomselection.h

@@ -47,6 +47,9 @@ class NODISCARD RoomSelection final : public std::enable_shared_from_this<RoomSe
     void erase(RoomId targetId) { m_set.erase(targetId); }
     void clear() { m_set = {}; }
 
+public:
+    NODISCARD const RoomIdSet &getRoomIds() const { return m_set; }
+
 public:
     void removeMissing(MapData &mapData);