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

Remove get_ methods for tiled

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-23 20:26:18 +00:00
parent 8427bb5595
commit b91f129636
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agb/src/display/tiled/infinite_scrolled_map.rs
View file

@ -9,7 +9,7 @@ use crate::{
pub struct InfiniteScrolledMap<'a> { pub struct InfiniteScrolledMap<'a> {
map: MapLoan<'a, RegularMap>, map: MapLoan<'a, RegularMap>,
get_tile: Box<dyn Fn(Vector2D<i32>) -> (TileSetReference, TileSetting)>, tile: Box<dyn Fn(Vector2D<i32>) -> (TileSetReference, TileSetting)>,
current_pos: Vector2D<i32>, current_pos: Vector2D<i32>,
offset: Vector2D<i32>, offset: Vector2D<i32>,
@ -26,11 +26,11 @@ pub enum PartialUpdateStatus {
impl<'a> InfiniteScrolledMap<'a> { impl<'a> InfiniteScrolledMap<'a> {
pub fn new( pub fn new(
map: MapLoan<'a, RegularMap>, map: MapLoan<'a, RegularMap>,
get_tile: Box<dyn Fn(Vector2D<i32>) -> (TileSetReference, TileSetting)>, tile: Box<dyn Fn(Vector2D<i32>) -> (TileSetReference, TileSetting)>,
) -> Self { ) -> Self {
Self { Self {
map, map,
get_tile, tile,
current_pos: (0, 0).into(), current_pos: (0, 0).into(),
offset: (0, 0).into(), offset: (0, 0).into(),
copied_up_to: 0, copied_up_to: 0,
@ -79,7 +79,7 @@ impl<'a> InfiniteScrolledMap<'a> {
{ {
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();
let (tile_set_ref, tile_setting) = (self.get_tile)(pos); let (tile_set_ref, tile_setting) = (self.tile)(pos);
self.map.set_tile( self.map.set_tile(
vram, vram,
@ -172,7 +172,7 @@ impl<'a> InfiniteScrolledMap<'a> {
.iter() .iter()
.chain(horizontal_rect_to_update.iter()) .chain(horizontal_rect_to_update.iter())
{ {
let (tile_set_ref, tile_setting) = (self.get_tile)((tile_x, tile_y).into()); let (tile_set_ref, tile_setting) = (self.tile)((tile_x, tile_y).into());
self.map.set_tile( self.map.set_tile(
vram, vram,
@ -186,7 +186,7 @@ impl<'a> InfiniteScrolledMap<'a> {
); );
} }
let current_scroll = self.map.get_scroll_pos(); let current_scroll = self.map.scroll_pos();
let new_scroll = ( let new_scroll = (
(current_scroll.x as i32 + difference.x).rem_euclid(32 * 8) as u16, (current_scroll.x as i32 + difference.x).rem_euclid(32 * 8) as u16,
(current_scroll.y as i32 + difference.y).rem_euclid(32 * 8) as u16, (current_scroll.y as i32 + difference.y).rem_euclid(32 * 8) as u16,

2
agb/src/display/tiled/map.rs
View file

@ -121,7 +121,7 @@ impl RegularMap {
self.y_scroll = pos.y; self.y_scroll = pos.y;
} }
pub fn get_scroll_pos(&self) -> Vector2D<u16> { pub fn scroll_pos(&self) -> Vector2D<u16> {
(self.x_scroll, self.y_scroll).into() (self.x_scroll, self.y_scroll).into()
} }