Put the blend stuff in the top level display

agbrs · Feb 5, 2025 · 891ccfc · 891ccfc
1 parent a8aacf6
commit 891ccfc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/agb/examples/windows.rs b/agb/examples/windows.rs
@@ -1,10 +1,9 @@
 #![no_std]
 #![no_main]
 
-use agb::display::blend::Layer;
 use agb::display::tiled::{RegularBackgroundTiles, TileFormat};
 use agb::display::{example_logo, tiled::RegularBackgroundSize, window::WinIn};
-use agb::display::{HEIGHT, WIDTH};
+use agb::display::{BlendLayer, HEIGHT, WIDTH};
 use agb::fixnum::{num, Num, Rect, Vector2D};
 use agb::interrupt::VBlank;
 
@@ -59,9 +58,11 @@ fn main(mut gba: agb::Gba) -> ! {
         let blend = frame.blend();
         blend
             .alpha()
-            .set_layer_alpha(Layer::Top, blend_amount.try_change_base().unwrap());
-        blend.layer(Layer::Top).enable_background(background_id);
-        blend.layer(Layer::Bottom).enable_backdrop();
+            .set_layer_alpha(BlendLayer::Top, blend_amount.try_change_base().unwrap());
+        blend
+            .layer(BlendLayer::Top)
+            .enable_background(background_id);
+        blend.layer(BlendLayer::Bottom).enable_backdrop();
 
         vblank.wait_for_vblank();
 

diff --git a/agb/src/display/mod.rs b/agb/src/display/mod.rs
@@ -2,7 +2,6 @@ use crate::memory_mapped::MemoryMapped;
 
 use bilge::prelude::*;
 
-use blend::Blend;
 use tiled::{BackgroundFrame, DisplayControlRegister, TiledBackground};
 
 use self::{
@@ -23,7 +22,7 @@ pub mod tile_data;
 pub mod tiled;
 
 pub mod affine;
-pub mod blend;
+mod blend;
 pub mod window;
 
 pub mod font;
@@ -34,6 +33,10 @@ const DISPLAY_CONTROL: MemoryMapped<DisplayControlRegister> =
 pub(crate) const DISPLAY_STATUS: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0004) };
 const VCOUNT: MemoryMapped<u16> = unsafe { MemoryMapped::new(0x0400_0006) };
 
+pub use blend::{
+    Blend, BlendAlphaEffect, BlendFadeEffect, BlendObjectTransparency, Layer as BlendLayer,
+};
+
 /// Width of the Gameboy advance screen in pixels
 pub const WIDTH: i32 = 240;
 /// Height of the Gameboy advance screen in pixels