alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-10-17 15:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

update tiled functions to use new vector2d

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-08 12:31:06 +01:00
parent 77f6512ba9
commit df954505bf
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
agb/src/display/tiled0.rs
View file

@ -1,6 +1,9 @@
use core::{borrow::Borrow, cell::RefCell, convert::TryInto, ops::Deref};
use crate::memory_mapped::MemoryMapped1DArray;
use crate::{
memory_mapped::MemoryMapped1DArray,
number::{Rect, Vector2D},
};
use super::{
object::ObjectControl, palette16, set_graphics_mode, set_graphics_settings, DisplayMode,
@ -132,22 +135,25 @@ impl Background {
/// block assigned to this background. This is currently unnecesary to call.
/// Setting position already updates the drawn map, and changing map forces
/// an update.
pub fn draw_full_map(&mut self, map: &[u16], dim_x: u32, dim_y: u32) {
self.draw_area(map, dim_x, dim_y, -1, -1, 32, 22);
pub fn draw_full_map(&mut self, map: &[u16], dimensions: Vector2D<u32>) {
let area: Rect<i32> = Rect {
position: Vector2D::new(-1, -1),
size: Vector2D::new(32, 22),
};
self.draw_area(map, dimensions, area);
}
/// Forces a specific area of the screen to be drawn, taking into account any positonal offsets.
pub fn draw_area(
&self,
map: &[u16],
dim_x: u32,
dim_y: u32,
left: i32,
top: i32,
width: i32,
height: i32,
) {
self.draw_area_mapped(&map, dim_x, dim_y, left, top, width, height);
pub fn draw_area(&self, map: &[u16], dimensions: Vector2D<u32>, area: Rect<i32>) {
self.draw_area_mapped(
&map,
dimensions.x,
dimensions.y,
area.position.x,
area.position.y,
area.size.x,
area.size.y,
);
}
fn draw_area_mapped<T>(
@ -190,10 +196,15 @@ impl Background {
/// Sets the position of the map to be shown on screen. This automatically
/// manages copying the correct portion to the map block and moving the map
/// registers.
pub fn set_position(&mut self, map: &[u16], dim_x: u32, dim_y: u32, x: i32, y: i32) {
self.set_position_mapped(&map, dim_x, dim_y, x, y);
self.pos_x = x;
self.pos_y = y;
pub fn set_position(
&mut self,
map: &[u16],
dimensions: Vector2D<u32>,
position: Vector2D<i32>,
) {
self.set_position_mapped(&map, dimensions.x, dimensions.y, position.x, position.y);
self.pos_x = position.x;
self.pos_y = position.y;
}
fn set_position_mapped<T>(&self, map: &T, dim_x: u32, dim_y: u32, x: i32, y: i32)