Skip to content

Fix entity selection only checking physics entities #2818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daid merged 2 commits into from
Apr 12, 2026
Merged

Fix entity selection only checking physics entities #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5a11a
Allow entities with a description to be selected on science/ops
GinjaNinja32 Mar 28, 2026
5b65e98
Use sp::TransformQuery::queryArea instead of CollisionSystem::queryAr…
GinjaNinja32 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/screenComponents/radarView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ void GuiRadarView::drawObjects(sp::RenderTarget& renderer)

// For each of those objects, check if it is at least partially
// inside the revealed radius. If so, reveal the object on the map.
for(auto entity2 : sp::CollisionSystem::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r)))
for(auto entity2 : sp::TransformQuery::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r)))
{
//TODO: This isn't great, as not everything will collision attached...
auto trace = entity2.getComponent<RadarTrace>();
Expand Down
3 changes: 2 additions & 1 deletion src/screenComponents/targetsContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void TargetsContainer::setToClosestTo(glm::vec2 position, float max_range, ESele
{
sp::ecs::Entity target;
glm::vec2 target_position;
for(auto entity : sp::CollisionSystem::queryArea(position - glm::vec2(max_range, max_range), position + glm::vec2(max_range, max_range)))
for(auto entity : sp::TransformQuery::queryArea(position - glm::vec2(max_range, max_range), position + glm::vec2(max_range, max_range)))
{
auto transform = entity.getComponent<sp::Transform>();
if (!transform) continue;
Expand Down Expand Up @@ -204,6 +204,7 @@ bool TargetsContainer::isValidTarget(sp::ecs::Entity entity, ESelectionType sele
case Selectable:
if (entity.hasComponent<Hull>()) return true;
if (entity.getComponent<ScanState>()) return true;
if (entity.getComponent<ScienceDescription>()) return true;
if (entity.getComponent<ShareShortRangeRadar>()) return true;
break;
case Targetable:
Expand Down
2 changes: 1 addition & 1 deletion src/screens/gm/gameMasterScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ void GameMasterScreen::onMouseUp(glm::vec2 position)
sp::ecs::Entity target;
glm::vec2 target_position;

for (auto entity : sp::CollisionSystem::queryArea(position, position))
for (auto entity : sp::TransformQuery::queryArea(position, position))
{
auto transform = entity.getComponent<sp::Transform>();
if (!transform) continue;
Expand Down
2 changes: 1 addition & 1 deletion src/screens/spectatorScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ void SpectatorScreen::onMouseUp(glm::vec2 position)

glm::vec2 target_position;

for (auto entity : sp::CollisionSystem::queryArea(position - (glm::vec2{300.0f, 300.0f} * main_radar->getDistance() / LONG_RANGE_DISTANCE), position + (glm::vec2{300.0f, 300.0f} * main_radar->getDistance() / LONG_RANGE_DISTANCE)))
for (auto entity : sp::TransformQuery::queryArea(position - (glm::vec2{300.0f, 300.0f} * main_radar->getDistance() / LONG_RANGE_DISTANCE), position + (glm::vec2{300.0f, 300.0f} * main_radar->getDistance() / LONG_RANGE_DISTANCE)))
{
if (auto transform = entity.getComponent<sp::Transform>())
{
Expand Down
4 changes: 2 additions & 2 deletions src/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ static int luaGetObjectsInRadius(lua_State* L)
glm::vec2 position(x, y);
lua_newtable(L);
int idx = 1;
for(auto entity : sp::CollisionSystem::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r))) {
for(auto entity : sp::TransformQuery::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r))) {
auto entity_transform = entity.getComponent<sp::Transform>();
if (entity_transform) {
if (glm::length2(entity_transform->getPosition() - position) < r*r) {
Expand All @@ -448,7 +448,7 @@ static int luaGetEnemiesInRadiusFor(lua_State* L)
auto source_transform = source.getComponent<sp::Transform>();
if (!source_transform) return 1;
auto position = source_transform->getPosition();
for(auto entity : sp::CollisionSystem::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r))) {
for(auto entity : sp::TransformQuery::queryArea(position - glm::vec2(r, r), position + glm::vec2(r, r))) {
auto entity_transform = entity.getComponent<sp::Transform>();
if (entity_transform) {
if (glm::length2(entity_transform->getPosition() - position) < r*r) {
Expand Down
Loading