godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63384 from lawnjelly/portals_room_hint_invalid 

Portals - Fix invalid room hint when reconverting room graph
This commit is contained in:
Rémi Verschelde 2022-07-24 20:10:25 +02:00 committed by GitHub
parent be0f41d17e 88b7d928c5
commit 270f5a3bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/visual/portals/portal_rooms_bsp.cpp
View File

@ -102,19 +102,24 @@ int PortalRoomsBSP::find_room_within(const PortalRenderer &p_portal_renderer, co
// first try previous room // first try previous room
if (p_previous_room_id != -1) { if (p_previous_room_id != -1) {
const VSRoom &prev_room = p_portal_renderer.get_room(p_previous_room_id); if (p_previous_room_id < p_portal_renderer.get_num_rooms()) {
const VSRoom &prev_room = p_portal_renderer.get_room(p_previous_room_id);
// we can only use this shortcut if the room doesn't include internal rooms. // we can only use this shortcut if the room doesn't include internal rooms.
// otherwise the point may be inside more than one room, and we need to find the room of highest priority. // otherwise the point may be inside more than one room, and we need to find the room of highest priority.
if (!prev_room._contains_internal_rooms) { if (!prev_room._contains_internal_rooms) {
closest = prev_room.is_point_within(p_pos); closest = prev_room.is_point_within(p_pos);
closest_room_id = p_previous_room_id; closest_room_id = p_previous_room_id;
if (closest < 0.0) { if (closest < 0.0) {
return p_previous_room_id; return p_previous_room_id;
}
} else {
// don't mark it as checked later, as we haven't done it because it contains internal rooms
p_previous_room_id = -1;
} }
} else { } else {
// don't mark it as checked later, as we haven't done it because it contains internal rooms // previous room was out of range (perhaps due to reconverting room system and the number of rooms decreasing)
p_previous_room_id = -1; p_previous_room_id = -1;
} }
} }