mlangkabel/dota_factory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make EntityAdmin::hasAll const

Browse Source
This commit is contained in:
mlangkabel
2026-08-09 13:45:24 +02:00
parent c0b009c548
commit 79650ae211
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/core/EntityAdmin.h
View File

@@ -28,7 +28,7 @@ public:
void forEach(Func&& f) const; void forEach(Func&& f) const;
template <typename... Ts> template <typename... Ts>
bool hasAll(entt::entity entity); bool hasAll(entt::entity entity) const;
template <typename T> template <typename T>
T& get(entt::entity entity); T& get(entt::entity entity);
@@ -101,7 +101,7 @@ void EntityAdmin::forEach(Func&& f) const
} }
template <typename... Ts> template <typename... Ts>
bool EntityAdmin::hasAll(entt::entity entity) bool EntityAdmin::hasAll(entt::entity entity) const
{ {
return m_registry.all_of<Ts...>(entity); return m_registry.all_of<Ts...>(entity);
} }

6
src/ui/SelectionBounds.cpp
View File

@@ -42,7 +42,7 @@ std::optional<QRectF> getBuildingWidgetRect(const FactoryState& state,
return std::nullopt; return std::nullopt;
} }
std::optional<QRectF> getActorWidgetRect(EntityAdmin& admin, std::optional<QRectF> getActorWidgetRect(const EntityAdmin& admin,
const WorldCoordinates& coordinates, const WorldCoordinates& coordinates,
entt::entity actor) entt::entity actor)
{ {
@@ -68,7 +68,7 @@ std::optional<QRectF> getActorWidgetRect(EntityAdmin& admin,
return std::nullopt; return std::nullopt;
} }
std::optional<QRectF> getDebrisWidgetRect(EntityAdmin& admin, std::optional<QRectF> getDebrisWidgetRect(const EntityAdmin& admin,
const WorldCoordinates& coordinates, const WorldCoordinates& coordinates,
entt::entity debris) entt::entity debris)
{ {
@@ -82,7 +82,7 @@ std::optional<QRectF> getDebrisWidgetRect(EntityAdmin& admin,
return QRectF(center.x() - radius, center.y() - radius, 2.0 * radius, 2.0 * radius); return QRectF(center.x() - radius, center.y() - radius, 2.0 * radius, 2.0 * radius);
} }
QRect getSelectionWidgetRect(Simulation& sim, const WorldCoordinates& coordinates, QRect getSelectionWidgetRect(const Simulation& sim, const WorldCoordinates& coordinates,
const std::vector<BuildingId>& buildings, const std::vector<BuildingId>& buildings,
const std::vector<entt::entity>& actors, const std::vector<entt::entity>& actors,
const std::vector<entt::entity>& debris) const std::vector<entt::entity>& debris)

10
src/ui/SelectionBounds.h
View File

@@ -29,22 +29,20 @@ std::optional<QRectF> getBuildingWidgetRect(const FactoryState& state,
BuildingId id); BuildingId id);
// The body of a ship or of a defence station (REQ-UI-ENTITY-CLICK-SELECT): a station's // The body of a ship or of a defence station (REQ-UI-ENTITY-CLICK-SELECT): a station's
// footprint, or the square the ship's triangle is drawn in. The admin is taken by // footprint, or the square the ship's triangle is drawn in.
// non-const reference only because EntityAdmin::hasAll() is not const; nothing here std::optional<QRectF> getActorWidgetRect(const EntityAdmin& admin,
// writes to it.
std::optional<QRectF> getActorWidgetRect(EntityAdmin& admin,
const WorldCoordinates& coordinates, const WorldCoordinates& coordinates,
entt::entity actor); entt::entity actor);
// The circle a piece of debris is drawn as (REQ-UI-DEBRIS-CLICK-SELECT). // The circle a piece of debris is drawn as (REQ-UI-DEBRIS-CLICK-SELECT).
std::optional<QRectF> getDebrisWidgetRect(EntityAdmin& admin, std::optional<QRectF> getDebrisWidgetRect(const EntityAdmin& admin,
const WorldCoordinates& coordinates, const WorldCoordinates& coordinates,
entt::entity debris); entt::entity debris);
// The rectangle covering a whole selection -- one object, or the bounding box of all of // The rectangle covering a whole selection -- one object, or the bounding box of all of
// them (REQ-UI-SELECTION-PANEL). Objects that no longer resolve are skipped; the result // them (REQ-UI-SELECTION-PANEL). Objects that no longer resolve are skipped; the result
// is null when none of them does. // is null when none of them does.
QRect getSelectionWidgetRect(Simulation& sim, const WorldCoordinates& coordinates, QRect getSelectionWidgetRect(const Simulation& sim, const WorldCoordinates& coordinates,
const std::vector<BuildingId>& buildings, const std::vector<BuildingId>& buildings,
const std::vector<entt::entity>& actors, const std::vector<entt::entity>& actors,
const std::vector<entt::entity>& debris); const std::vector<entt::entity>& debris);