alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-12 01:51:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Move post-work to pre-work

Browse source
This commit is contained in:
Gwilym Kuiper 2022-02-07 22:17:57 +00:00
parent 530b71e0df
commit 06901b3543
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
agb/src/display/background.rs
View file

@ -465,6 +465,16 @@ impl<'a> InfiniteScrolledMap<'a> {
let x_end = div_ceil(self.current_pos.x + display::WIDTH, 8) + 1; let x_end = div_ceil(self.current_pos.x + display::WIDTH, 8) + 1;
let y_end = div_ceil(self.current_pos.y + display::HEIGHT, 8) + 1; let y_end = div_ceil(self.current_pos.y + display::HEIGHT, 8) + 1;
let offset = self.current_pos - (x_start * 8, y_start * 8).into();
let offset_scroll = (
offset.x.rem_euclid(32 * 8) as u16,
offset.y.rem_euclid(32 * 8) as u16,
)
.into();
self.map.set_scroll_pos(offset_scroll);
self.offset = (x_start, y_start).into();
for (y_idx, y) in (y_start..y_end).enumerate() { for (y_idx, y) in (y_start..y_end).enumerate() {
for (x_idx, x) in (x_start..x_end).enumerate() { for (x_idx, x) in (x_start..x_end).enumerate() {
let pos = (x, y).into(); let pos = (x, y).into();
@ -478,16 +488,6 @@ impl<'a> InfiniteScrolledMap<'a> {
); );
} }
} }
let offset = self.current_pos - (x_start * 8, y_start * 8).into();
let offset_scroll = (
offset.x.rem_euclid(32 * 8) as u16,
offset.y.rem_euclid(32 * 8) as u16,
)
.into();
self.map.set_scroll_pos(offset_scroll);
self.offset = (x_start, y_start).into();
} }
pub fn set_pos(&mut self, vram: &mut VRamManager, new_pos: Vector2D<i32>) { pub fn set_pos(&mut self, vram: &mut VRamManager, new_pos: Vector2D<i32>) {