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.

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

[3.x] Physics Interpolation - automatic resets for Camera2D and TileMap #80955

Merged
merged 1 commit into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions scene/2d/camera_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,14 @@ void Camera2D::_notification(int p_what) {
first = true;
_set_current(current);

// Note that NOTIFICATION_RESET_PHYSICS_INTERPOLATION
// is automatically called before this because Camera2D is inherited
// from CanvasItem. However, the camera transform is not up to date
// until this point, so we do an extra manual reset.
if (is_physics_interpolated_and_enabled()) {
_interpolation_data.xform_curr = get_camera_transform();
_interpolation_data.xform_prev = _interpolation_data.xform_curr;
}
} break;
case NOTIFICATION_EXIT_TREE: {
const bool viewport_valid = !custom_viewport || ObjectDB::get_instance(custom_viewport_id);
Expand Down
18 changes: 18 additions & 0 deletions scene/2d/tile_map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,17 @@ void TileMap::_notification(int p_what) {
}

} break;

case NOTIFICATION_RESET_PHYSICS_INTERPOLATION: {
if (is_visible_in_tree() && is_physics_interpolated_and_enabled()) {
for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) {
Quadrant &q = E->get();
for (List<RID>::Element *F = q.canvas_items.front(); F; F = F->next()) {
VisualServer::get_singleton()->canvas_item_reset_physics_interpolation(F->get());
}
}
}
} break;
}
}

Expand Down Expand Up @@ -744,6 +755,13 @@ void TileMap::update_dirty_quadrants() {
VisualServerCanvasHelper::tilemap_end();
}

// Reset physics interpolation for any recreated canvas items.
if (is_physics_interpolated_and_enabled() && is_visible_in_tree()) {
for (List<RID>::Element *F = q.canvas_items.front(); F; F = F->next()) {
VisualServer::get_singleton()->canvas_item_reset_physics_interpolation(F->get());
}
}

dirty_quadrant_list.remove(dirty_quadrant_list.first());
quadrant_order_dirty = true;
}
Expand Down