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

Remove const and rustfmt::skip

Browse source
This commit is contained in:
Gwilym Kuiper 2022-08-11 20:52:35 +01:00
parent 31f85cf6b9
commit affea47a32
1 changed files with 65 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,12 +145,19 @@ pub struct RegularMap {
pub const TRANSPARENT_TILE_INDEX: u16 = (1 << 10) - 1;
#[rustfmt::skip]
impl TiledMapPrivate for RegularMap {
fn tiles_mut(&mut self) -> &mut [Self::TileType] { &mut self.tiles }
fn tiles_dirty(&mut self) -> &mut bool { &mut self.tiles_dirty }
fn x_scroll_mut(&mut self) -> &mut Self::Position { &mut self.x_scroll }
fn y_scroll_mut(&mut self) -> &mut Self::Position { &mut self.y_scroll }
fn tiles_mut(&mut self) -> &mut [Self::TileType] {
&mut self.tiles
}
fn tiles_dirty(&mut self) -> &mut bool {
&mut self.tiles_dirty
}
fn x_scroll_mut(&mut self) -> &mut Self::Position {
&mut self.x_scroll
}
fn y_scroll_mut(&mut self) -> &mut Self::Position {
&mut self.y_scroll
}
}
impl TiledMapTypes for RegularMap {
@ -158,17 +165,28 @@ impl TiledMapTypes for RegularMap {
type Size = RegularBackgroundSize;
}
#[rustfmt::skip]
impl const TiledMapPrivateConst for RegularMap {
impl TiledMapPrivateConst for RegularMap {
type TileType = Tile;
type AffineMatrix = ();
fn x_scroll(&self) -> Self::Position { self.x_scroll }
fn y_scroll(&self) -> Self::Position { self.y_scroll }
fn x_scroll(&self) -> Self::Position {
self.x_scroll
}
fn y_scroll(&self) -> Self::Position {
self.y_scroll
}
fn affine_matrix(&self) -> Self::AffineMatrix {}
fn background_id(&self) -> usize { self.background_id as usize }
fn screenblock(&self) -> usize { self.screenblock as usize }
fn priority(&self) -> Priority { self.priority }
fn map_size(&self) -> Self::Size { self.size }
fn background_id(&self) -> usize {
self.background_id as usize
}
fn screenblock(&self) -> usize {
self.screenblock as usize
}
fn priority(&self) -> Priority {
self.priority
}
fn map_size(&self) -> Self::Size {
self.size
}
fn bg_x(&self) -> MemoryMapped<Self::Position> {
unsafe { MemoryMapped::new(0x0400_0010 + 4 * self.background_id as usize) }
}
@ -247,12 +265,19 @@ pub struct AffineMap {
tiles_dirty: bool,
}
#[rustfmt::skip]
impl TiledMapPrivate for AffineMap {
fn tiles_mut(&mut self) -> &mut [Self::TileType] { &mut self.tiles }
fn tiles_dirty(&mut self) -> &mut bool { &mut self.tiles_dirty }
fn x_scroll_mut(&mut self) -> &mut Self::Position { &mut self.transform.position.x }
fn y_scroll_mut(&mut self) -> &mut Self::Position { &mut self.transform.position.y }
fn tiles_mut(&mut self) -> &mut [Self::TileType] {
&mut self.tiles
}
fn tiles_dirty(&mut self) -> &mut bool {
&mut self.tiles_dirty
}
fn x_scroll_mut(&mut self) -> &mut Self::Position {
&mut self.transform.position.x
}
fn y_scroll_mut(&mut self) -> &mut Self::Position {
&mut self.transform.position.y
}
}
impl TiledMapTypes for AffineMap {
@ -260,17 +285,30 @@ impl TiledMapTypes for AffineMap {
type Size = AffineBackgroundSize;
}
#[rustfmt::skip]
impl const TiledMapPrivateConst for AffineMap {
impl TiledMapPrivateConst for AffineMap {
type TileType = u8;
type AffineMatrix = AffineMatrixAttributes;
fn x_scroll(&self) -> Self::Position { self.transform.position.x }
fn y_scroll(&self) -> Self::Position { self.transform.position.y }
fn affine_matrix(&self) -> Self::AffineMatrix { self.transform.matrix }
fn background_id(&self) -> usize { self.background_id as usize }
fn screenblock(&self) -> usize { self.screenblock as usize }
fn priority(&self) -> Priority { self.priority }
fn map_size(&self) -> Self::Size { self.size }
fn x_scroll(&self) -> Self::Position {
self.transform.position.x
}
fn y_scroll(&self) -> Self::Position {
self.transform.position.y
}
fn affine_matrix(&self) -> Self::AffineMatrix {
self.transform.matrix
}
fn background_id(&self) -> usize {
self.background_id as usize
}
fn screenblock(&self) -> usize {
self.screenblock as usize
}
fn priority(&self) -> Priority {
self.priority
}
fn map_size(&self) -> Self::Size {
self.size
}
fn bg_x(&self) -> MemoryMapped<Self::Position> {
unsafe { MemoryMapped::new(0x0400_0008 + 0x10 * self.background_id()) }
}