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

add test and fix implementation

Browse source
This commit is contained in:
Corwin Kuiper 2021-06-04 19:37:41 +01:00
parent 72662cff5a
commit 95407e11f6
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
agb/src/display/object.rs
View file

@ -273,7 +273,7 @@ impl ObjectControl {
DISPLAY_CONTROL.set(disp); DISPLAY_CONTROL.set(disp);
} }
fn get_unused_object_index(&mut self) -> u8 { fn get_unused_object_index(&self) -> u8 {
let mut objects = self.objects.borrow_mut(); let mut objects = self.objects.borrow_mut();
for index in 0..128 { for index in 0..128 {
if objects.get(index).unwrap() == false { if objects.get(index).unwrap() == false {
@ -284,7 +284,7 @@ impl ObjectControl {
panic!("object id must be less than 128"); panic!("object id must be less than 128");
} }
fn get_unused_affine_index(&mut self) -> u8 { fn get_unused_affine_index(&self) -> u8 {
let mut affines = self.affines.borrow_mut(); let mut affines = self.affines.borrow_mut();
for index in 0..32 { for index in 0..32 {
if affines.get(index).unwrap() == false { if affines.get(index).unwrap() == false {
@ -297,7 +297,7 @@ impl ObjectControl {
/// Get an unused standard object. Panics if more than 128 objects are /// Get an unused standard object. Panics if more than 128 objects are
/// obtained. /// obtained.
pub fn get_object_standard(&mut self) -> ObjectStandard { pub fn get_object_standard(&self) -> ObjectStandard {
let id = self.get_unused_object_index(); let id = self.get_unused_object_index();
ObjectStandard { ObjectStandard {
attributes: ObjectAttribute::new(), attributes: ObjectAttribute::new(),
@ -310,7 +310,7 @@ impl ObjectControl {
/// Get an unused affine object. Panics if more than 128 objects are /// Get an unused affine object. Panics if more than 128 objects are
/// obtained. /// obtained.
pub fn get_object_affine(&mut self) -> ObjectAffine { pub fn get_object_affine(&self) -> ObjectAffine {
let id = self.get_unused_object_index(); let id = self.get_unused_object_index();
ObjectAffine { ObjectAffine {
attributes: ObjectAttribute::new(), attributes: ObjectAttribute::new(),
@ -324,7 +324,7 @@ impl ObjectControl {
/// Get an unused affine matrix. Panics if more than 32 affine matricies are /// Get an unused affine matrix. Panics if more than 32 affine matricies are
/// obtained. /// obtained.
pub fn get_affine(&mut self) -> AffineMatrix { pub fn get_affine(&self) -> AffineMatrix {
let id = self.get_unused_affine_index(); let id = self.get_unused_affine_index();
AffineMatrix { AffineMatrix {
attributes: AffineMatrixAttributes { attributes: AffineMatrixAttributes {
@ -340,3 +340,22 @@ impl ObjectControl {
} }
} }
} }
#[cfg(test)]
mod tests {
#[test_case]
fn get_and_release(gba: &mut crate::Gba) {
let gfx = gba.display.video.tiled0();
let objs = gfx.object;
{
let o0 = objs.get_object_standard();
let o1 = objs.get_object_standard();
assert_eq!(o0.loan.index, 0);
assert_eq!(o1.loan.index, 1);
}
let o0 = objs.get_object_standard();
assert_eq!(o0.loan.index, 0);
}
}