From 9952771bd431fdf121a986bc18b50a840e8c062f Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Tue, 8 Jun 2021 12:32:23 +0100 Subject: [PATCH] use new tuple implementation --- agb/examples/chicken.rs | 2 +- agb/examples/test_logo.rs | 4 ++-- agb/src/display/example_logo.rs | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/agb/examples/chicken.rs b/agb/examples/chicken.rs index 5a075be5..8eedaf1c 100644 --- a/agb/examples/chicken.rs +++ b/agb/examples/chicken.rs @@ -55,7 +55,7 @@ pub fn main() -> ! { gfx.set_background_tilemap(0, &MAP_TILES); let mut background = gfx.get_background().unwrap(); - background.draw_full_map(&MAP_MAP, agb::number::Vector2D::new(32, 32)); + background.draw_full_map(&MAP_MAP, (32, 32).into()); background.show(); let mut object = gba.display.object.get(); diff --git a/agb/examples/test_logo.rs b/agb/examples/test_logo.rs index 93015e90..002a8cb9 100644 --- a/agb/examples/test_logo.rs +++ b/agb/examples/test_logo.rs @@ -3,7 +3,7 @@ extern crate agb; -use agb::{display::example_logo, number::Vector2D}; +use agb::display::example_logo; #[no_mangle] pub fn main() -> ! { @@ -21,7 +21,7 @@ pub fn main() -> ! { entries[tile_id as usize] = tile_id | (palette_entry << 12); } - back.draw_full_map(&entries, Vector2D::new(30, 20)); + back.draw_full_map(&entries, (30, 20).into()); back.show(); loop {} diff --git a/agb/src/display/example_logo.rs b/agb/src/display/example_logo.rs index 4c5c558d..10825f21 100644 --- a/agb/src/display/example_logo.rs +++ b/agb/src/display/example_logo.rs @@ -1,5 +1,3 @@ -use crate::number::Vector2D; - include!(concat!(env!("OUT_DIR"), "/test_logo.rs")); #[test_case] @@ -17,7 +15,7 @@ fn logo_display(gba: &mut crate::Gba) { entries[tile_id as usize] = tile_id | (palette_entry << 12); } - back.draw_full_map(&entries, Vector2D::new(30, 20)); + back.draw_full_map(&entries, (30, 20).into()); back.show(); crate::assert_image_output("gfx/test_logo.png");