Skip to content
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

Portals - Fix secondary PVS bug #51388

Merged
merged 1 commit into from
Aug 8, 2021
Merged

Portals - Fix secondary PVS bug #51388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions scene/3d/room_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@ void RoomManager::_preview_camera_update() {
bool changed = false;
if (camera_pos != _godot_camera_pos) {
changed = true;

// update gameplay monitor
Vector<Vector3> camera_positions;
camera_positions.push_back(camera_pos);
VisualServer::get_singleton()->rooms_update_gameplay_monitor(scenario, camera_positions);
}
// check planes
if (!changed) {
Expand Down
27 changes: 15 additions & 12 deletions servers/visual/portals/portal_gameplay_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,23 @@ void PortalGameplayMonitor::update_gameplay(PortalRenderer &p_portal_renderer, c
for (int n = 0; n < p_num_source_rooms; n++) {
const VSRoom &source_room = p_portal_renderer.get_room(p_source_room_ids[n]);

int pvs_size = source_room._pvs_size;
int pvs_first = source_room._pvs_first;
if (_use_secondary_pvs) {
pvs_size = source_room._secondary_pvs_size;
pvs_first = source_room._secondary_pvs_first;
int pvs_size = source_room._secondary_pvs_size;
int pvs_first = source_room._secondary_pvs_first;

for (int r = 0; r < pvs_size; r++) {
int room_id = pvs.get_secondary_pvs_room_id(pvs_first + r);
_update_gameplay_room(p_portal_renderer, room_id, source_rooms_changed);
} // for r through the rooms hit in the pvs
} else {
int pvs_size = source_room._pvs_size;
int pvs_first = source_room._pvs_first;

for (int r = 0; r < pvs_size; r++) {
int room_id = pvs.get_pvs_room_id(pvs_first + r);
_update_gameplay_room(p_portal_renderer, room_id, source_rooms_changed);
} // for r through the rooms hit in the pvs
}

for (int r = 0; r < pvs_size; r++) {
int room_id = pvs.get_pvs_room_id(pvs_first + r);

_update_gameplay_room(p_portal_renderer, room_id, source_rooms_changed);

} // for r through the rooms hit in the pvs

} // for n through source rooms

// find any moving that were active last tick that are no longer active, and send notifications
Expand Down
4 changes: 2 additions & 2 deletions servers/visual/portals/portal_pvs_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ void PVSBuilder::calculate_pvs(PortalRenderer &p_portal_renderer, String p_filen

log("pvs from room : " + itos(n));

// trace_rooms_recursive_simple(0, n, n, -1, false, -1, dummy_planes, bf);
trace_rooms_recursive(0, n, n, -1, false, -1, dummy_planes, bf);
trace_rooms_recursive_simple(0, n, n, -1, false, -1, dummy_planes, bf);
// trace_rooms_recursive(0, n, n, -1, false, -1, dummy_planes, bf);

create_secondary_pvs(n, neighbors, bf);

Expand Down