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

Copy slightly too much

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

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

@ -393,13 +393,11 @@ impl RegularMap {
let screenblock_memory = self.screenblock_memory(); let screenblock_memory = self.screenblock_memory();
let scroll_pos = self.get_scroll_pos(); let scroll_pos = self.get_scroll_pos();
let x_scroll = scroll_pos.x % (32 * 8) as u16; let start_x = scroll_pos.x / 8;
let y_scroll = scroll_pos.y % (32 * 8) as u16; let end_x = div_ceil(scroll_pos.x as i32 + display::WIDTH, 8) as u16 + 1;
let start_x = x_scroll / 8;
let end_x = div_ceil(x_scroll as i32 + display::WIDTH, 8) as u16 + 1; // divide by 8 rounding up
let start_y = y_scroll / 8; let start_y = scroll_pos.y / 8;
let end_y = div_ceil(y_scroll as i32 + display::HEIGHT, 8) as u16 + 1; let end_y = div_ceil(scroll_pos.y as i32 + display::HEIGHT, 8) as u16 + 1;
for y in start_y..end_y { for y in start_y..end_y {
for x in start_x..end_x { for x in start_x..end_x {
@ -516,7 +514,7 @@ impl<'a> InfiniteScrolledMap<'a> {
let direction = difference.x.signum(); let direction = difference.x.signum();
// either need to update 20 or 21 tiles depending on whether the y coordinate is a perfect multiple // either need to update 20 or 21 tiles depending on whether the y coordinate is a perfect multiple
let y_tiles_to_update = 21; let y_tiles_to_update = 22;
let line_to_update = if direction < 0 { let line_to_update = if direction < 0 {
// moving to the left, so need to update the left most position // moving to the left, so need to update the left most position
@ -527,7 +525,7 @@ impl<'a> InfiniteScrolledMap<'a> {
}; };
Rect::new( Rect::new(
(line_to_update, new_tile_y).into(), (line_to_update, new_tile_y - 1).into(),
(difference_tile_x, y_tiles_to_update).into(), (difference_tile_x, y_tiles_to_update).into(),
) )
} else { } else {
@ -540,7 +538,7 @@ impl<'a> InfiniteScrolledMap<'a> {
let direction = difference.y.signum(); let direction = difference.y.signum();
// either need to update 30 or 31 tiles depending on whether the x coordinate is a perfect multiple // either need to update 30 or 31 tiles depending on whether the x coordinate is a perfect multiple
let x_tiles_to_update: i32 = 31; let x_tiles_to_update: i32 = 32;
let line_to_update = if direction < 0 { let line_to_update = if direction < 0 {
// moving up so need to update the top // moving up so need to update the top
@ -551,7 +549,7 @@ impl<'a> InfiniteScrolledMap<'a> {
}; };
Rect::new( Rect::new(
(new_tile_x, line_to_update).into(), (new_tile_x - 1, line_to_update).into(),
(x_tiles_to_update, difference_tile_y).into(), (x_tiles_to_update, difference_tile_y).into(),
) )
} else { } else {