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

Add lifetimes to ObjectController

Browse source
This commit is contained in:
Gwilym Kuiper 2023-02-23 20:36:00 +00:00
parent c4fac5a779
commit 0eec7e366c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
agb/src/display/mod.rs
View file

@ -79,7 +79,7 @@ pub struct Display {
pub struct ObjectDistribution; pub struct ObjectDistribution;
impl ObjectDistribution { impl ObjectDistribution {
pub fn get(&mut self) -> ObjectController { pub fn get(&mut self) -> ObjectController<'_> {
ObjectController::new() ObjectController::new()
} }
} }

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

@ -694,11 +694,12 @@ impl ObjectControllerStatic {
/// A controller that distributes objects and sprites. This controls sprites and /// A controller that distributes objects and sprites. This controls sprites and
/// objects being copied to vram when it needs to be. /// objects being copied to vram when it needs to be.
pub struct ObjectController { pub struct ObjectController<'a> {
phantom: PhantomData<&'a ()>,
inner: ObjectControllerReference<'static>, inner: ObjectControllerReference<'static>,
} }
impl Drop for ObjectController { impl<'a> Drop for ObjectController<'a> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
ObjectControllerReference::uninit(); ObjectControllerReference::uninit();
@ -708,7 +709,7 @@ impl Drop for ObjectController {
const HIDDEN_VALUE: u16 = 0b10 << 8; const HIDDEN_VALUE: u16 = 0b10 << 8;
impl ObjectController { impl<'object> ObjectController<'object> {
/// Commits the objects to vram and delete sprites where possible. This /// Commits the objects to vram and delete sprites where possible. This
/// should be called shortly after having waited for the next vblank to /// should be called shortly after having waited for the next vblank to
/// ensure what is displayed on screen doesn't change part way through. /// ensure what is displayed on screen doesn't change part way through.
@ -759,6 +760,7 @@ impl ObjectController {
} }
Self { Self {
phantom: PhantomData,
inner: unsafe { ObjectControllerReference::init() }, inner: unsafe { ObjectControllerReference::init() },
} }
} }