godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #96245 from markdibarry/prevent-autoscroll-reset

Browse Source 
Prevent Parallax2D autoscroll reset
This commit is contained in:
Rémi Verschelde
2024-08-29 10:36:42 +02:00
parent 8186fabc8f 1eda1cf5d7
commit ba0b93cf64
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/2d/parallax_2d.cpp
View File

@@ -47,9 +47,18 @@ void Parallax2D::_notification(int p_what) {
} break; } break;
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
autoscroll_offset += autoscroll * get_process_delta_time(); Point2 offset = scroll_offset;
autoscroll_offset = autoscroll_offset.posmodv(repeat_size); offset += autoscroll * get_process_delta_time();
if (repeat_size.x) {
offset.x = Math::fposmod(offset.x, repeat_size.x);
}
if (repeat_size.y) {
offset.y = Math::fposmod(offset.y, repeat_size.y);
}
scroll_offset = offset;
_update_scroll(); _update_scroll();
} break; } break;
@@ -106,14 +115,14 @@ void Parallax2D::_update_scroll() {
scroll_ofs *= scroll_scale; scroll_ofs *= scroll_scale;
if (repeat_size.x) { if (repeat_size.x) {
real_t mod = Math::fposmod(scroll_ofs.x - scroll_offset.x - autoscroll_offset.x, repeat_size.x * get_scale().x); real_t mod = Math::fposmod(scroll_ofs.x - scroll_offset.x, repeat_size.x * get_scale().x);
scroll_ofs.x = screen_offset.x - mod; scroll_ofs.x = screen_offset.x - mod;
} else { } else {
scroll_ofs.x = screen_offset.x + scroll_offset.x - scroll_ofs.x; scroll_ofs.x = screen_offset.x + scroll_offset.x - scroll_ofs.x;
} }
if (repeat_size.y) { if (repeat_size.y) {
real_t mod = Math::fposmod(scroll_ofs.y - scroll_offset.y - autoscroll_offset.y, repeat_size.y * get_scale().y); real_t mod = Math::fposmod(scroll_ofs.y - scroll_offset.y, repeat_size.y * get_scale().y);
scroll_ofs.y = screen_offset.y - mod; scroll_ofs.y = screen_offset.y - mod;
} else { } else {
scroll_ofs.y = screen_offset.y + scroll_offset.y - scroll_ofs.y; scroll_ofs.y = screen_offset.y + scroll_offset.y - scroll_ofs.y;
@@ -193,7 +202,6 @@ void Parallax2D::set_autoscroll(const Point2 &p_autoscroll) {
} }
autoscroll = p_autoscroll; autoscroll = p_autoscroll;
autoscroll_offset = Point2();
_update_process(); _update_process();
_update_scroll(); _update_scroll();

1
scene/2d/parallax_2d.h
View File

@@ -47,7 +47,6 @@ class Parallax2D : public Node2D {
Point2 limit_begin = Point2(-DEFAULT_LIMIT, -DEFAULT_LIMIT); Point2 limit_begin = Point2(-DEFAULT_LIMIT, -DEFAULT_LIMIT);
Point2 limit_end = Point2(DEFAULT_LIMIT, DEFAULT_LIMIT); Point2 limit_end = Point2(DEFAULT_LIMIT, DEFAULT_LIMIT);
Point2 autoscroll; Point2 autoscroll;
Point2 autoscroll_offset;
bool follow_viewport = true; bool follow_viewport = true;
bool ignore_camera_scroll = false; bool ignore_camera_scroll = false;