diff options
| author | markdibarry <markdibarry@protonmail.com> | 2024-03-17 21:05:13 -0400 |
|---|---|---|
| committer | markdibarry <markdibarry@protonmail.com> | 2024-04-10 18:05:05 -0400 |
| commit | 18e8b81ffa7485beac3d7e53096ca75c78fd702d (patch) | |
| tree | 9aaae2ba7b1161fd20e391a8dcaadb3c2f7e5b3b /scene/2d/parallax_2d.cpp | |
| parent | 06abc86a5f535761b6a55d1e2109cd82091066b9 (diff) | |
| download | redot-engine-18e8b81ffa7485beac3d7e53096ca75c78fd702d.tar.gz | |
Account for scale in scroll logic for Parallax2D
Diffstat (limited to 'scene/2d/parallax_2d.cpp')
| -rw-r--r-- | scene/2d/parallax_2d.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/2d/parallax_2d.cpp b/scene/2d/parallax_2d.cpp index 7e47e0f061..555f3b031c 100644 --- a/scene/2d/parallax_2d.cpp +++ b/scene/2d/parallax_2d.cpp @@ -102,14 +102,14 @@ void Parallax2D::_update_scroll() { scroll_ofs *= scroll_scale; if (repeat_size.x) { - real_t mod = Math::fposmod(scroll_ofs.x - scroll_offset.x - autoscroll_offset.x, repeat_size.x); + real_t mod = Math::fposmod(scroll_ofs.x - scroll_offset.x - autoscroll_offset.x, repeat_size.x * get_scale().x); scroll_ofs.x = screen_offset.x - mod; } else { scroll_ofs.x = screen_offset.x + scroll_offset.x - scroll_ofs.x; } if (repeat_size.y) { - real_t mod = Math::fposmod(scroll_ofs.y - scroll_offset.y - autoscroll_offset.y, repeat_size.y); + real_t mod = Math::fposmod(scroll_ofs.y - scroll_offset.y - autoscroll_offset.y, repeat_size.y * get_scale().y); scroll_ofs.y = screen_offset.y - mod; } else { scroll_ofs.y = screen_offset.y + scroll_offset.y - scroll_ofs.y; @@ -127,8 +127,7 @@ void Parallax2D::_update_repeat() { return; } - Point2 repeat_scale = repeat_size * get_scale(); - RenderingServer::get_singleton()->canvas_set_item_repeat(get_canvas_item(), repeat_scale, repeat_times); + RenderingServer::get_singleton()->canvas_set_item_repeat(get_canvas_item(), repeat_size, repeat_times); RenderingServer::get_singleton()->canvas_item_set_interpolated(get_canvas_item(), false); } |