From d3834ed2ff046751686031b351d9ccf50feab33c Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 20:48:04 +0100 Subject: [PATCH 01/60] allocator unsound to use in interrupt --- agb/src/agb_alloc/block_allocator.rs | 41 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/agb/src/agb_alloc/block_allocator.rs b/agb/src/agb_alloc/block_allocator.rs index 14eb4638..921a4308 100644 --- a/agb/src/agb_alloc/block_allocator.rs +++ b/agb/src/agb_alloc/block_allocator.rs @@ -5,13 +5,10 @@ use core::alloc::{Allocator, GlobalAlloc, Layout}; -use core::cell::RefCell; +use core::cell::UnsafeCell; use core::convert::TryInto; use core::ptr::NonNull; -use crate::interrupt::free; -use bare_metal::Mutex; - use super::bump_allocator::{BumpAllocatorInner, StartEnd}; use super::SendNonNull; @@ -53,36 +50,45 @@ struct BlockAllocatorInner { } pub struct BlockAllocator { - inner: Mutex>, + inner: UnsafeCell, } +unsafe impl Sync for BlockAllocator {} + impl BlockAllocator { pub(crate) const unsafe fn new(start: StartEnd) -> Self { Self { - inner: Mutex::new(RefCell::new(BlockAllocatorInner::new(start))), + inner: UnsafeCell::new(BlockAllocatorInner::new(start)), } } + #[inline(always)] + unsafe fn with_inner(&self, f: F) -> T + where + F: Fn(&mut BlockAllocatorInner) -> T, + { + let inner = &mut *self.inner.get(); + + f(inner) + } + #[doc(hidden)] #[cfg(any(test, feature = "testing"))] pub unsafe fn number_of_blocks(&self) -> u32 { - free(|key| self.inner.borrow(key).borrow_mut().number_of_blocks()) + self.with_inner(|inner| inner.number_of_blocks()) } pub unsafe fn alloc(&self, layout: Layout) -> Option> { - free(|key| self.inner.borrow(key).borrow_mut().alloc(layout)) + self.with_inner(|inner| inner.alloc(layout)) } pub unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) { - free(|key| self.inner.borrow(key).borrow_mut().dealloc(ptr, layout)); + self.with_inner(|inner| inner.dealloc(ptr, layout)); } pub unsafe fn dealloc_no_normalise(&self, ptr: *mut u8, layout: Layout) { - free(|key| { - self.inner - .borrow(key) - .borrow_mut() - .dealloc_no_normalise(ptr, layout); + self.with_inner(|inner| { + inner.dealloc_no_normalise(ptr, layout); }); } @@ -92,12 +98,7 @@ impl BlockAllocator { layout: Layout, new_layout: Layout, ) -> Option> { - free(|key| { - self.inner - .borrow(key) - .borrow_mut() - .grow(ptr, layout, new_layout) - }) + self.with_inner(|inner| inner.grow(ptr, layout, new_layout)) } } From 16c3395524d59b4fdcf8dbb288eaac7635605940 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 21:09:44 +0100 Subject: [PATCH 02/60] Really basic elf parser --- agb-gbafix/.gitignore | 1 + agb-gbafix/Cargo.lock | 16 ++++++++++++++ agb-gbafix/Cargo.toml | 9 ++++++++ agb-gbafix/src/main.rs | 47 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 agb-gbafix/.gitignore create mode 100644 agb-gbafix/Cargo.lock create mode 100644 agb-gbafix/Cargo.toml create mode 100644 agb-gbafix/src/main.rs diff --git a/agb-gbafix/.gitignore b/agb-gbafix/.gitignore new file mode 100644 index 00000000..0b512c76 --- /dev/null +++ b/agb-gbafix/.gitignore @@ -0,0 +1 @@ +!Cargo.lock \ No newline at end of file diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock new file mode 100644 index 00000000..4677f650 --- /dev/null +++ b/agb-gbafix/Cargo.lock @@ -0,0 +1,16 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "agb-gbafix" +version = "0.1.0" +dependencies = [ + "elf", +] + +[[package]] +name = "elf" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b183d6ce6ca4cf30e3db37abf5b52568b5f9015c97d9fbdd7026aa5dcdd758" diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml new file mode 100644 index 00000000..ee86b776 --- /dev/null +++ b/agb-gbafix/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "agb-gbafix" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +elf = "0.7" \ No newline at end of file diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs new file mode 100644 index 00000000..e3c0d3a4 --- /dev/null +++ b/agb-gbafix/src/main.rs @@ -0,0 +1,47 @@ +use std::{ + fs, + io::{self, Write}, + path::PathBuf, +}; + +fn main() -> Result<(), Box> { + let path = PathBuf::from("tests/text_render"); + let file_data = fs::read(path)?; + let file_data = file_data.as_slice(); + + let elf_file = elf::ElfBytes::::minimal_parse(file_data)?; + + let (section_headers, strtab) = elf_file.section_headers_with_strtab()?; + let section_headers = section_headers.expect("Expected section headers"); + let strtab = strtab.expect("Expected string table"); + + let output = fs::File::create("out.gba")?; + let mut buf_writer = io::BufWriter::new(output); + + for section_header in section_headers.iter() { + let section_name = strtab.get(section_header.sh_name as usize)?; + + const SHT_NOBITS: u32 = 8; + const SHT_NULL: u32 = 0; + const SHF_ALLOC: u64 = 2; + + if (section_header.sh_type == SHT_NOBITS || section_header.sh_type == SHT_NULL) + || section_header.sh_flags & SHF_ALLOC == 0 + { + continue; + } + + println!("{section_name}"); + + let (data, compression) = elf_file.section_data(§ion_header)?; + if let Some(compression) = compression { + panic!("Cannot compress elf content, but got compression header {compression:?}"); + } + + buf_writer.write_all(data)?; + } + + buf_writer.flush()?; + + Ok(()) +} From aa77255720ceb50282467c91e19cac474eb8a752 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 21:10:03 +0100 Subject: [PATCH 03/60] Correct error message --- agb-gbafix/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index e3c0d3a4..1f07d457 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -35,7 +35,7 @@ fn main() -> Result<(), Box> { let (data, compression) = elf_file.section_data(§ion_header)?; if let Some(compression) = compression { - panic!("Cannot compress elf content, but got compression header {compression:?}"); + panic!("Cannot decompress elf content, but got compression header {compression:?}"); } buf_writer.write_all(data)?; From dffda47985d9e47c2c7ddcbc0a3d8012afaff730 Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:16:13 +0100 Subject: [PATCH 04/60] resolve interrupts unsoundness --- agb/examples/output.rs | 15 +++-- agb/examples/wave.rs | 27 ++++---- agb/src/interrupt.rs | 79 ++++++++---------------- agb/src/sound/mixer/sw_mixer.rs | 10 +-- agb/src/sync/statics.rs | 106 +++++++++++++++++--------------- 5 files changed, 111 insertions(+), 126 deletions(-) diff --git a/agb/examples/output.rs b/agb/examples/output.rs index 93b8595a..8aabc69d 100644 --- a/agb/examples/output.rs +++ b/agb/examples/output.rs @@ -3,13 +3,16 @@ use agb::sync::Static; +static COUNT: Static = Static::new(0); + #[agb::entry] fn main(_gba: agb::Gba) -> ! { - let count = Static::new(0); - let _a = agb::interrupt::add_interrupt_handler(agb::interrupt::Interrupt::VBlank, |_| { - let cur_count = count.read(); - agb::println!("Hello, world, frame = {}", cur_count); - count.write(cur_count + 1); - }); + let _a = unsafe { + agb::interrupt::add_interrupt_handler(agb::interrupt::Interrupt::VBlank, |_| { + let cur_count = COUNT.read(); + agb::println!("Hello, world, frame = {}", cur_count); + COUNT.write(cur_count + 1); + }) + }; loop {} } diff --git a/agb/examples/wave.rs b/agb/examples/wave.rs index 491c0e0b..1e9cf223 100644 --- a/agb/examples/wave.rs +++ b/agb/examples/wave.rs @@ -18,6 +18,11 @@ struct BackCosines { row: usize, } +static BACK: Mutex> = Mutex::new(RefCell::new(BackCosines { + cosines: [0; 32], + row: 0, +})); + #[agb::entry] fn main(mut gba: agb::Gba) -> ! { let (gfx, mut vram) = gba.display.video.tiled0(); @@ -30,24 +35,22 @@ fn main(mut gba: agb::Gba) -> ! { example_logo::display_logo(&mut background, &mut vram); - let mut time = 0; - let cosines = [0_u16; 32]; - - let back = Mutex::new(RefCell::new(BackCosines { cosines, row: 0 })); - - let _a = agb::interrupt::add_interrupt_handler(Interrupt::HBlank, |key: CriticalSection| { - let mut back = back.borrow(key).borrow_mut(); - let deflection = back.cosines[back.row % 32]; - unsafe { ((0x0400_0010) as *mut u16).write_volatile(deflection) } - back.row += 1; - }); + let _a = unsafe { + agb::interrupt::add_interrupt_handler(Interrupt::HBlank, |key: CriticalSection| { + let mut back = BACK.borrow(key).borrow_mut(); + let deflection = back.cosines[back.row % 32]; + ((0x0400_0010) as *mut u16).write_volatile(deflection); + back.row += 1; + }) + }; let vblank = agb::interrupt::VBlank::get(); + let mut time = 0; loop { vblank.wait_for_vblank(); free(|key| { - let mut back = back.borrow(key).borrow_mut(); + let mut back = BACK.borrow(key).borrow_mut(); back.row = 0; time += 1; for (r, a) in back.cosines.iter_mut().enumerate() { diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index 68aa0789..83c30357 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -1,8 +1,4 @@ -use core::{ - cell::Cell, - marker::{PhantomData, PhantomPinned}, - pin::Pin, -}; +use core::{cell::Cell, marker::PhantomPinned, pin::Pin}; use alloc::boxed::Box; use bare_metal::CriticalSection; @@ -206,9 +202,8 @@ impl Drop for InterruptInner { } } -pub struct InterruptHandler<'a> { +pub struct InterruptHandler { _inner: Pin>, - _lifetime: PhantomData<&'a ()>, } impl InterruptRoot { @@ -231,6 +226,13 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// Adds an interrupt handler as long as the returned value is alive. The /// closure takes a [`CriticalSection`] which can be used for mutexes. /// +/// SAFETY: +/// * You *must not* allocate in an interrupt. +/// +/// STATICNESS: +/// * The closure must be static because forgetting the interrupt handler will +/// cause a use after free. +/// /// [`CriticalSection`]: bare_metal::CriticalSection /// /// # Examples @@ -247,14 +249,11 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// }); /// # } /// ``` -pub fn add_interrupt_handler<'a>( +pub unsafe fn add_interrupt_handler( interrupt: Interrupt, - handler: impl Fn(CriticalSection) + Send + Sync + 'a, -) -> InterruptHandler<'a> { - fn do_with_inner<'a>( - interrupt: Interrupt, - inner: Pin>, - ) -> InterruptHandler<'a> { + handler: impl Fn(CriticalSection) + Send + Sync + 'static, +) -> InterruptHandler { + fn do_with_inner(interrupt: Interrupt, inner: Pin>) -> InterruptHandler { free(|_| { let root = interrupt_to_root(interrupt); root.add(); @@ -274,10 +273,7 @@ pub fn add_interrupt_handler<'a>( } }); - InterruptHandler { - _inner: inner, - _lifetime: PhantomData, - } + InterruptHandler { _inner: inner } } let root = interrupt_to_root(interrupt) as *const _; let inner = unsafe { create_interrupt_inner(handler, root) }; @@ -322,9 +318,12 @@ impl VBlank { #[must_use] pub fn get() -> Self { if !HAS_CREATED_INTERRUPT.read() { - let handler = add_interrupt_handler(Interrupt::VBlank, |_| { - NUM_VBLANKS.write(NUM_VBLANKS.read() + 1); - }); + // safety: we don't allocate in the interrupt + let handler = unsafe { + add_interrupt_handler(Interrupt::VBlank, |_| { + NUM_VBLANKS.write(NUM_VBLANKS.read() + 1); + }) + }; core::mem::forget(handler); HAS_CREATED_INTERRUPT.write(true); @@ -351,36 +350,6 @@ impl VBlank { #[cfg(test)] mod tests { use super::*; - use bare_metal::Mutex; - use core::cell::RefCell; - - #[test_case] - fn test_can_create_and_destroy_interrupt_handlers(_gba: &mut crate::Gba) { - let mut counter = Mutex::new(RefCell::new(0)); - let counter_2 = Mutex::new(RefCell::new(0)); - - let vblank = VBlank::get(); - - { - let _a = add_interrupt_handler(Interrupt::VBlank, |key: CriticalSection| { - *counter.borrow(key).borrow_mut() += 1; - }); - let _b = add_interrupt_handler(Interrupt::VBlank, |key: CriticalSection| { - *counter_2.borrow(key).borrow_mut() += 1; - }); - - while free(|key| { - *counter.borrow(key).borrow() < 100 || *counter_2.borrow(key).borrow() < 100 - }) { - vblank.wait_for_vblank(); - } - } - - vblank.wait_for_vblank(); - vblank.wait_for_vblank(); - - assert_eq!(*counter.get_mut().get_mut(), 100); - } #[test_case] fn test_interrupt_table_length(_gba: &mut crate::Gba) { @@ -406,7 +375,9 @@ pub fn profiler(timer: &mut crate::timer::Timer, period: u16) -> InterruptHandle timer.set_overflow_amount(period); timer.set_enabled(true); - add_interrupt_handler(timer.interrupt(), |_key: CriticalSection| { - crate::println!("{:#010x}", crate::program_counter_before_interrupt()); - }) + unsafe { + add_interrupt_handler(timer.interrupt(), |_key: CriticalSection| { + crate::println!("{:#010x}", crate::program_counter_before_interrupt()); + }) + } } diff --git a/agb/src/sound/mixer/sw_mixer.rs b/agb/src/sound/mixer/sw_mixer.rs index 4f32e786..8984f842 100644 --- a/agb/src/sound/mixer/sw_mixer.rs +++ b/agb/src/sound/mixer/sw_mixer.rs @@ -82,7 +82,7 @@ extern "C" { pub struct Mixer<'gba> { interrupt_timer: Timer, // SAFETY: Has to go before buffer because it holds a reference to it - _interrupt_handler: InterruptHandler<'static>, + _interrupt_handler: InterruptHandler, buffer: Pin>, channels: [Option; 8], @@ -140,9 +140,11 @@ impl Mixer<'_> { // In the case of the mixer being forgotten, both stay alive so okay let buffer_pointer_for_interrupt_handler: &MixerBuffer = unsafe { core::mem::transmute(buffer_pointer_for_interrupt_handler) }; - let interrupt_handler = add_interrupt_handler(interrupt_timer.interrupt(), |cs| { - buffer_pointer_for_interrupt_handler.swap(cs); - }); + let interrupt_handler = unsafe { + add_interrupt_handler(interrupt_timer.interrupt(), |cs| { + buffer_pointer_for_interrupt_handler.swap(cs); + }) + }; set_asm_buffer_size(frequency); diff --git a/agb/src/sync/statics.rs b/agb/src/sync/statics.rs index 69536c6c..68eb5030 100644 --- a/agb/src/sync/statics.rs +++ b/agb/src/sync/statics.rs @@ -267,65 +267,71 @@ mod test { use crate::timer::Divider; use crate::Gba; - fn write_read_concurrency_test_impl(gba: &mut Gba) { - let sentinel = [0x12345678; COUNT]; - let value: Static<[u32; COUNT]> = Static::new(sentinel); + macro_rules! generate_concurrency_test { + ($count:literal, $gba:ident) => {{ + (|gba: &mut Gba| { + const SENTINEL: [u32; $count] = [0x12345678; $count]; + static VALUE: Static<[u32; $count]> = Static::new(SENTINEL); - // set up a timer and an interrupt that uses the timer - let mut timer = gba.timers.timers().timer2; - timer.set_cascade(false); - timer.set_divider(Divider::Divider1); - timer.set_overflow_amount(1049); - timer.set_interrupt(true); - timer.set_enabled(true); + // set up a timer and an interrupt that uses the timer + let mut timer = gba.timers.timers().timer2; + timer.set_cascade(false); + timer.set_divider(Divider::Divider1); + timer.set_overflow_amount(1049); + timer.set_interrupt(true); + timer.set_enabled(true); - let _int = crate::interrupt::add_interrupt_handler(Interrupt::Timer2, |_| { - value.write(sentinel); - }); + let _int = unsafe { + crate::interrupt::add_interrupt_handler(Interrupt::Timer2, |_| { + VALUE.write(SENTINEL); + }) + }; - // the actual main test loop - let mut interrupt_seen = false; - let mut no_interrupt_seen = false; - for i in 0..250000 { - // write to the static - let new_value = [i; COUNT]; - value.write(new_value); + // the actual main test loop + let mut interrupt_seen = false; + let mut no_interrupt_seen = false; + for i in 0..250000 { + // write to the static + let new_value = [i; $count]; + VALUE.write(new_value); - // check the current value - let current = value.read(); - if current == new_value { - no_interrupt_seen = true; - } else if current == sentinel { - interrupt_seen = true; - } else { - panic!("Unexpected value found in `Static`."); - } + // check the current value + let current = VALUE.read(); + if current == new_value { + no_interrupt_seen = true; + } else if current == SENTINEL { + interrupt_seen = true; + } else { + panic!("Unexpected value found in `Static`."); + } - // we return as soon as we've seen both the value written by the main thread - // and interrupt - if interrupt_seen && no_interrupt_seen { - timer.set_enabled(false); - return; - } + // we return as soon as we've seen both the value written by the main thread + // and interrupt + if interrupt_seen && no_interrupt_seen { + timer.set_enabled(false); + return; + } - if i % 8192 == 0 && i != 0 { - timer.set_overflow_amount(1049 + (i / 64) as u16); - } - } - panic!("Concurrency test timed out: {}", COUNT) + if i % 8192 == 0 && i != 0 { + timer.set_overflow_amount(1049 + (i / 64) as u16); + } + } + panic!("Concurrency test timed out: {}", $count) + })($gba); + }}; } #[test_case] fn write_read_concurrency_test(gba: &mut Gba) { - write_read_concurrency_test_impl::<1>(gba); - write_read_concurrency_test_impl::<2>(gba); - write_read_concurrency_test_impl::<3>(gba); - write_read_concurrency_test_impl::<4>(gba); - write_read_concurrency_test_impl::<5>(gba); - write_read_concurrency_test_impl::<6>(gba); - write_read_concurrency_test_impl::<7>(gba); - write_read_concurrency_test_impl::<8>(gba); - write_read_concurrency_test_impl::<9>(gba); - write_read_concurrency_test_impl::<10>(gba); + generate_concurrency_test!(1, gba); + generate_concurrency_test!(2, gba); + generate_concurrency_test!(3, gba); + generate_concurrency_test!(4, gba); + generate_concurrency_test!(5, gba); + generate_concurrency_test!(6, gba); + generate_concurrency_test!(7, gba); + generate_concurrency_test!(8, gba); + generate_concurrency_test!(9, gba); + generate_concurrency_test!(10, gba); } } From 96a321504cd644820050f91022c30493e802bf58 Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:17:33 +0100 Subject: [PATCH 05/60] correct doc sections --- agb/src/interrupt.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index 83c30357..26099f9d 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -226,10 +226,10 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// Adds an interrupt handler as long as the returned value is alive. The /// closure takes a [`CriticalSection`] which can be used for mutexes. /// -/// SAFETY: +/// # Safety /// * You *must not* allocate in an interrupt. /// -/// STATICNESS: +/// # Staticness /// * The closure must be static because forgetting the interrupt handler will /// cause a use after free. /// From 686ded4377946ceea2cb15085115015ec9536c4f Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:28:52 +0100 Subject: [PATCH 06/60] fix doc example --- agb/src/interrupt.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index 26099f9d..fc0ad9dc 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -228,6 +228,7 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// /// # Safety /// * You *must not* allocate in an interrupt. +/// - Many functions in agb allocate and it isn't always clear. /// /// # Staticness /// * The closure must be static because forgetting the interrupt handler will @@ -240,12 +241,14 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// ```rust,no_run /// # #![no_std] /// # #![no_main] -/// use bare_metal::CriticalSection; -/// /// # fn foo() { -/// # use agb::interrupt::{add_interrupt_handler, Interrupt}; -/// let _a = add_interrupt_handler(Interrupt::VBlank, |_: CriticalSection| { -/// agb::println!("Woah there! There's been a vblank!"); +/// use bare_metal::CriticalSection; +/// use agb::interrupt::{add_interrupt_handler, Interrupt}; +/// // Safety: doesn't allocate +/// let _a = unsafe { +/// add_interrupt_handler(Interrupt::VBlank, |_: CriticalSection| { +/// agb::println!("Woah there! There's been a vblank!"); +/// } /// }); /// # } /// ``` From 69b1ea5e479d2336247aee7654db8888c931435e Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:47:21 +0100 Subject: [PATCH 07/60] fix brackets --- agb/src/interrupt.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index fc0ad9dc..dda401fc 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -248,8 +248,8 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// let _a = unsafe { /// add_interrupt_handler(Interrupt::VBlank, |_: CriticalSection| { /// agb::println!("Woah there! There's been a vblank!"); -/// } -/// }); +/// }) +/// }; /// # } /// ``` pub unsafe fn add_interrupt_handler( From 44ef68d1eadf77eeaac5f5f40fb250af185c93c6 Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:49:30 +0100 Subject: [PATCH 08/60] note the breaking change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4404d6fd..32b268f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The template now uses rust 2021 edition by default. - All objects which should only be created once now have the correct lifetimes to only allow one to exist. - Template now uses codegen-units=1 to workaround bug in nightly. +- Soundness issues with interrupts resolved which makes them unsafe and require the closure to be static (breaking change). ### Fixed - Alpha channel is now considered by `include_gfx!()` even when `transparent_colour` is absent. From d08ce9c85bfb3434583c4b6b91822095c7785445 Mon Sep 17 00:00:00 2001 From: Corwin Date: Thu, 6 Apr 2023 21:53:18 +0100 Subject: [PATCH 09/60] note allocator change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b268f5..e0999975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The template now uses rust 2021 edition by default. - All objects which should only be created once now have the correct lifetimes to only allow one to exist. - Template now uses codegen-units=1 to workaround bug in nightly. +- Allocator is no longer interrupt safe. - Soundness issues with interrupts resolved which makes them unsafe and require the closure to be static (breaking change). ### Fixed From dce7a6726e6bad5b43a9b514f64b7cf527dc0075 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 21:54:26 +0100 Subject: [PATCH 10/60] Add the correct header --- agb-gbafix/Cargo.lock | 17 +++++++++++++++++ agb-gbafix/Cargo.toml | 4 +++- agb-gbafix/src/main.rs | 40 +++++++++++++++++++++++++++------------- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index 4677f650..e23beada 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -6,11 +6,28 @@ version = 3 name = "agb-gbafix" version = "0.1.0" dependencies = [ + "bytemuck", "elf", + "gbafix", ] +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + [[package]] name = "elf" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b183d6ce6ca4cf30e3db37abf5b52568b5f9015c97d9fbdd7026aa5dcdd758" + +[[package]] +name = "gbafix" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e47af9d5377b8b0def53d9916f6c28521f2e5b97c5fec137797417c26ab4b7" +dependencies = [ + "bytemuck", +] diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index ee86b776..de91941c 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -6,4 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -elf = "0.7" \ No newline at end of file +elf = "0.7" +gbafix = "1" +bytemuck = "1" \ No newline at end of file diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 1f07d457..039c1896 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -1,6 +1,6 @@ use std::{ fs, - io::{self, Write}, + io::{BufWriter, Write}, path::PathBuf, }; @@ -11,16 +11,16 @@ fn main() -> Result<(), Box> { let elf_file = elf::ElfBytes::::minimal_parse(file_data)?; - let (section_headers, strtab) = elf_file.section_headers_with_strtab()?; - let section_headers = section_headers.expect("Expected section headers"); - let strtab = strtab.expect("Expected string table"); + let section_headers = elf_file + .section_headers() + .expect("Expected section headers"); - let output = fs::File::create("out.gba")?; - let mut buf_writer = io::BufWriter::new(output); + let mut output = BufWriter::new(fs::File::create("out.gba")?); + let mut header = gbafix::GBAHeader::default(); + + let mut written_header = false; for section_header in section_headers.iter() { - let section_name = strtab.get(section_header.sh_name as usize)?; - const SHT_NOBITS: u32 = 8; const SHT_NULL: u32 = 0; const SHF_ALLOC: u64 = 2; @@ -31,17 +31,31 @@ fn main() -> Result<(), Box> { continue; } - println!("{section_name}"); - - let (data, compression) = elf_file.section_data(§ion_header)?; + let (mut data, compression) = elf_file.section_data(§ion_header)?; if let Some(compression) = compression { panic!("Cannot decompress elf content, but got compression header {compression:?}"); } - buf_writer.write_all(data)?; + if !written_header { + assert!( + data.len() > 192, + "first section must be at least as big as the gba header" + ); + + header.start_code = data[0..4].try_into().unwrap(); + header.update_checksum(); + + let header_bytes = bytemuck::bytes_of(&header); + output.write_all(header_bytes)?; + + data = &data[192..]; + written_header = true; + } + + output.write_all(data)?; } - buf_writer.flush()?; + output.flush()?; Ok(()) } From a111a41deb9c71aed27d69f7c0fb37e4acb12980 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 21:55:11 +0100 Subject: [PATCH 11/60] Extract constant --- agb-gbafix/src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 039c1896..88747d80 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -37,8 +37,10 @@ fn main() -> Result<(), Box> { } if !written_header { + const GBA_HEADER_SIZE: usize = 192; + assert!( - data.len() > 192, + data.len() > GBA_HEADER_SIZE, "first section must be at least as big as the gba header" ); @@ -48,7 +50,7 @@ fn main() -> Result<(), Box> { let header_bytes = bytemuck::bytes_of(&header); output.write_all(header_bytes)?; - data = &data[192..]; + data = &data[GBA_HEADER_SIZE..]; written_header = true; } From 07318256e0883901e2a0d5bc37b247a2ffab03d5 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:09:19 +0100 Subject: [PATCH 12/60] Generate correct 0 bytes --- agb-gbafix/src/main.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 88747d80..de7e9fb1 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -19,7 +19,9 @@ fn main() -> Result<(), Box> { let mut header = gbafix::GBAHeader::default(); - let mut written_header = false; + const GBA_START_ADDRESS: u64 = 0x8000000; + let mut address = GBA_START_ADDRESS; + for section_header in section_headers.iter() { const SHT_NOBITS: u32 = 8; const SHT_NULL: u32 = 0; @@ -31,12 +33,16 @@ fn main() -> Result<(), Box> { continue; } + for _ in address..section_header.sh_addr { + output.write_all(&[0])?; + } + let (mut data, compression) = elf_file.section_data(§ion_header)?; if let Some(compression) = compression { panic!("Cannot decompress elf content, but got compression header {compression:?}"); } - if !written_header { + if address == GBA_START_ADDRESS { const GBA_HEADER_SIZE: usize = 192; assert!( @@ -51,10 +57,11 @@ fn main() -> Result<(), Box> { output.write_all(header_bytes)?; data = &data[GBA_HEADER_SIZE..]; - written_header = true; + address += GBA_HEADER_SIZE as u64; } output.write_all(data)?; + address += data.len() as u64; } output.flush()?; From d278d50528c13b6ab1dbe9e1da688e835e4ca99d Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:13:42 +0100 Subject: [PATCH 13/60] Extract function --- agb-gbafix/src/main.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index de7e9fb1..263a8011 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -1,22 +1,29 @@ use std::{ - fs, + error, fs, io::{BufWriter, Write}, path::PathBuf, }; -fn main() -> Result<(), Box> { +fn main() -> Result<(), Box> { + let mut output = BufWriter::new(fs::File::create("out.gba")?); + let path = PathBuf::from("tests/text_render"); let file_data = fs::read(path)?; - let file_data = file_data.as_slice(); - let elf_file = elf::ElfBytes::::minimal_parse(file_data)?; + write_gba_file(file_data.as_slice(), &mut output)?; + + output.flush()?; + + Ok(()) +} + +fn write_gba_file(input: &[u8], output: &mut W) -> Result<(), Box> { + let elf_file = elf::ElfBytes::::minimal_parse(input)?; let section_headers = elf_file .section_headers() .expect("Expected section headers"); - let mut output = BufWriter::new(fs::File::create("out.gba")?); - let mut header = gbafix::GBAHeader::default(); const GBA_START_ADDRESS: u64 = 0x8000000; @@ -64,7 +71,5 @@ fn main() -> Result<(), Box> { address += data.len() as u64; } - output.flush()?; - Ok(()) } From b76781799ae81c310192377b0235d815063498e2 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:16:38 +0100 Subject: [PATCH 14/60] Use anyhow for errors --- agb-gbafix/Cargo.lock | 7 +++++++ agb-gbafix/Cargo.toml | 3 ++- agb-gbafix/src/main.rs | 14 ++++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index e23beada..6510f171 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -6,11 +6,18 @@ version = 3 name = "agb-gbafix" version = "0.1.0" dependencies = [ + "anyhow", "bytemuck", "elf", "gbafix", ] +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + [[package]] name = "bytemuck" version = "1.13.1" diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index de91941c..deb9792b 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -8,4 +8,5 @@ edition = "2021" [dependencies] elf = "0.7" gbafix = "1" -bytemuck = "1" \ No newline at end of file +bytemuck = "1" +anyhow = "1" \ No newline at end of file diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 263a8011..0bade60f 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -1,10 +1,12 @@ +use anyhow::{anyhow, bail, ensure, Result}; + use std::{ - error, fs, + fs, io::{BufWriter, Write}, path::PathBuf, }; -fn main() -> Result<(), Box> { +fn main() -> Result<()> { let mut output = BufWriter::new(fs::File::create("out.gba")?); let path = PathBuf::from("tests/text_render"); @@ -17,12 +19,12 @@ fn main() -> Result<(), Box> { Ok(()) } -fn write_gba_file(input: &[u8], output: &mut W) -> Result<(), Box> { +fn write_gba_file(input: &[u8], output: &mut W) -> Result<()> { let elf_file = elf::ElfBytes::::minimal_parse(input)?; let section_headers = elf_file .section_headers() - .expect("Expected section headers"); + .ok_or_else(|| anyhow!("Failed to parse as elf file"))?; let mut header = gbafix::GBAHeader::default(); @@ -46,13 +48,13 @@ fn write_gba_file(input: &[u8], output: &mut W) -> Result<(), Box GBA_HEADER_SIZE, "first section must be at least as big as the gba header" ); From 44e0d24f1bb610152eaf78965442112ff04156ec Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:35:44 +0100 Subject: [PATCH 15/60] Pad the result --- agb-gbafix/src/main.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 0bade60f..b837dd92 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -42,8 +42,12 @@ fn write_gba_file(input: &[u8], output: &mut W) -> Result<()> { continue; } - for _ in address..section_header.sh_addr { - output.write_all(&[0])?; + if address < section_header.sh_addr { + for _ in address..section_header.sh_addr { + output.write_all(&[0])?; + } + + address = section_header.sh_addr; } let (mut data, compression) = elf_file.section_data(§ion_header)?; @@ -73,5 +77,15 @@ fn write_gba_file(input: &[u8], output: &mut W) -> Result<()> { address += data.len() as u64; } + let length = address - GBA_START_ADDRESS; + + if !length.is_power_of_two() { + let required_padding = length.next_power_of_two() - length; + + for _ in 0..required_padding { + output.write_all(&[0])?; + } + } + Ok(()) } From 8aa6e3182bc1a2c99ca2443deef47dfa70a7b5e3 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:43:57 +0100 Subject: [PATCH 16/60] Add a CLI --- agb-gbafix/Cargo.lock | 323 +++++++++++++++++++++++++++++++++++++++++ agb-gbafix/Cargo.toml | 3 +- agb-gbafix/src/main.rs | 17 ++- 3 files changed, 339 insertions(+), 4 deletions(-) diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index 6510f171..79b706be 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -8,28 +8,146 @@ version = "0.1.0" dependencies = [ "anyhow", "bytemuck", + "clap", "elf", "gbafix", ] +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "anyhow" version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bytemuck" version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "clap" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "once_cell", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + [[package]] name = "elf" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b183d6ce6ca4cf30e3db37abf5b52568b5f9015c97d9fbdd7026aa5dcdd758" +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "gbafix" version = "1.0.4" @@ -38,3 +156,208 @@ checksum = "f7e47af9d5377b8b0def53d9916f6c28521f2e5b97c5fec137797417c26ab4b7" dependencies = [ "bytemuck", ] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "libc" +version = "0.2.141" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "rustix" +version = "0.37.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index deb9792b..901a7f9f 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -9,4 +9,5 @@ edition = "2021" elf = "0.7" gbafix = "1" bytemuck = "1" -anyhow = "1" \ No newline at end of file +anyhow = "1" +clap = { version = "4", features = ["cargo"] } \ No newline at end of file diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index b837dd92..3d4024e8 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -1,4 +1,5 @@ use anyhow::{anyhow, bail, ensure, Result}; +use clap::{arg, command, value_parser}; use std::{ fs, @@ -7,10 +8,20 @@ use std::{ }; fn main() -> Result<()> { - let mut output = BufWriter::new(fs::File::create("out.gba")?); + let matches = command!() + .arg(arg!( "Input elf file").value_parser(value_parser!(PathBuf))) + .arg(arg!(-o --output "Set output file, defaults to replacing INPUT's extension to .gba").value_parser(value_parser!(PathBuf))) + .get_matches(); - let path = PathBuf::from("tests/text_render"); - let file_data = fs::read(path)?; + let input = matches.get_one::("INPUT").unwrap(); + let output = match matches.get_one::("output") { + Some(output) => output.clone(), + None => input.with_extension("gba"), + }; + + let mut output = BufWriter::new(fs::File::create(output)?); + + let file_data = fs::read(input)?; write_gba_file(file_data.as_slice(), &mut output)?; From d81c28a0d0cac072f8fbd22fea0ff2bb55fdf35f Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Thu, 6 Apr 2023 23:56:19 +0100 Subject: [PATCH 17/60] Allow configuration of the header --- agb-gbafix/src/main.rs | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 3d4024e8..9a2e94c7 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -11,6 +11,10 @@ fn main() -> Result<()> { let matches = command!() .arg(arg!( "Input elf file").value_parser(value_parser!(PathBuf))) .arg(arg!(-o --output "Set output file, defaults to replacing INPUT's extension to .gba").value_parser(value_parser!(PathBuf))) + .arg(arg!(-t --title "Set the title. At most 12 bytes")) + .arg(arg!(-c --gamecode <GAME_CODE> "Sets the game code, 4 bytes")) + .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 0-65535").value_parser(value_parser!(u16))) + .arg(arg!(-r --gameversion <VERSION> "Set the version of the game, 0-255").value_parser(value_parser!(u8))) .get_matches(); let input = matches.get_one::<PathBuf>("INPUT").unwrap(); @@ -19,26 +23,49 @@ fn main() -> Result<()> { None => input.with_extension("gba"), }; - let mut output = BufWriter::new(fs::File::create(output)?); + let mut header = gbafix::GBAHeader::default(); + if let Some(title) = matches.get_one::<String>("title") { + for (i, &c) in title.as_bytes().iter().enumerate().take(12) { + header.title[i] = c; + } + } + + if let Some(maker_code) = matches.get_one::<u16>("makercode") { + header.maker_code = maker_code.to_le_bytes(); + } + + if let Some(game_version) = matches.get_one::<u8>("gameversion") { + header.version = *game_version; + } + + if let Some(game_code) = matches.get_one::<String>("gamecode") { + for (i, &c) in game_code.as_bytes().iter().enumerate().take(4) { + header.game_code[i] = c; + } + } + + let mut output = BufWriter::new(fs::File::create(output)?); let file_data = fs::read(input)?; - write_gba_file(file_data.as_slice(), &mut output)?; + write_gba_file(file_data.as_slice(), header, &mut output)?; output.flush()?; Ok(()) } -fn write_gba_file<W: Write>(input: &[u8], output: &mut W) -> Result<()> { +fn write_gba_file<W: Write>( + input: &[u8], + mut header: gbafix::GBAHeader, + output: &mut W, +) -> Result<()> { let elf_file = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(input)?; let section_headers = elf_file .section_headers() .ok_or_else(|| anyhow!("Failed to parse as elf file"))?; - let mut header = gbafix::GBAHeader::default(); - const GBA_START_ADDRESS: u64 = 0x8000000; let mut address = GBA_START_ADDRESS; From e87c90d7adc47b8f62dd413808183f0f46b73de2 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 6 Apr 2023 23:59:28 +0100 Subject: [PATCH 18/60] Remove cargo feature --- agb-gbafix/Cargo.lock | 7 ------- agb-gbafix/Cargo.toml | 2 +- agb-gbafix/src/main.rs | 5 +++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index 79b706be..3bed8d81 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -96,7 +96,6 @@ dependencies = [ "anstyle", "bitflags", "clap_lex", - "once_cell", "strsim", ] @@ -198,12 +197,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - [[package]] name = "rustix" version = "0.37.8" diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index 901a7f9f..a1ac8093 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -10,4 +10,4 @@ elf = "0.7" gbafix = "1" bytemuck = "1" anyhow = "1" -clap = { version = "4", features = ["cargo"] } \ No newline at end of file +clap = { version = "4" } \ No newline at end of file diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 9a2e94c7..4dc3e0ab 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -1,5 +1,5 @@ use anyhow::{anyhow, bail, ensure, Result}; -use clap::{arg, command, value_parser}; +use clap::{arg, value_parser}; use std::{ fs, @@ -8,7 +8,8 @@ use std::{ }; fn main() -> Result<()> { - let matches = command!() + let matches = clap::Command::new("agb-gbafix") + .about("Convert elf files directly to a valid GBA ROM") .arg(arg!(<INPUT> "Input elf file").value_parser(value_parser!(PathBuf))) .arg(arg!(-o --output <OUTPUT> "Set output file, defaults to replacing INPUT's extension to .gba").value_parser(value_parser!(PathBuf))) .arg(arg!(-t --title <TITLE> "Set the title. At most 12 bytes")) From b13318f699760a635e2cc4c4e3a322f739e7d1ce Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Fri, 7 Apr 2023 00:03:00 +0100 Subject: [PATCH 19/60] Autogenerate the title --- agb-gbafix/src/main.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 4dc3e0ab..56edbb8c 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -12,7 +12,7 @@ fn main() -> Result<()> { .about("Convert elf files directly to a valid GBA ROM") .arg(arg!(<INPUT> "Input elf file").value_parser(value_parser!(PathBuf))) .arg(arg!(-o --output <OUTPUT> "Set output file, defaults to replacing INPUT's extension to .gba").value_parser(value_parser!(PathBuf))) - .arg(arg!(-t --title <TITLE> "Set the title. At most 12 bytes")) + .arg(arg!(-t --title <TITLE> "Set the title. At most 12 bytes. Defaults to truncating the input file name")) .arg(arg!(-c --gamecode <GAME_CODE> "Sets the game code, 4 bytes")) .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 0-65535").value_parser(value_parser!(u16))) .arg(arg!(-r --gameversion <VERSION> "Set the version of the game, 0-255").value_parser(value_parser!(u8))) @@ -26,7 +26,17 @@ fn main() -> Result<()> { let mut header = gbafix::GBAHeader::default(); - if let Some(title) = matches.get_one::<String>("title") { + { + let title = if let Some(title) = matches.get_one::<String>("title") { + title.clone() + } else { + let title = input + .file_stem() + .ok_or_else(|| anyhow!("Invalid filename {}", input.to_string_lossy()))? + .to_string_lossy(); + title.into_owned() + }; + for (i, &c) in title.as_bytes().iter().enumerate().take(12) { header.title[i] = c; } From 6d28e4193b5609f520932605f94baf348aae5783 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:10:47 +0100 Subject: [PATCH 20/60] Replace objcopy + gbafix to use our own gbafix --- justfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index d901cce2..1c56a933 100644 --- a/justfile +++ b/justfile @@ -105,11 +105,13 @@ _build-rom folder name: mkdir -p examples/target/examples - arm-none-eabi-objcopy -O binary "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" "$GBA_FILE" - gbafix -p "-t${INTERNAL_NAME:0:12}" "-c${INTERNAL_NAME:0:4}" -mGC "$GBA_FILE" + just _gbafix --title "${INTERNAL_NAME:0:12}" --gamecode "${INTERNAL_NAME:0:4}" "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" -o "$GBA_FILE" cp -v "$GBA_FILE" "examples/target/examples/$GAME_NAME.gba" +_gbafix +args: + (cd agb-gbafix && cargo run --release -- {{args}}) + _all-crates target: for CARGO_PROJECT_FILE in agb-*/Cargo.toml agb/Cargo.toml; do \ PROJECT_DIR=$(dirname "$CARGO_PROJECT_FILE"); \ From 32d19debfb8087170ff1dc92b8d2a23cfc92c90e Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:13:22 +0100 Subject: [PATCH 21/60] Add -p argument for compatibility with stock gbafix --- agb-gbafix/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 56edbb8c..d3a4e3eb 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -16,6 +16,7 @@ fn main() -> Result<()> { .arg(arg!(-c --gamecode <GAME_CODE> "Sets the game code, 4 bytes")) .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 0-65535").value_parser(value_parser!(u16))) .arg(arg!(-r --gameversion <VERSION> "Set the version of the game, 0-255").value_parser(value_parser!(u8))) + .arg(arg!(-p "Ignored for compatibility with gbafix")) .get_matches(); let input = matches.get_one::<PathBuf>("INPUT").unwrap(); From 89c883466a4728fba276a6270e8067923ebcc601 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:14:11 +0100 Subject: [PATCH 22/60] Allow calling `just gbafix` --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 1c56a933..8dd3c721 100644 --- a/justfile +++ b/justfile @@ -105,11 +105,11 @@ _build-rom folder name: mkdir -p examples/target/examples - just _gbafix --title "${INTERNAL_NAME:0:12}" --gamecode "${INTERNAL_NAME:0:4}" "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" -o "$GBA_FILE" + just gbafix --title "${INTERNAL_NAME:0:12}" --gamecode "${INTERNAL_NAME:0:4}" "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" -o "$GBA_FILE" cp -v "$GBA_FILE" "examples/target/examples/$GAME_NAME.gba" -_gbafix +args: +gbafix *args: (cd agb-gbafix && cargo run --release -- {{args}}) _all-crates target: From 7ec077e08adb5fb70f60ba490bd921b8aed7ace8 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:18:27 +0100 Subject: [PATCH 23/60] Implement makercode as expected --- agb-gbafix/src/main.rs | 17 ++++++++++++++--- justfile | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index d3a4e3eb..7fe07200 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -14,7 +14,7 @@ fn main() -> Result<()> { .arg(arg!(-o --output <OUTPUT> "Set output file, defaults to replacing INPUT's extension to .gba").value_parser(value_parser!(PathBuf))) .arg(arg!(-t --title <TITLE> "Set the title. At most 12 bytes. Defaults to truncating the input file name")) .arg(arg!(-c --gamecode <GAME_CODE> "Sets the game code, 4 bytes")) - .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 0-65535").value_parser(value_parser!(u16))) + .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 2 bytes")) .arg(arg!(-r --gameversion <VERSION> "Set the version of the game, 0-255").value_parser(value_parser!(u8))) .arg(arg!(-p "Ignored for compatibility with gbafix")) .get_matches(); @@ -43,8 +43,19 @@ fn main() -> Result<()> { } } - if let Some(maker_code) = matches.get_one::<u16>("makercode") { - header.maker_code = maker_code.to_le_bytes(); + if let Some(maker_code) = matches.get_one::<String>("makercode") { + let maker_code = maker_code.as_bytes(); + if maker_code.len() > 2 { + bail!( + "Maker code must be at most 2 bytes, got {}", + maker_code.len() + ); + } + + header.maker_code = [ + *maker_code.first().unwrap_or(&0), + *maker_code.get(1).unwrap_or(&0), + ]; } if let Some(game_version) = matches.get_one::<u8>("gameversion") { diff --git a/justfile b/justfile index 8dd3c721..032849cb 100644 --- a/justfile +++ b/justfile @@ -105,7 +105,7 @@ _build-rom folder name: mkdir -p examples/target/examples - just gbafix --title "${INTERNAL_NAME:0:12}" --gamecode "${INTERNAL_NAME:0:4}" "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" -o "$GBA_FILE" + just gbafix --title "${INTERNAL_NAME:0:12}" --gamecode "${INTERNAL_NAME:0:4}" --makercode GC "$TARGET_FOLDER/thumbv4t-none-eabi/release/$GAME_NAME" -o "$GBA_FILE" cp -v "$GBA_FILE" "examples/target/examples/$GAME_NAME.gba" From f70a280aea632e384071e6b2a3256c0d422ea766 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:18:56 +0100 Subject: [PATCH 24/60] Don't create a dictionary here --- agb-gbafix/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index a1ac8093..2b4edfc2 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -10,4 +10,4 @@ elf = "0.7" gbafix = "1" bytemuck = "1" anyhow = "1" -clap = { version = "4" } \ No newline at end of file +clap = "4" \ No newline at end of file From 2412ac4dc5d477e204d186b1d9f351a193490771 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:22:02 +0100 Subject: [PATCH 25/60] Add GPL 3.0 licence for gbafix as required by dependencies --- README.md | 4 +- agb-gbafix/LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 677 insertions(+), 1 deletion(-) create mode 100644 agb-gbafix/LICENSE diff --git a/README.md b/README.md index 3a6571f8..b9b06e4e 100644 --- a/README.md +++ b/README.md @@ -119,9 +119,11 @@ agb would not be possible without the help from the following (non-exhaustive) l ## Licence -agb and all its subcrates are released under MPL version 2.0. See full licence +agb and all its subcrates (except agb-gbafix) are released under MPL version 2.0. See full licence text in the `LICENSE` file. +agb-gbafix is released under GPL version 3.0. See the full licence in the agb-gbafix/LICENSE file + agb contains a subset of the code from [agbabi](https://github.com/felixjones/agbabi) which is released under a zlib style licence, details for which you can find under `agb/src/agbabi`. diff --git a/agb-gbafix/LICENSE b/agb-gbafix/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/agb-gbafix/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. From aad5aaf26d5bfffe1fd4a6fca85e56ed0c74831a Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sat, 8 Apr 2023 21:23:37 +0100 Subject: [PATCH 26/60] Remove installation of gbafix --- .github/workflows/build-and-test.yml | 2 -- .github/workflows/publish-agb.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 2e69ef78..f92a6c08 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,8 +33,6 @@ jobs: run: cargo install --path mgba-test-runner --verbose - name: Set CARGO_TARGET_DIR run: echo "CARGO_TARGET_DIR=$HOME/target" >> $GITHUB_ENV - - name: Install gbafix - run: cargo install gbafix - uses: extractions/setup-just@v1 - name: Setup mdBook uses: peaceiris/actions-mdbook@v1 diff --git a/.github/workflows/publish-agb.yml b/.github/workflows/publish-agb.yml index fdf8254d..5f715f75 100644 --- a/.github/workflows/publish-agb.yml +++ b/.github/workflows/publish-agb.yml @@ -30,8 +30,6 @@ jobs: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} run: bash .github/scripts/update-template-repo.sh - - name: Install gbafix - run: cargo install gbafix - name: Build the examples run: just build-roms - name: Upload examples to the release From 1c56de287a42b72ed9e79aa7e49fb0d9470eaa0d Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sun, 9 Apr 2023 18:33:37 +0100 Subject: [PATCH 27/60] Do the padding correctly --- agb-gbafix/src/main.rs | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/agb-gbafix/src/main.rs b/agb-gbafix/src/main.rs index 7fe07200..09a3861a 100644 --- a/agb-gbafix/src/main.rs +++ b/agb-gbafix/src/main.rs @@ -16,7 +16,7 @@ fn main() -> Result<()> { .arg(arg!(-c --gamecode <GAME_CODE> "Sets the game code, 4 bytes")) .arg(arg!(-m --makercode <MAKER_CODE> "Set the maker code, 2 bytes")) .arg(arg!(-r --gameversion <VERSION> "Set the version of the game, 0-255").value_parser(value_parser!(u8))) - .arg(arg!(-p "Ignored for compatibility with gbafix")) + .arg(arg!(-p --padding "Ignored for compatibility with gbafix")) .get_matches(); let input = matches.get_one::<PathBuf>("INPUT").unwrap(); @@ -89,9 +89,7 @@ fn write_gba_file<W: Write>( .section_headers() .ok_or_else(|| anyhow!("Failed to parse as elf file"))?; - const GBA_START_ADDRESS: u64 = 0x8000000; - let mut address = GBA_START_ADDRESS; - + let mut bytes_written = 0; for section_header in section_headers.iter() { const SHT_NOBITS: u32 = 8; const SHT_NULL: u32 = 0; @@ -103,12 +101,12 @@ fn write_gba_file<W: Write>( continue; } - if address < section_header.sh_addr { - for _ in address..section_header.sh_addr { + let align = bytes_written % section_header.sh_addralign; + if align != 0 { + for _ in 0..(section_header.sh_addralign - align) { output.write_all(&[0])?; + bytes_written += 1; } - - address = section_header.sh_addr; } let (mut data, compression) = elf_file.section_data(§ion_header)?; @@ -116,7 +114,7 @@ fn write_gba_file<W: Write>( bail!("Cannot decompress elf content, but got compression header {compression:?}"); } - if address == GBA_START_ADDRESS { + if bytes_written == 0 { const GBA_HEADER_SIZE: usize = 192; ensure!( @@ -131,17 +129,15 @@ fn write_gba_file<W: Write>( output.write_all(header_bytes)?; data = &data[GBA_HEADER_SIZE..]; - address += GBA_HEADER_SIZE as u64; + bytes_written += GBA_HEADER_SIZE as u64; } output.write_all(data)?; - address += data.len() as u64; + bytes_written += data.len() as u64; } - let length = address - GBA_START_ADDRESS; - - if !length.is_power_of_two() { - let required_padding = length.next_power_of_two() - length; + if !bytes_written.is_power_of_two() { + let required_padding = bytes_written.next_power_of_two() - bytes_written; for _ in 0..required_padding { output.write_all(&[0])?; From 8af41a9b3ca3ff8e94d3346b430cabe128c9bf54 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Sun, 9 Apr 2023 18:40:33 +0100 Subject: [PATCH 28/60] Add required fields for publishing --- agb-gbafix/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index 2b4edfc2..80718f9b 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -2,8 +2,10 @@ name = "agb-gbafix" version = "0.1.0" edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +authors = ["Gwilym Inzani <email@gwilym.dev>"] +license = "GPL-3.0" +description = "CLI utility to convert ELF file to valid GBA ROM" +repository = "https://github.com/agbrs/agb" [dependencies] elf = "0.7" From 0d9cc6c1f79f9c41a0dfd64efd17561519de43b9 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 11 Apr 2023 20:09:05 +0100 Subject: [PATCH 29/60] Replace references to gbafix with agb-gbafix --- CHANGELOG.md | 3 +++ README.md | 2 -- book/src/setup/building.md | 19 +++++-------------- book/src/setup/linux.md | 4 ++-- book/src/setup/mac.md | 4 ++-- template/README.md | 7 +++---- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4404d6fd..c15cd3ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +- Added custom `gbafix` implementation which can take the elf file produced by `cargo build` directly, removing the need for the objcopy step. + ### Changed - Made Vector2D::new a const function. - The template now uses rust 2021 edition by default. diff --git a/README.md b/README.md index b9b06e4e..ed82fb7b 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,6 @@ to just write games for the Game Boy Advance using this library: * Install with `cargo install just` * [mdbook](https://rust-lang.github.io/mdBook/index.html) * Install with `cargo install mdbook` -* [gbafix](https://crates.io/crates/gbafix) - * Install with `cargo install gbafix` With all of this installed, you should be able to run a full build of agb using by running ```sh diff --git a/book/src/setup/building.md b/book/src/setup/building.md index 0358c76e..d88b9e53 100644 --- a/book/src/setup/building.md +++ b/book/src/setup/building.md @@ -30,30 +30,21 @@ Depending on your platform, the file will have either a `.elf` extension or no e ## 3. Convert the binary to a GBA file In order to run the game on an emulator, we need to convert the binary file to a GBA file. -To do this, we'll use two tools: `arm-none-eabi-objcopy` and `gbafix`. +To do this, we'll use the tool `agb-gbafix`. -Run the following command to convert the binary file to a GBA file: +Run the following command to convert the binary file to a GBA ROM: ```sh -arm-none-eabi-objcopy -O binary target/thumbv4t-none-eabi/release/template template.gba +agb-gbafix target/thumbv4t-none-eabi/release/template -o template.gba ``` or ```sh -arm-none-eabi-objcopy -O binary target/thumbv4t-none-eabi/release/template.elf template.gba +agb-gbafix target/thumbv4t-none-eabi/release/template.elf -o template.gba ``` -Depending on whether your file has the .elf extension. -This command will create a template.gba file in the template directory. - -Next, run the following command to fix the GBA header: - -```sh -gbafix template.gba -``` - -This command will add the correct GBA header to the template.gba file. +This command will add the correct GBA header to the template.gba file and it will be playable on real hardware or an emulator. ## 4. Run the game diff --git a/book/src/setup/linux.md b/book/src/setup/linux.md index 0c4c6574..f96557f0 100644 --- a/book/src/setup/linux.md +++ b/book/src/setup/linux.md @@ -25,8 +25,8 @@ The source code for the game is hosted on github, so you will need to install gi # 4. gbafix -In order to be able to play games made with agb on real hardware or on some emulators, you will need to install 'gbafix'. -The rust implementation can be installed very easily using `cargo install gbafix`. +In order to be able to play games made with agb on real hardware or on some emulators, you will need to install 'agb-gbafix'. +Agb's implementation can be installed very easily using `cargo install agb-gbafix`. Make sure that the Cargo bin directory is in your `PATH` as we'll need to use it later. diff --git a/book/src/setup/mac.md b/book/src/setup/mac.md index a03248ca..510765e3 100644 --- a/book/src/setup/mac.md +++ b/book/src/setup/mac.md @@ -43,8 +43,8 @@ After installing to your `/Applications` folder you can add the binary to your p # 5. Real hardware - gbafix -In order to be able to play games made with agb on real hardware or on some emulators, you will need to install 'gbafix'. -The rust implementation can be installed very easily using `cargo install gbafix`. +In order to be able to play games made with agb on real hardware or on some emulators, you will need to install 'agb-gbafix'. +Agb's implementation can be installed very easily using `cargo install agb-gbafix`. Make sure that the Cargo bin directory is in your `PATH` as we'll need to use it later. diff --git a/template/README.md b/template/README.md index 423ea1e4..2d488275 100644 --- a/template/README.md +++ b/template/README.md @@ -22,8 +22,8 @@ You will also want to install an emulator. The best support in agb is with [mgba `println!` support via `agb::println!` but any emulator should work. You'll get the best experience if `mgba-qt` is in your `PATH`. -If you want to run your game on real hardware, you will also need to install `gbafix` which you can do after installing -rust with the following: `cargo install gbafix`. This is not required if you are only running your game in an emulator. +If you want to run your game on real hardware, you will also need to install `agb-gbafix` which you can do after installing +rust with the following: `cargo install agb-gbafix`. This is not required if you are only running your game in an emulator. ### Running in an emulator @@ -68,6 +68,5 @@ running on the real thing. First build the binary in release mode using the instructions above, then do the following: ```sh -arm-none-eabi-objcopy -O binary target/thumbv4t-none-eabi/release/<your game> <your game>.gba -gbafix <your game>.gba +agb-gbafix target/thumbv4t-none-eabi/release/<your game> -o <your game>.gba ``` \ No newline at end of file From aea64e974fdf6f725a472b56379ff744690b1350 Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Tue, 11 Apr 2023 20:59:45 +0100 Subject: [PATCH 30/60] change of language --- agb/src/interrupt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs index dda401fc..6cb8593d 100644 --- a/agb/src/interrupt.rs +++ b/agb/src/interrupt.rs @@ -231,7 +231,7 @@ fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot { /// - Many functions in agb allocate and it isn't always clear. /// /// # Staticness -/// * The closure must be static because forgetting the interrupt handler will +/// * The closure must be static because forgetting the interrupt handler would /// cause a use after free. /// /// [`CriticalSection`]: bare_metal::CriticalSection From fd79611dc35f76ad4dedbe400899b2b345d4b39c Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Tue, 11 Apr 2023 21:27:09 +0100 Subject: [PATCH 31/60] update lock files --- book/games/pong/Cargo.lock | 71 +++++++++++++++++++++++++++++++++++-- examples/combo/Cargo.lock | 72 +++++++++++++++++++++++++++++++++++--- 2 files changed, 136 insertions(+), 7 deletions(-) diff --git a/book/games/pong/Cargo.lock b/book/games/pong/Cargo.lock index 16d18409..7ee79661 100644 --- a/book/games/pong/Cargo.lock +++ b/book/games/pong/Cargo.lock @@ -176,7 +176,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", "ttf-parser", ] @@ -200,6 +200,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hound" version = "3.5.0" @@ -221,6 +227,16 @@ dependencies = [ "png", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "libc" version = "0.2.140" @@ -236,6 +252,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "miniz_oxide" version = "0.3.7" @@ -391,6 +413,15 @@ dependencies = [ "syn 2.0.8", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -421,11 +452,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -451,3 +507,12 @@ name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] diff --git a/examples/combo/Cargo.lock b/examples/combo/Cargo.lock index 68bc03c2..2ee9eb39 100644 --- a/examples/combo/Cargo.lock +++ b/examples/combo/Cargo.lock @@ -201,7 +201,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", "ttf-parser", ] @@ -234,6 +234,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hound" version = "3.5.0" @@ -245,7 +251,6 @@ name = "hyperspace-roll" version = "0.1.0" dependencies = [ "agb", - "bare-metal", ] [[package]] @@ -263,6 +268,16 @@ dependencies = [ "png", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "itoa" version = "1.0.6" @@ -296,6 +311,12 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "miniz_oxide" version = "0.3.7" @@ -467,6 +488,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -533,11 +563,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -564,6 +619,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "xml-rs" version = "0.8.4" From fc5ce97db4068fa8aa3e07d3a594afda4c913ddf Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Tue, 11 Apr 2023 21:28:22 +0100 Subject: [PATCH 32/60] Release v0.14.0 --- CHANGELOG.md | 2 ++ agb-fixnum/Cargo.toml | 4 ++-- agb-gbafix/Cargo.lock | 2 +- agb-gbafix/Cargo.toml | 4 ++-- agb-image-converter/Cargo.toml | 2 +- agb-macros/Cargo.toml | 2 +- agb-sound-converter/Cargo.toml | 2 +- agb/Cargo.toml | 10 +++++----- book/games/pong/Cargo.lock | 10 +++++----- book/games/pong/Cargo.toml | 2 +- examples/combo/Cargo.lock | 10 +++++----- examples/combo/Cargo.toml | 2 +- examples/hyperspace-roll/Cargo.lock | 10 +++++----- examples/hyperspace-roll/Cargo.toml | 2 +- examples/the-hat-chooses-the-wizard/Cargo.lock | 10 +++++----- examples/the-hat-chooses-the-wizard/Cargo.toml | 2 +- examples/the-purple-night/Cargo.lock | 10 +++++----- examples/the-purple-night/Cargo.toml | 2 +- template/Cargo.toml | 2 +- 19 files changed, 46 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 841c6936..7c1024e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.14.0] - 2023/04/11 + ### Added - Added custom `gbafix` implementation which can take the elf file produced by `cargo build` directly, removing the need for the objcopy step. diff --git a/agb-fixnum/Cargo.toml b/agb-fixnum/Cargo.toml index 2b97d8c4..cb4e16ef 100644 --- a/agb-fixnum/Cargo.toml +++ b/agb-fixnum/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" edition = "2021" license = "MPL-2.0" description = "Library for abstracting over fixed precision numbers. Designed for use with the agb library for the Game Boy Advance" repository = "https://github.com/agbrs/agb" [dependencies] -agb_macros = { version = "0.13.0", path = "../agb-macros" } +agb_macros = { version = "0.14.0", path = "../agb-macros" } diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index 3bed8d81..7bee57fa 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "agb-gbafix" -version = "0.1.0" +version = "0.14.0" dependencies = [ "anyhow", "bytemuck", diff --git a/agb-gbafix/Cargo.toml b/agb-gbafix/Cargo.toml index 80718f9b..71f85fbc 100644 --- a/agb-gbafix/Cargo.toml +++ b/agb-gbafix/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agb-gbafix" -version = "0.1.0" +version = "0.14.0" edition = "2021" authors = ["Gwilym Inzani <email@gwilym.dev>"] license = "GPL-3.0" @@ -12,4 +12,4 @@ elf = "0.7" gbafix = "1" bytemuck = "1" anyhow = "1" -clap = "4" \ No newline at end of file +clap = "4" diff --git a/agb-image-converter/Cargo.toml b/agb-image-converter/Cargo.toml index 035b2ab9..d787fcc2 100644 --- a/agb-image-converter/Cargo.toml +++ b/agb-image-converter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" authors = ["Gwilym Kuiper <gw@ilym.me>"] edition = "2021" license = "MPL-2.0" diff --git a/agb-macros/Cargo.toml b/agb-macros/Cargo.toml index bb2556a4..64184680 100644 --- a/agb-macros/Cargo.toml +++ b/agb-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" authors = ["Gwilym Kuiper <gw@ilym.me>"] edition = "2021" license = "MPL-2.0" diff --git a/agb-sound-converter/Cargo.toml b/agb-sound-converter/Cargo.toml index 997f0755..4ac5bc29 100644 --- a/agb-sound-converter/Cargo.toml +++ b/agb-sound-converter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" authors = ["Gwilym Kuiper <gw@ilym.me>"] edition = "2021" license = "MPL-2.0" diff --git a/agb/Cargo.toml b/agb/Cargo.toml index 02cdc17b..583033a5 100644 --- a/agb/Cargo.toml +++ b/agb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agb" -version = "0.13.0" +version = "0.14.0" authors = ["Corwin Kuiper <corwin@kuiper.dev>", "Gwilym Kuiper <gw@ilym.me>"] edition = "2021" description = "Library for Game Boy Advance Development" @@ -23,10 +23,10 @@ testing = [] [dependencies] bitflags = "2" -agb_image_converter = { version = "0.13.0", path = "../agb-image-converter" } -agb_sound_converter = { version = "0.13.0", path = "../agb-sound-converter" } -agb_macros = { version = "0.13.0", path = "../agb-macros" } -agb_fixnum = { version = "0.13.0", path = "../agb-fixnum" } +agb_image_converter = { version = "0.14.0", path = "../agb-image-converter" } +agb_sound_converter = { version = "0.14.0", path = "../agb-sound-converter" } +agb_macros = { version = "0.14.0", path = "../agb-macros" } +agb_fixnum = { version = "0.14.0", path = "../agb-fixnum" } bare-metal = "1" modular-bitfield = "0.11" rustc-hash = { version = "1", default-features = false } diff --git a/book/games/pong/Cargo.lock b/book/games/pong/Cargo.lock index 7ee79661..5915f0ec 100644 --- a/book/games/pong/Cargo.lock +++ b/book/games/pong/Cargo.lock @@ -16,7 +16,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "agb" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_fixnum", "agb_image_converter", @@ -30,14 +30,14 @@ dependencies = [ [[package]] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_macros", ] [[package]] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "asefile", "fontdue", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "hound", "proc-macro2", diff --git a/book/games/pong/Cargo.toml b/book/games/pong/Cargo.toml index c13ae22b..ec83e037 100644 --- a/book/games/pong/Cargo.toml +++ b/book/games/pong/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = { version = "0.13.0", path = "../../../agb" } +agb = { version = "0.14.0", path = "../../../agb" } [profile.dev] opt-level = 2 diff --git a/examples/combo/Cargo.lock b/examples/combo/Cargo.lock index 2ee9eb39..0d0332fc 100644 --- a/examples/combo/Cargo.lock +++ b/examples/combo/Cargo.lock @@ -16,7 +16,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "agb" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_fixnum", "agb_image_converter", @@ -30,14 +30,14 @@ dependencies = [ [[package]] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_macros", ] [[package]] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "asefile", "fontdue", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "hound", "proc-macro2", diff --git a/examples/combo/Cargo.toml b/examples/combo/Cargo.toml index 519934c3..d27c394e 100644 --- a/examples/combo/Cargo.toml +++ b/examples/combo/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = { version = "0.13.0", path = "../../agb" } +agb = { version = "0.14.0", path = "../../agb" } the-purple-night = { path = "../the-purple-night" } the-hat-chooses-the-wizard = { path = "../the-hat-chooses-the-wizard" } hyperspace-roll = { path = "../hyperspace-roll" } diff --git a/examples/hyperspace-roll/Cargo.lock b/examples/hyperspace-roll/Cargo.lock index da95b861..b0461ff4 100644 --- a/examples/hyperspace-roll/Cargo.lock +++ b/examples/hyperspace-roll/Cargo.lock @@ -16,7 +16,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "agb" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_fixnum", "agb_image_converter", @@ -30,14 +30,14 @@ dependencies = [ [[package]] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_macros", ] [[package]] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "asefile", "fontdue", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "hound", "proc-macro2", diff --git a/examples/hyperspace-roll/Cargo.toml b/examples/hyperspace-roll/Cargo.toml index 0422fa8b..1e8cdd9d 100644 --- a/examples/hyperspace-roll/Cargo.toml +++ b/examples/hyperspace-roll/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = { version = "0.13.0", path = "../../agb" } +agb = { version = "0.14.0", path = "../../agb" } [profile.dev] opt-level = 2 diff --git a/examples/the-hat-chooses-the-wizard/Cargo.lock b/examples/the-hat-chooses-the-wizard/Cargo.lock index 44a85826..3bdb1ec3 100644 --- a/examples/the-hat-chooses-the-wizard/Cargo.lock +++ b/examples/the-hat-chooses-the-wizard/Cargo.lock @@ -16,7 +16,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "agb" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_fixnum", "agb_image_converter", @@ -30,14 +30,14 @@ dependencies = [ [[package]] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_macros", ] [[package]] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "asefile", "fontdue", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "hound", "proc-macro2", diff --git a/examples/the-hat-chooses-the-wizard/Cargo.toml b/examples/the-hat-chooses-the-wizard/Cargo.toml index 3fd5fc07..9af5d5fb 100644 --- a/examples/the-hat-chooses-the-wizard/Cargo.toml +++ b/examples/the-hat-chooses-the-wizard/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = { version = "0.13.0", path = "../../agb" } +agb = { version = "0.14.0", path = "../../agb" } [build-dependencies] serde = { version = "1.0", features = ["derive"] } diff --git a/examples/the-purple-night/Cargo.lock b/examples/the-purple-night/Cargo.lock index 47cd52a5..ac89ff17 100644 --- a/examples/the-purple-night/Cargo.lock +++ b/examples/the-purple-night/Cargo.lock @@ -16,7 +16,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "agb" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_fixnum", "agb_image_converter", @@ -30,14 +30,14 @@ dependencies = [ [[package]] name = "agb_fixnum" -version = "0.13.0" +version = "0.14.0" dependencies = [ "agb_macros", ] [[package]] name = "agb_image_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "asefile", "fontdue", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "agb_macros" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -60,7 +60,7 @@ dependencies = [ [[package]] name = "agb_sound_converter" -version = "0.13.0" +version = "0.14.0" dependencies = [ "hound", "proc-macro2", diff --git a/examples/the-purple-night/Cargo.toml b/examples/the-purple-night/Cargo.toml index 82284aba..7c6daae6 100644 --- a/examples/the-purple-night/Cargo.toml +++ b/examples/the-purple-night/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = { path = "../../agb", version = "0.13.0" } +agb = { path = "../../agb", version = "0.14.0" } generational-arena = { version = "0.2", default-features = false } [build-dependencies] diff --git a/template/Cargo.toml b/template/Cargo.toml index 266cf916..29bc4d85 100644 --- a/template/Cargo.toml +++ b/template/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -agb = "0.13.0" +agb = "0.14.0" [profile.dev] opt-level = 2 From 70979fc7da247b46553d01d911268447f986e396 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 11 Apr 2023 21:54:48 +0100 Subject: [PATCH 33/60] Publish gbafix --- tools/src/publish.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/src/publish.rs b/tools/src/publish.rs index da637e1e..1a352332 100644 --- a/tools/src/publish.rs +++ b/tools/src/publish.rs @@ -39,7 +39,9 @@ pub fn publish(matches: &ArgMatches) -> Result<(), Error> { let mut published_crates: HashSet<String> = HashSet::new(); let dependencies = build_dependency_graph(&root_directory)?; - let crates_to_publish: Vec<_> = dependencies.keys().collect(); + let mut crates_to_publish: Vec<_> = dependencies.keys().collect(); + let agb_gbafix = "agb-gbafix".to_owned(); + crates_to_publish.push(&agb_gbafix); while published_crates.len() != crates_to_publish.len() { // find all crates which can be published now but haven't @@ -47,10 +49,13 @@ pub fn publish(matches: &ArgMatches) -> Result<(), Error> { .iter() .filter(|&&crate_to_publish| !published_crates.contains(crate_to_publish)) .filter(|&&crate_to_publish| { - let dependencies_of_crate = &dependencies[crate_to_publish]; - for dependency_of_crate in dependencies_of_crate { - if !fully_published_crates.contains(dependency_of_crate) { - return false; + let dependencies_of_crate = &dependencies.get(crate_to_publish); + + if let Some(dependencies_of_crate) = dependencies_of_crate { + for dependency_of_crate in *dependencies_of_crate { + if !fully_published_crates.contains(dependency_of_crate) { + return false; + } } } From 63995995ac740f02c12206144d3532c96a65b4a6 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 11 Apr 2023 22:29:23 +0100 Subject: [PATCH 34/60] Make publishing a bit smarter --- tools/Cargo.lock | 26 +++++++ tools/Cargo.toml | 1 + tools/src/publish.rs | 172 +++++++++++++++++++------------------------ 3 files changed, 101 insertions(+), 98 deletions(-) diff --git a/tools/Cargo.lock b/tools/Cargo.lock index a2508c2c..6c804fdc 100644 --- a/tools/Cargo.lock +++ b/tools/Cargo.lock @@ -138,6 +138,15 @@ dependencies = [ "syn 2.0.8", ] +[[package]] +name = "dependency-graph" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5143247629540606d0888beae9ca0e0b9a81a32151bfecd0b2be4a961155c24d" +dependencies = [ + "petgraph", +] + [[package]] name = "errno" version = "0.2.8" @@ -159,6 +168,12 @@ dependencies = [ "libc", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "glob" version = "0.3.1" @@ -310,6 +325,16 @@ version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + [[package]] name = "proc-macro2" version = "1.0.53" @@ -419,6 +444,7 @@ version = "0.1.0" dependencies = [ "chrono", "clap", + "dependency-graph", "glob", "toml_edit", ] diff --git a/tools/Cargo.toml b/tools/Cargo.toml index 8c1095ac..30f662e6 100644 --- a/tools/Cargo.toml +++ b/tools/Cargo.toml @@ -10,3 +10,4 @@ clap = "4" toml_edit = "0.19" glob = "0.3" chrono = "0.4" +dependency-graph = "0.1.5" diff --git a/tools/src/publish.rs b/tools/src/publish.rs index 1a352332..8bbe20c7 100644 --- a/tools/src/publish.rs +++ b/tools/src/publish.rs @@ -1,10 +1,11 @@ use clap::{Arg, ArgAction, ArgMatches}; -use std::collections::{HashMap, HashSet}; +use dependency_graph::DependencyGraph; +use std::borrow::BorrowMut; +use std::cell::RefCell; +use std::collections::HashMap; use std::fs; use std::path::Path; use std::process::Command; -use std::thread; -use std::time::Duration; use toml_edit::Document; use crate::utils::*; @@ -19,6 +20,23 @@ pub enum Error { CargoToml, } +struct Package { + name: String, + dependencies: Vec<String>, +} + +impl dependency_graph::Node for Package { + type DependencyType = String; + + fn dependencies(&self) -> &[Self::DependencyType] { + &self.dependencies + } + + fn matches(&self, dependency: &Self::DependencyType) -> bool { + &self.name == dependency + } +} + pub fn command() -> clap::Command { clap::Command::new("publish") .about("Publishes agb and all subcrates") @@ -32,96 +50,51 @@ pub fn command() -> clap::Command { pub fn publish(matches: &ArgMatches) -> Result<(), Error> { let dry_run = matches.get_one::<bool>("Dry run").expect("defined by clap"); + let dry_run = if *dry_run { vec!["--dry-run"] } else { vec![] }; let root_directory = find_agb_root_directory().map_err(|_| Error::FindRootDirectory)?; - let mut fully_published_crates: HashSet<String> = HashSet::new(); - let mut published_crates: HashSet<String> = HashSet::new(); + let mut in_progress: HashMap<_, RefCell<std::process::Child>> = HashMap::new(); let dependencies = build_dependency_graph(&root_directory)?; - let mut crates_to_publish: Vec<_> = dependencies.keys().collect(); - let agb_gbafix = "agb-gbafix".to_owned(); - crates_to_publish.push(&agb_gbafix); + let graph = DependencyGraph::from(&dependencies[..]); - while published_crates.len() != crates_to_publish.len() { - // find all crates which can be published now but haven't - let publishable_crates: Vec<_> = crates_to_publish - .iter() - .filter(|&&crate_to_publish| !published_crates.contains(crate_to_publish)) - .filter(|&&crate_to_publish| { - let dependencies_of_crate = &dependencies.get(crate_to_publish); + for package in graph { + let package = package.as_resolved().unwrap(); - if let Some(dependencies_of_crate) = dependencies_of_crate { - for dependency_of_crate in *dependencies_of_crate { - if !fully_published_crates.contains(dependency_of_crate) { - return false; - } - } - } - - true - }) - .collect(); - - for publishable_crate in publishable_crates { - if *dry_run { - println!("Would execute cargo publish for {publishable_crate}"); - } else { - assert!(Command::new("cargo") - .arg("publish") - .current_dir(&root_directory.join(publishable_crate)) - .status() - .map_err(|_| Error::PublishCrate)? - .success()); - } - - published_crates.insert(publishable_crate.to_string()); + for dep in &package.dependencies { + assert!(in_progress + .get(dep) + .unwrap() + .borrow_mut() + .wait() + .map_err(|_| Error::PublishCrate)? + .success()); } - for published_crate in published_crates.iter() { - if !fully_published_crates.contains(published_crate) { - let expected_version = - read_cargo_toml_version(&root_directory.join(published_crate))?; - if check_if_released(published_crate, &expected_version)? { - fully_published_crates.insert(published_crate.clone()); - } - } - } + println!("Publishing {}", package.name); - thread::sleep(Duration::from_secs(10)); + let publish_cmd = Command::new("cargo") + .arg("publish") + .args(&dry_run) + .current_dir(root_directory.join(&package.name)) + .spawn() + .map_err(|_| Error::PublishCrate)?; + + in_progress.insert(package.name.clone(), RefCell::new(publish_cmd)); + } + + for (_, in_progress) in in_progress { + assert!(in_progress + .borrow_mut() + .wait() + .map_err(|_| Error::PublishCrate)? + .success()); } Ok(()) } -fn check_if_released(crate_to_publish: &str, expected_version: &str) -> Result<bool, Error> { - let url_to_poll = &get_url_to_poll(crate_to_publish); - - println!("Polling crates.io with URL {url_to_poll} for {crate_to_publish} hoping for version {expected_version}."); - - let curl_result = Command::new("curl") - .arg(url_to_poll) - .output() - .map_err(|_| Error::Poll)?; - - Ok(String::from_utf8_lossy(&curl_result.stdout).contains(expected_version)) -} - -fn get_url_to_poll(crate_name: &str) -> String { - let crate_name_with_underscores = crate_name.replace('-', "_"); - - let crate_folder = if crate_name_with_underscores.len() == 3 { - format!("3/{}", crate_name_with_underscores.chars().next().unwrap()) - } else { - let first_two_characters = &crate_name_with_underscores[0..2]; - let second_two_characters = &crate_name_with_underscores[2..4]; - - format!("{first_two_characters}/{second_two_characters}") - }; - - format!("https://raw.githubusercontent.com/rust-lang/crates.io-index/master/{crate_folder}/{crate_name_with_underscores}") -} - fn read_cargo_toml_version(folder: &Path) -> Result<String, Error> { let cargo_toml = read_cargo_toml(folder)?; @@ -134,30 +107,33 @@ fn read_cargo_toml_version(folder: &Path) -> Result<String, Error> { Ok(version_value.to_owned()) } -fn build_dependency_graph(root: &Path) -> Result<HashMap<String, Vec<String>>, Error> { - let mut result = HashMap::new(); - result.insert("agb".to_owned(), get_agb_dependencies(&root.join("agb"))?); +fn build_dependency_graph(root: &Path) -> Result<Vec<Package>, Error> { + let dirs = fs::read_dir(root).map_err(|_| Error::ReadingDependencies)?; + let mut packages = vec![]; - let mut added_new_crates = true; - while added_new_crates { - added_new_crates = false; - - let all_crates: HashSet<String> = HashSet::from_iter(result.values().flatten().cloned()); - - for dep_crate in all_crates { - if result.contains_key(&dep_crate) { - continue; - } - - added_new_crates = true; - result.insert( - dep_crate.to_owned(), - get_agb_dependencies(&root.join(dep_crate))?, - ); + for dir in dirs { + let dir = dir.map_err(|_| Error::ReadingDependencies)?; + if !dir + .file_type() + .map_err(|_| Error::ReadingDependencies)? + .is_dir() + { + continue; } + + if !dir.file_name().to_string_lossy().starts_with("agb") { + continue; + } + + let crate_path = root.join(dir.path()); + + packages.push(Package { + name: dir.file_name().to_string_lossy().to_string(), + dependencies: get_agb_dependencies(&crate_path)?, + }); } - Ok(result) + Ok(packages) } fn get_agb_dependencies(folder: &Path) -> Result<Vec<String>, Error> { From f677ff1840b93f0679b7a967d4a8dbc317b23aa8 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 11 Apr 2023 22:30:47 +0100 Subject: [PATCH 35/60] Fix clippy lints --- tools/src/publish.rs | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/tools/src/publish.rs b/tools/src/publish.rs index 8bbe20c7..be68209f 100644 --- a/tools/src/publish.rs +++ b/tools/src/publish.rs @@ -1,6 +1,5 @@ use clap::{Arg, ArgAction, ArgMatches}; use dependency_graph::DependencyGraph; -use std::borrow::BorrowMut; use std::cell::RefCell; use std::collections::HashMap; use std::fs; @@ -95,18 +94,6 @@ pub fn publish(matches: &ArgMatches) -> Result<(), Error> { Ok(()) } -fn read_cargo_toml_version(folder: &Path) -> Result<String, Error> { - let cargo_toml = read_cargo_toml(folder)?; - - let version_value = cargo_toml["package"]["version"] - .as_value() - .ok_or(Error::CrateVersion)? - .as_str() - .ok_or(Error::CrateVersion)?; - - Ok(version_value.to_owned()) -} - fn build_dependency_graph(root: &Path) -> Result<Vec<Package>, Error> { let dirs = fs::read_dir(root).map_err(|_| Error::ReadingDependencies)?; let mut packages = vec![]; @@ -172,34 +159,6 @@ mod test { command().debug_assert(); } - #[test] - fn url_to_poll_should_return_correct_url() { - let test_cases = [ - ["agb", "3/a/agb"], - ["agb-image-converter", "ag/b_/agb_image_converter"], - ["agb-fixnum", "ag/b_/agb_fixnum"], - ]; - - for [name, result] in test_cases { - let url = get_url_to_poll(name); - assert_eq!( - url, - format!( - "https://raw.githubusercontent.com/rust-lang/crates.io-index/master/{result}", - ) - ) - } - } - - #[test] - fn should_read_version() -> Result<(), Error> { - let root_directory = crate::utils::find_agb_root_directory().unwrap(); - let my_version = read_cargo_toml_version(&root_directory.join("tools"))?; - - assert_eq!(my_version, "0.1.0"); - Ok(()) - } - #[test] fn should_detect_dependencies() -> Result<(), Error> { let root_directory = crate::utils::find_agb_root_directory().unwrap(); From 5f59a01c21f7e55999e6b43fed8f391c536a8e23 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Wed, 12 Apr 2023 13:49:22 +0100 Subject: [PATCH 36/60] Use .take() rather than replace(..., None) --- agb/src/single.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agb/src/single.rs b/agb/src/single.rs index 2d6e11d4..0215ab63 100644 --- a/agb/src/single.rs +++ b/agb/src/single.rs @@ -11,7 +11,6 @@ impl<T> Singleton<T> { Singleton { single: None } } pub fn take(&mut self) -> T { - let g = core::mem::replace(&mut self.single, None); - g.unwrap() + self.single.take().unwrap() } } From 0e006bd3d5795783be3e4335c35b04cd0a235ae5 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Wed, 12 Apr 2023 15:12:00 +0100 Subject: [PATCH 37/60] Update publish justfile command to accept arguments --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 032849cb..4a0b9e7d 100644 --- a/justfile +++ b/justfile @@ -81,7 +81,7 @@ update-linker-scripts: find -type f -name gba.ld | grep -v ./agb/gba.ld | xargs -n1 cp -v -- agb/gba.ld find -type f -name gba_mb.ld | grep -v ./agb/gba_mb.ld | xargs -n1 cp -v -- agb/gba_mb.ld -publish: (_run-tool "publish") +publish *args: (_run-tool "publish" args) release +args: (_run-tool "release" args) From cb127c7924cffe462b0dcf009514cbb6efd01c94 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 21:53:13 +0100 Subject: [PATCH 38/60] New include_gfx macro --- agb-image-converter/src/lib.rs | 147 ++++++++++++++++++++++++++++++-- agb/src/display/example_logo.rs | 2 +- agb/src/lib.rs | 3 + 3 files changed, 144 insertions(+), 8 deletions(-) diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs index 257a53b5..f4f03d87 100644 --- a/agb-image-converter/src/lib.rs +++ b/agb-image-converter/src/lib.rs @@ -2,9 +2,9 @@ use palette16::{Palette16OptimisationResults, Palette16Optimiser}; use palette256::Palette256; use proc_macro::TokenStream; use proc_macro2::Literal; -use syn::parse::Parser; +use syn::parse::{Parse, Parser}; use syn::{parse_macro_input, punctuated::Punctuated, LitStr}; -use syn::{Expr, ExprLit, Lit}; +use syn::{Expr, ExprLit, Lit, Token}; use std::collections::HashMap; use std::path::PathBuf; @@ -33,6 +33,7 @@ pub(crate) enum TileSize { Tile32, } +#[derive(Debug, Clone, Copy)] pub(crate) enum Colours { Colours16, Colours256, @@ -48,6 +49,132 @@ impl TileSize { } } +struct BackgroundGfxOption { + module_name: String, + file_name: String, + colours: Colours, +} + +impl config::Image for BackgroundGfxOption { + fn filename(&self) -> String { + self.file_name.clone() + } + + fn tile_size(&self) -> TileSize { + TileSize::Tile8 + } + + fn colours(&self) -> Colours { + self.colours + } +} + +impl Parse for BackgroundGfxOption { + fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> { + let lookahead = input.lookahead1(); + + let module_name: syn::Ident = input.parse()?; + let _: Token![=>] = input.parse()?; + + let colours = if lookahead.peek(syn::LitInt) { + let num_colours: syn::LitInt = input.parse()?; + + match num_colours.base10_parse()? { + 16 => Colours::Colours16, + 256 => Colours::Colours256, + _ => { + return Err(syn::Error::new_spanned( + num_colours, + "Number of colours must be 16 or 256", + )) + } + } + } else { + Colours::Colours16 + }; + + let file_name: syn::LitStr = input.parse()?; + + Ok(Self { + module_name: module_name.to_string(), + file_name: file_name.value(), + colours, + }) + } +} + +struct IncludeBackgroundGfxInput { + module_name: syn::Ident, + crate_prefix: String, + transparent_colour: Colour, + background_gfx_options: Vec<BackgroundGfxOption>, +} + +impl Parse for IncludeBackgroundGfxInput { + fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> { + let lookahead = input.lookahead1(); + + let crate_prefix: syn::Ident = if lookahead.peek(Token![crate]) { + let _: Token![crate] = input.parse()?; + let _: Token![,] = input.parse()?; + format_ident!("crate") + } else { + format_ident!("agb") + }; + + let module_name: syn::Ident = input.parse()?; + let _: Token![,] = input.parse()?; + + let transparent_colour: Colour = if lookahead.peek(syn::LitStr) { + let colour_str: syn::LitStr = input.parse()?; + let _: Token![,] = input.parse()?; + colour_str + .value() + .parse() + .map_err(|msg| syn::Error::new_spanned(colour_str, msg))? + } else { + Colour::from_rgb(255, 0, 255, 0) + }; + + let background_gfx_options = + input.parse_terminated(BackgroundGfxOption::parse, Token![,])?; + + Ok(Self { + module_name, + crate_prefix: crate_prefix.to_string(), + transparent_colour, + background_gfx_options: background_gfx_options.into_iter().collect(), + }) + } +} + +impl config::Config for IncludeBackgroundGfxInput { + fn crate_prefix(&self) -> String { + self.crate_prefix.clone() + } + + fn images(&self) -> HashMap<String, &dyn config::Image> { + self.background_gfx_options + .iter() + .map(|options| (options.module_name.clone(), options as &dyn config::Image)) + .collect() + } + + fn transparent_colour(&self) -> Option<Colour> { + Some(self.transparent_colour) + } +} + +#[proc_macro] +pub fn include_background_gfx(input: TokenStream) -> TokenStream { + let config = Box::new(parse_macro_input!(input as IncludeBackgroundGfxInput)); + + let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir"); + + let module_name = config.module_name.clone(); + include_gfx_from_config(config, module_name, Path::new(&root)) +} + #[proc_macro] pub fn include_gfx(input: TokenStream) -> TokenStream { let input = parse_macro_input!(input as syn::LitStr); @@ -56,20 +183,28 @@ pub fn include_gfx(input: TokenStream) -> TokenStream { let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir"); let path = Path::new(&root).join(&*filename); + + let config = config::parse(&path.to_string_lossy()); + let parent = path .parent() .expect("Expected a parent directory for the path"); - let config = config::parse(&path.to_string_lossy()); - let module_name = format_ident!( "{}", path.file_stem() .expect("Expected a file stem") .to_string_lossy() ); - let include_path = path.to_string_lossy(); + include_gfx_from_config(config, module_name, parent) +} + +fn include_gfx_from_config( + config: Box<dyn config::Config>, + module_name: syn::Ident, + parent: &Path, +) -> TokenStream { let images = config.images(); let mut optimiser = Palette16Optimiser::new(config.transparent_colour()); @@ -132,8 +267,6 @@ pub fn include_gfx(input: TokenStream) -> TokenStream { let module = quote! { mod #module_name { - const _: &[u8] = include_bytes!(#include_path); - #palette_code #(#image_code)* diff --git a/agb/src/display/example_logo.rs b/agb/src/display/example_logo.rs index 1a723b8b..351d80ab 100644 --- a/agb/src/display/example_logo.rs +++ b/agb/src/display/example_logo.rs @@ -1,6 +1,6 @@ use super::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager}; -crate::include_gfx!("gfx/agb_logo.toml"); +crate::include_background_gfx!(crate, agb_logo, test_logo => "gfx/test_logo.png"); pub fn display_logo(map: &mut RegularMap, vram: &mut VRamManager) { vram.set_background_palettes(agb_logo::PALETTES); diff --git a/agb/src/lib.rs b/agb/src/lib.rs index 90bd7166..7e3b680c 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -13,6 +13,7 @@ #![feature(alloc_error_handler)] #![feature(allocator_api)] #![feature(asm_const)] +#![feature(trace_macros)] #![warn(clippy::all)] #![deny(clippy::must_use_candidate)] #![deny(clippy::trivially_copy_pass_by_ref)] @@ -120,6 +121,8 @@ pub use agb_image_converter::include_aseprite_inner; #[doc(hidden)] pub use agb_image_converter::include_font as include_font_inner; +pub use agb_image_converter::include_background_gfx; + #[macro_export] macro_rules! include_font { ($font_path: literal, $font_size: literal) => {{ From 65877b1d3213d01f834ed76c9ba442e31c16c216 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 21:53:28 +0100 Subject: [PATCH 39/60] Delete this file now --- agb/gfx/agb_logo.toml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 agb/gfx/agb_logo.toml diff --git a/agb/gfx/agb_logo.toml b/agb/gfx/agb_logo.toml deleted file mode 100644 index 60787767..00000000 --- a/agb/gfx/agb_logo.toml +++ /dev/null @@ -1,8 +0,0 @@ -version = "1.0" - -# Only needed for within the agb crate -crate_prefix = "crate" - -[image.test_logo] -filename = "test_logo.png" -tile_size = "8x8" From eac350b3915cb18f29c24f9cd254ec2285bf4640 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:01:37 +0100 Subject: [PATCH 40/60] Replace example usage with the new macro --- agb-image-converter/src/lib.rs | 5 +++-- agb/examples/affine_background.rs | 4 ++-- agb/examples/affine_tiles.toml | 6 ------ agb/examples/animated_background.rs | 4 ++-- 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 agb/examples/affine_tiles.toml diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs index f4f03d87..dfb10a5c 100644 --- a/agb-image-converter/src/lib.rs +++ b/agb-image-converter/src/lib.rs @@ -71,11 +71,11 @@ impl config::Image for BackgroundGfxOption { impl Parse for BackgroundGfxOption { fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> { - let lookahead = input.lookahead1(); - let module_name: syn::Ident = input.parse()?; let _: Token![=>] = input.parse()?; + let lookahead = input.lookahead1(); + let colours = if lookahead.peek(syn::LitInt) { let num_colours: syn::LitInt = input.parse()?; @@ -125,6 +125,7 @@ impl Parse for IncludeBackgroundGfxInput { let module_name: syn::Ident = input.parse()?; let _: Token![,] = input.parse()?; + let lookahead = input.lookahead1(); let transparent_colour: Colour = if lookahead.peek(syn::LitStr) { let colour_str: syn::LitStr = input.parse()?; let _: Token![,] = input.parse()?; diff --git a/agb/examples/affine_background.rs b/agb/examples/affine_background.rs index 69b63032..a0bdd1ab 100644 --- a/agb/examples/affine_background.rs +++ b/agb/examples/affine_background.rs @@ -8,10 +8,10 @@ use agb::{ Priority, }, fixnum::{num, Num}, - include_gfx, + include_background_gfx, }; -include_gfx!("examples/affine_tiles.toml"); +include_background_gfx!(affine_tiles, water_tiles => 256 "examples/water_tiles.png"); #[agb::entry] fn main(mut gba: agb::Gba) -> ! { diff --git a/agb/examples/affine_tiles.toml b/agb/examples/affine_tiles.toml deleted file mode 100644 index 65d608a2..00000000 --- a/agb/examples/affine_tiles.toml +++ /dev/null @@ -1,6 +0,0 @@ -version = "1.0" - -[image.water_tiles] -filename = "water_tiles.png" -tile_size = "8x8" -colours = 256 \ No newline at end of file diff --git a/agb/examples/animated_background.rs b/agb/examples/animated_background.rs index 8ae95c8d..31ef37b1 100644 --- a/agb/examples/animated_background.rs +++ b/agb/examples/animated_background.rs @@ -6,10 +6,10 @@ use agb::{ tiled::{RegularBackgroundSize, TileFormat, TileSet, TileSetting, TiledMap}, Priority, }, - include_gfx, + include_background_gfx, }; -include_gfx!("examples/water_tiles.toml"); +include_background_gfx!(water_tiles, water_tiles => "examples/water_tiles.png"); #[agb::entry] fn main(mut gba: agb::Gba) -> ! { From f53cd9b25ad6897ce6919ccba485d6a10f912f85 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:06:06 +0100 Subject: [PATCH 41/60] Write some terrible documentation --- agb/src/lib.rs | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/agb/src/lib.rs b/agb/src/lib.rs index 7e3b680c..e4c37070 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -36,43 +36,28 @@ /// This macro is used to convert a png or bmp into a format usable by the Game Boy Advance. /// -/// The macro expects to be linked to a `toml` file which contains a metadata about the image -/// and a link to the png or bmp itself. See the examples below for a full definition of the format. +/// Suppose you have a file in `examples/water_tiles.png` which contains some tiles you'd like to use. /// -/// # The manifest file format -/// -/// The following is an example of the toml file you would need to create. Generally you will -/// find this in the `gfx` folder in the same level as the `src` folder (see the examples). -/// -/// Suppose that the following is in `examples/water_tiles.toml`. -/// -/// ```toml -/// version = "1.0" -/// -/// [image.tiles] -/// filename = "water_tiles.png" -/// tile_size = "8x8" -/// ``` -/// -/// You then import this using: +/// You import them using: /// ```rust,no_run /// ##![no_std] /// ##![no_main] -/// agb::include_gfx!("examples/water_tiles.toml"); +/// agb::include_background_gfx!(water_tiles, tiles => "examples/water_tiles.png"); /// ``` /// /// This will generate something along the lines of the following: /// /// ```rust,ignore -/// // module name comes from the name of the toml file, so `water_tiles` in this case because it is -/// // called `water_tiles.toml` +/// // module name comes from the first argument, name of the constant from the arrow /// mod water_tiles { -/// const tiles = /* ... */; +/// pub const tiles = /* ... */; /// } /// ``` /// /// And tiles will be an instance of [`TileData`][crate::display::tile_data::TileData] /// +/// You can import multiple files at once, and the palette data will be combined so they can all be visible. +/// /// # Examples /// /// Assume the tiles are loaded as above @@ -90,10 +75,10 @@ /// include_gfx, /// }; /// -/// agb::include_gfx!("examples/water_tiles.toml"); +/// agb::include_background_gfx!(water_tiles, tiles => "exmaples/water_tiles.png"); /// /// # fn load_tileset(mut gfx: Tiled0, mut vram: VRamManager) { -/// let tileset = TileSet::new(water_tiles::water_tiles.tiles, TileFormat::FourBpp); +/// let tileset = TileSet::new(water_tiles::tiles.tiles, TileFormat::FourBpp); /// /// vram.set_background_palettes(water_tiles::PALETTES); /// @@ -113,7 +98,7 @@ /// bg.show(); /// # } /// ``` -pub use agb_image_converter::include_gfx; +pub use agb_image_converter::include_background_gfx; #[doc(hidden)] pub use agb_image_converter::include_aseprite_inner; @@ -121,8 +106,6 @@ pub use agb_image_converter::include_aseprite_inner; #[doc(hidden)] pub use agb_image_converter::include_font as include_font_inner; -pub use agb_image_converter::include_background_gfx; - #[macro_export] macro_rules! include_font { ($font_path: literal, $font_size: literal) => {{ From 875a0fbb659c88a73e1ebd03196e2372da757500 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:14:44 +0100 Subject: [PATCH 42/60] Remove unneeded stuff from image-converter --- agb-image-converter/Cargo.toml | 2 - agb-image-converter/src/config.rs | 111 ------------------ agb-image-converter/src/lib.rs | 29 ----- examples/hyperspace-roll/gfx/backgrounds.toml | 22 ---- examples/hyperspace-roll/src/background.rs | 10 +- .../gfx/splash_screens.toml | 11 -- .../gfx/tile_sheet.toml | 7 -- .../the-hat-chooses-the-wizard/src/lib.rs | 2 +- .../src/splash_screen.rs | 5 +- examples/the-purple-night/gfx/background.toml | 7 -- examples/the-purple-night/src/lib.rs | 2 +- 11 files changed, 14 insertions(+), 194 deletions(-) delete mode 100644 examples/hyperspace-roll/gfx/backgrounds.toml delete mode 100644 examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml delete mode 100644 examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml delete mode 100644 examples/the-purple-night/gfx/background.toml diff --git a/agb-image-converter/Cargo.toml b/agb-image-converter/Cargo.toml index d787fcc2..162bd704 100644 --- a/agb-image-converter/Cargo.toml +++ b/agb-image-converter/Cargo.toml @@ -12,8 +12,6 @@ proc-macro = true [dependencies] image = { version = "0.23", default-features = false, features = [ "png", "bmp" ] } -toml = "0.7" -serde = { version = "1", features = ["derive"] } syn = { version = "2", features = ["full"] } proc-macro2 = "1" quote = "1" diff --git a/agb-image-converter/src/config.rs b/agb-image-converter/src/config.rs index bdc498e0..daa112b9 100644 --- a/agb-image-converter/src/config.rs +++ b/agb-image-converter/src/config.rs @@ -1,25 +1,7 @@ -use serde::Deserialize; use std::collections::HashMap; -use std::fs; use crate::{Colour, Colours, TileSize}; -pub(crate) fn parse(filename: &str) -> Box<dyn Config> { - let config_toml = - fs::read_to_string(filename).unwrap_or_else(|_| panic!("Failed to read file {filename}")); - - let config: ConfigV1 = toml::from_str(&config_toml).expect("Failed to parse file"); - - if config.version != "1.0" { - panic!( - "Expected version of {} to be 1.0, got {}", - filename, config.version - ); - } - - Box::new(config) -} - pub(crate) trait Config { fn crate_prefix(&self) -> String; fn images(&self) -> HashMap<String, &dyn Image>; @@ -31,96 +13,3 @@ pub(crate) trait Image { fn tile_size(&self) -> TileSize; fn colours(&self) -> Colours; } - -#[derive(Deserialize)] -pub struct ConfigV1 { - version: String, - crate_prefix: Option<String>, - transparent_colour: Option<String>, - - image: HashMap<String, ImageV1>, -} - -impl Config for ConfigV1 { - fn crate_prefix(&self) -> String { - self.crate_prefix - .clone() - .unwrap_or_else(|| "agb".to_owned()) - } - - fn images(&self) -> HashMap<String, &dyn Image> { - self.image - .iter() - .map(|(filename, image)| (filename.clone(), image as &dyn Image)) - .collect() - } - - fn transparent_colour(&self) -> Option<Colour> { - if let Some(colour) = &self - .transparent_colour - .as_ref() - .map(|colour| colour.parse().unwrap()) - { - return Some(*colour); - } - - self.image - .values() - .flat_map(|image| image.transparent_colour()) - .next() - } -} - -#[derive(Deserialize)] -pub struct ImageV1 { - filename: String, - transparent_colour: Option<String>, - tile_size: TileSizeV1, - colours: Option<u32>, -} - -impl Image for ImageV1 { - fn filename(&self) -> String { - self.filename.clone() - } - - fn tile_size(&self) -> TileSize { - self.tile_size.into() - } - - fn colours(&self) -> Colours { - match self.colours { - None | Some(16) => Colours::Colours16, - Some(256) => Colours::Colours256, - _ => panic!("colours must either not be set or 16 or 256"), - } - } -} - -impl ImageV1 { - fn transparent_colour(&self) -> Option<Colour> { - self.transparent_colour - .as_ref() - .map(|colour| colour.parse().unwrap()) - } -} - -#[derive(Deserialize, Clone, Copy)] -pub enum TileSizeV1 { - #[serde(rename = "8x8")] - Tile8, - #[serde(rename = "16x16")] - Tile16, - #[serde(rename = "32x32")] - Tile32, -} - -impl From<TileSizeV1> for TileSize { - fn from(item: TileSizeV1) -> Self { - match item { - TileSizeV1::Tile8 => TileSize::Tile8, - TileSizeV1::Tile16 => TileSize::Tile16, - TileSizeV1::Tile32 => TileSize::Tile32, - } - } -} diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs index dfb10a5c..d1a786f0 100644 --- a/agb-image-converter/src/lib.rs +++ b/agb-image-converter/src/lib.rs @@ -29,8 +29,6 @@ use colour::Colour; #[derive(Debug, Clone, Copy)] pub(crate) enum TileSize { Tile8, - Tile16, - Tile32, } #[derive(Debug, Clone, Copy)] @@ -43,8 +41,6 @@ impl TileSize { fn to_size(self) -> usize { match self { TileSize::Tile8 => 8, - TileSize::Tile16 => 16, - TileSize::Tile32 => 32, } } } @@ -176,31 +172,6 @@ pub fn include_background_gfx(input: TokenStream) -> TokenStream { include_gfx_from_config(config, module_name, Path::new(&root)) } -#[proc_macro] -pub fn include_gfx(input: TokenStream) -> TokenStream { - let input = parse_macro_input!(input as syn::LitStr); - - let filename = input.value(); - - let root = std::env::var("CARGO_MANIFEST_DIR").expect("Failed to get cargo manifest dir"); - let path = Path::new(&root).join(&*filename); - - let config = config::parse(&path.to_string_lossy()); - - let parent = path - .parent() - .expect("Expected a parent directory for the path"); - - let module_name = format_ident!( - "{}", - path.file_stem() - .expect("Expected a file stem") - .to_string_lossy() - ); - - include_gfx_from_config(config, module_name, parent) -} - fn include_gfx_from_config( config: Box<dyn config::Config>, module_name: syn::Ident, diff --git a/examples/hyperspace-roll/gfx/backgrounds.toml b/examples/hyperspace-roll/gfx/backgrounds.toml deleted file mode 100644 index 6fe2df1e..00000000 --- a/examples/hyperspace-roll/gfx/backgrounds.toml +++ /dev/null @@ -1,22 +0,0 @@ -version = "1.0" -transparent_colour = "121105" - -[image.stars] -filename = "stars.png" -tile_size = "8x8" - -[image.title] -filename = "title-screen.png" -tile_size = "8x8" - -[image.help] -filename = "help-text.png" -tile_size = "8x8" - -[image.descriptions1] -filename = "descriptions1.png" -tile_size = "8x8" - -[image.descriptions2] -filename = "descriptions2.png" -tile_size = "8x8" diff --git a/examples/hyperspace-roll/src/background.rs b/examples/hyperspace-roll/src/background.rs index 001a8b0d..85609f85 100644 --- a/examples/hyperspace-roll/src/background.rs +++ b/examples/hyperspace-roll/src/background.rs @@ -1,11 +1,17 @@ use agb::{ display::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager}, - include_gfx, rng, + include_background_gfx, rng, }; use crate::sfx::Sfx; -include_gfx!("gfx/backgrounds.toml"); +include_background_gfx!(backgrounds, "121105", + stars => "gfx/stars.png", + title => "gfx/title-screen.png", + help => "gfx/help-text.png", + descriptions1 => "gfx/descriptions1.png", + descriptions2 => "gfx/descriptions2.png", +); pub fn load_palettes(vram: &mut VRamManager) { vram.set_background_palettes(backgrounds::PALETTES); diff --git a/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml b/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml deleted file mode 100644 index fea8a855..00000000 --- a/examples/the-hat-chooses-the-wizard/gfx/splash_screens.toml +++ /dev/null @@ -1,11 +0,0 @@ -version = "1.0" - -transparent_colour = "2ce8f4" - -[image.thanks_for_playing] -filename = "thanks_for_playing.png" -tile_size = "8x8" - -[image.splash] -filename = "splash.png" -tile_size = "8x8" diff --git a/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml b/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml deleted file mode 100644 index 4ef16fc0..00000000 --- a/examples/the-hat-chooses-the-wizard/gfx/tile_sheet.toml +++ /dev/null @@ -1,7 +0,0 @@ -version = "1.0" - -transparent_colour = "2ce8f4" - -[image.background] -filename = "tile_sheet.png" -tile_size = "8x8" diff --git a/examples/the-hat-chooses-the-wizard/src/lib.rs b/examples/the-hat-chooses-the-wizard/src/lib.rs index cfd98e30..2161cae6 100644 --- a/examples/the-hat-chooses-the-wizard/src/lib.rs +++ b/examples/the-hat-chooses-the-wizard/src/lib.rs @@ -101,7 +101,7 @@ mod map_tiles { } } -agb::include_gfx!("gfx/tile_sheet.toml"); +agb::include_background_gfx!(tile_sheet, "2ce8f4", background => "gfx/tile_sheet.png"); const GRAPHICS: &Graphics = agb::include_aseprite!("gfx/sprites.aseprite"); const TAG_MAP: &TagMap = GRAPHICS.tags(); diff --git a/examples/the-hat-chooses-the-wizard/src/splash_screen.rs b/examples/the-hat-chooses-the-wizard/src/splash_screen.rs index 80883647..fb90190f 100644 --- a/examples/the-hat-chooses-the-wizard/src/splash_screen.rs +++ b/examples/the-hat-chooses-the-wizard/src/splash_screen.rs @@ -1,7 +1,10 @@ use super::sfx::SfxPlayer; use agb::display::tiled::{RegularMap, TileFormat, TileSet, TileSetting, TiledMap, VRamManager}; -agb::include_gfx!("gfx/splash_screens.toml"); +agb::include_background_gfx!(splash_screens, + splash => "gfx/splash.png", + thanks_for_playing => "gfx/thanks_for_playing.png", +); pub enum SplashScreen { Start, diff --git a/examples/the-purple-night/gfx/background.toml b/examples/the-purple-night/gfx/background.toml deleted file mode 100644 index c9a8ac22..00000000 --- a/examples/the-purple-night/gfx/background.toml +++ /dev/null @@ -1,7 +0,0 @@ -version = "1.0" - -transparent_colour = "53269a" - -[image.background] -filename = "background.png" -tile_size = "8x8" diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 4325f879..9be41653 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -57,7 +57,7 @@ const SWORDLESS_JUMP: &Tag = TAG_MAP.get("jump swordless"); const SWORDLESS_ATTACK: &Tag = KNIFE_ATTACK; const SWORDLESS_JUMP_ATTACK: &Tag = KNIFE_JUMP_ATTACK; -agb::include_gfx!("gfx/background.toml"); +agb::include_background_gfx!(background, "53269a", background => "gfx/background.png"); type Number = FixedNum<8>; From 11891e574f4ae100effa552fc13efb53fb4c72c0 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:15:53 +0100 Subject: [PATCH 43/60] Remove some features from syn --- agb-image-converter/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb-image-converter/Cargo.toml b/agb-image-converter/Cargo.toml index 162bd704..4978edde 100644 --- a/agb-image-converter/Cargo.toml +++ b/agb-image-converter/Cargo.toml @@ -12,7 +12,7 @@ proc-macro = true [dependencies] image = { version = "0.23", default-features = false, features = [ "png", "bmp" ] } -syn = { version = "2", features = ["full"] } +syn = { version = "2", features = ["proc-macro", "parsing"] } proc-macro2 = "1" quote = "1" asefile = "0.3.5" From 498236d064b3227a407321b2b53f5f9d3ba10d4a Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:18:13 +0100 Subject: [PATCH 44/60] Remove tile size --- agb-image-converter/src/config.rs | 3 +-- agb-image-converter/src/lib.rs | 31 ++++------------------- agb-image-converter/src/rust_generator.rs | 9 +++---- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/agb-image-converter/src/config.rs b/agb-image-converter/src/config.rs index daa112b9..814fced2 100644 --- a/agb-image-converter/src/config.rs +++ b/agb-image-converter/src/config.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use crate::{Colour, Colours, TileSize}; +use crate::{Colour, Colours}; pub(crate) trait Config { fn crate_prefix(&self) -> String; @@ -10,6 +10,5 @@ pub(crate) trait Config { pub(crate) trait Image { fn filename(&self) -> String; - fn tile_size(&self) -> TileSize; fn colours(&self) -> Colours; } diff --git a/agb-image-converter/src/lib.rs b/agb-image-converter/src/lib.rs index d1a786f0..c8d9c9f3 100644 --- a/agb-image-converter/src/lib.rs +++ b/agb-image-converter/src/lib.rs @@ -26,25 +26,12 @@ use image_loader::Image; use colour::Colour; -#[derive(Debug, Clone, Copy)] -pub(crate) enum TileSize { - Tile8, -} - #[derive(Debug, Clone, Copy)] pub(crate) enum Colours { Colours16, Colours256, } -impl TileSize { - fn to_size(self) -> usize { - match self { - TileSize::Tile8 => 8, - } - } -} - struct BackgroundGfxOption { module_name: String, file_name: String, @@ -56,10 +43,6 @@ impl config::Image for BackgroundGfxOption { self.file_name.clone() } - fn tile_size(&self) -> TileSize { - TileSize::Tile8 - } - fn colours(&self) -> Colours { self.colours } @@ -191,7 +174,7 @@ fn include_gfx_from_config( match settings.colours() { Colours::Colours16 => { - let tile_size = settings.tile_size().to_size(); + let tile_size = 8; if image.width % tile_size != 0 || image.height % tile_size != 0 { panic!("Image size not a multiple of tile size"); } @@ -203,7 +186,7 @@ fn include_gfx_from_config( config.transparent_colour(), ); - let num_tiles = image.width * image.height / settings.tile_size().to_size().pow(2); + let num_tiles = image.width * image.height / 8usize.pow(2); assignment_offsets.insert(name, assignment_offset); assignment_offset += num_tiles; } @@ -395,7 +378,6 @@ fn convert_image( optimisation_results, &image, &image_filename.to_string_lossy(), - settings.tile_size(), crate_prefix.to_owned(), assignment_offset, ) @@ -449,10 +431,9 @@ fn palette_tile_data( .collect(); let mut tile_data = Vec::new(); - let tile_size = TileSize::Tile8; for image in images { - add_image_to_tile_data(&mut tile_data, image, tile_size, optimiser, 0) + add_image_to_tile_data(&mut tile_data, image, optimiser, 0) } let tile_data = collapse_to_4bpp(&tile_data); @@ -472,11 +453,10 @@ fn collapse_to_4bpp(tile_data: &[u8]) -> Vec<u8> { fn add_image_to_tile_data( tile_data: &mut Vec<u8>, image: &Image, - tile_size: TileSize, optimiser: &Palette16OptimisationResults, assignment_offset: usize, ) { - let tile_size = tile_size.to_size(); + let tile_size = 8; let tiles_x = image.width / tile_size; let tiles_y = image.height / tile_size; @@ -502,10 +482,9 @@ fn add_image_to_tile_data( fn add_image_256_to_tile_data( tile_data: &mut Vec<u8>, image: &Image, - tile_size: TileSize, optimiser: &Palette16OptimisationResults, ) { - let tile_size = tile_size.to_size(); + let tile_size = 8; let tiles_x = image.width / tile_size; let tiles_y = image.height / tile_size; diff --git a/agb-image-converter/src/rust_generator.rs b/agb-image-converter/src/rust_generator.rs index 84b5632d..49c55001 100644 --- a/agb-image-converter/src/rust_generator.rs +++ b/agb-image-converter/src/rust_generator.rs @@ -1,5 +1,5 @@ use crate::palette16::Palette16OptimisationResults; -use crate::{add_image_256_to_tile_data, add_image_to_tile_data, collapse_to_4bpp, TileSize}; +use crate::{add_image_256_to_tile_data, add_image_to_tile_data, collapse_to_4bpp}; use crate::{image_loader::Image, ByteString}; use proc_macro2::TokenStream; @@ -38,7 +38,6 @@ pub(crate) fn generate_code( results: &Palette16OptimisationResults, image: &Image, image_filename: &str, - tile_size: TileSize, crate_prefix: String, assignment_offset: Option<usize>, ) -> TokenStream { @@ -48,11 +47,11 @@ pub(crate) fn generate_code( let (tile_data, assignments) = if let Some(assignment_offset) = assignment_offset { let mut tile_data = Vec::new(); - add_image_to_tile_data(&mut tile_data, image, tile_size, results, assignment_offset); + add_image_to_tile_data(&mut tile_data, image, results, assignment_offset); let tile_data = collapse_to_4bpp(&tile_data); - let num_tiles = image.width * image.height / tile_size.to_size().pow(2); + let num_tiles = image.width * image.height / 8usize.pow(2); let assignments = results .assignments @@ -66,7 +65,7 @@ pub(crate) fn generate_code( } else { let mut tile_data = Vec::new(); - add_image_256_to_tile_data(&mut tile_data, image, tile_size, results); + add_image_256_to_tile_data(&mut tile_data, image, results); (tile_data, vec![]) }; From 753f59e0e00c7d215b1ddcb5dc4c054df3f2c564 Mon Sep 17 00:00:00 2001 From: GBA bot <gw@ilym.me> Date: Thu, 13 Apr 2023 22:31:45 +0100 Subject: [PATCH 45/60] Allow importing aseprite backgrounds directly --- agb-image-converter/src/image_loader.rs | 16 +++++++++++++--- examples/hyperspace-roll/gfx/help-text.png | Bin 591 -> 0 bytes examples/hyperspace-roll/gfx/stars.png | Bin 550 -> 0 bytes examples/hyperspace-roll/gfx/title-screen.png | Bin 4313 -> 0 bytes examples/hyperspace-roll/src/background.rs | 6 +++--- examples/the-purple-night/gfx/background.png | Bin 2082 -> 0 bytes examples/the-purple-night/gfx/boss.png | Bin 3041 -> 0 bytes examples/the-purple-night/gfx/objects.png | Bin 9719 -> 0 bytes examples/the-purple-night/src/lib.rs | 2 +- 9 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 examples/hyperspace-roll/gfx/help-text.png delete mode 100644 examples/hyperspace-roll/gfx/stars.png delete mode 100644 examples/hyperspace-roll/gfx/title-screen.png delete mode 100644 examples/the-purple-night/gfx/background.png delete mode 100644 examples/the-purple-night/gfx/boss.png delete mode 100644 examples/the-purple-night/gfx/objects.png diff --git a/agb-image-converter/src/image_loader.rs b/agb-image-converter/src/image_loader.rs index 9126a637..81c8fff8 100644 --- a/agb-image-converter/src/image_loader.rs +++ b/agb-image-converter/src/image_loader.rs @@ -1,6 +1,6 @@ -use std::path; +use std::{ffi::OsStr, path}; -use image::GenericImageView; +use image::{DynamicImage, GenericImageView}; use crate::colour::Colour; @@ -12,7 +12,17 @@ pub(crate) struct Image { impl Image { pub fn load_from_file(image_path: &path::Path) -> Self { - let img = image::open(image_path).expect("Expected image to exist"); + let img = if image_path + .extension() + .is_some_and(|extension| extension == OsStr::new("aseprite")) + { + let ase = + asefile::AsepriteFile::read_file(image_path).expect("failed to read aseprite file"); + DynamicImage::ImageRgba8(ase.frame(0).image()) + } else { + image::open(image_path).expect("Expected image to exist") + }; + Self::load_from_dyn_image(img) } diff --git a/examples/hyperspace-roll/gfx/help-text.png b/examples/hyperspace-roll/gfx/help-text.png deleted file mode 100644 index de6db475873f6bd474bf2594f17945669a4772ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 591 zcmV-V0<iswP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp) z=>Px%2}wjjRCt{2naz=dFbstSLkdV*NEPWPW#zKfq=mhthLpgb%y`6;WP@kCAbpqM zKP)-IMvvikz09BYi-?Hsk0+(;ynKH=mpa~_*P-$GxV*pA#_RH5bWc97HYc)K^1}-g zT6}8(v_DS@8dP5k4+vy83Y^prl_fvCF!HCCh*o8e)!u3hx(C`Rr1ly=&^mZvB+|ET z#Fi(e#nV+{*B(DS2Ek;VtyWn&e=V#z@;bzpBSqRFw)$`ehTHWr_ckKv$JpC|pf3>s z&KZf;XYJ?xTD@JTa=PYa-d7s0&B5C_QXk2tylnX?*=?=K(O()zF0`aF7j1a1k8=NX zo&Taf`8``KAfHpRA&2|LfBCv_A4=vp0&oYgKu?mj5G{q47CJ;p@NMz)Xe>HF4YkT) z>eF+(L^fJBdC&<aUct9HwC(N9nM<^NRF))OezcU}HSgzy4&a<f1Dz8A;GE(6`!f^S zx_?QZl5hNcoOE4dgVtVRr#7y1%uzori(dnIS<(fNPJnV~DfgG&s<oWERGW~-SSg{V zbF|hldb8*NS_E6cQKH&Ov|7kL_t5-B?Pmh&0M>W)k|3yAuojEE=N`5Go{5zXfI#PM zttL?W&0Wj$x7blLzt(T7hVfqs9l$w}20AAKz&Q~B&WQkUP6U8+A^@Bd0pOen0Ov#i dI41(YIe+FpSS2R9=LP@(002ovPDHLkV1k}Z5kmj~ diff --git a/examples/hyperspace-roll/gfx/stars.png b/examples/hyperspace-roll/gfx/stars.png deleted file mode 100644 index 65062d6e6e384270b473f8237a277eb6ed5bfa69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp) z=>Px$;7LS5RCt{2THBGrFbs4uLjlkNRnX6sML$$QE%4<T#%DRU-kNAX?~-V<mR7RE zcDr6a<;2*n39RD%da^z*oB;R7AL>3xI936;SBDd=aFy#8!2{l}Cwk?Npjrah45=?a zb3b$q^mkMSaIc8u3LnJ_Q38?(*9EwN7QnOPAK{mKmH_mRNGnX?3JS35%9X^3429_E zUP=ea60jyvVO4UO0oDYpAtpeSE|Mjn9gwo4li=WDH%JAA&uK~k5@~NQ@(L<9C__$@ z0T6NyuqIGpReq@L@an<i46wUTDhCk{@YW_r_?H13sTk$uOX&zeA@8}3meS|PdL#yk z=S7$vznlZC30T9`cL9r1$r7+8P>QWdiU_berLBDa=D_ek#LE=7$^*+gga=42N(ccY z;lczhA+j0j!OJ+@f^{=Ag0|B`XydC-f+K-7#A)NJo1m9ATfuIEN2{pu@++AXstrnH zPbdK-kaK|4gRR@$FGgIl1gr^g0+V$ve=aXEWI@<&*UQJ-aH5I5lr`n7&5b*LnxHiS zYq*#L+G~6F&Rl~**94_aQNwg+V=Q@qhi<{mVXqHugY-ZR?BTZu-4mhqp_m{uFE{)7 oT+#!&CqmL5;GuLNoPG}Y0{t2n(s^v4>Hq)$07*qoM6N<$f*bwvDgXcg diff --git a/examples/hyperspace-roll/gfx/title-screen.png b/examples/hyperspace-roll/gfx/title-screen.png deleted file mode 100644 index cc2c524053ca82f69ada0fadcd047b966c891e12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4313 zcmV;~5GL=5P)<h;3K|Lk000e1NJLTq008g+005u}1^@s6GTY&000001b5ch_0Itp) z=>Px_lSxEDRCt{2onMF@)g8xwo94zp`ygfsLLqDDZ3xB^1sAafZ6vU$5c*&rLR&=$ zDq<Q+`XHqszE}{7h*hi!fnZDVp)ajPC9M!FS|1E(s0k8pO?F>u(-rctYO=Vu5BHwA zXU;u;XU?BFGv5zf_RgF$bI#p4-}(K{|C!C#_l5)j$dZkzGXQ{Z1~*+*I_{snoG2&Z zfq+3J2B(fw|F(xyXQO}@?L8l_mjgFM&P+sR;6l407Tl&4<SwBS?RGBCkz@1Je`Mfx zU+$T*@8UUzEKH0iJC@ypKNi#B&-1_nJ0kuQA>O#yh&E{YmM?6Z7rjon?7Jx~2-p!= z;P~j=W1VoTSl=Q|!TPDfb=J~H*$~qafq)%>1&+hs^<MGaMYJyH1f~)uA8vAcT}3Pt zD=e^QV1dKIi*|8#a(+>W_tL6a#5UHq%5&p|tGix|BfCyj$JN!hMS?eCr7qy9(+7G~ zqBUU>aUJ(LC(sHFlCgKa=OkJYlZfBmuvY!%nE(L?CPxooaI{Y}yN`&7`aga?SUSA* zWgIy+FOB=?fu-U*FM6Gb7iWo{{Hom|Rtgw(y>2o%+MgVZMa&2(W*20_m(c|`TG@z& z*47U5y<bkgfA+89>)?++C!*#E8CbMJ!}5Yqgm$6-bZAKt(jHI;1|?#;&|PlCk`2+U z0_wnEidc<UMCeAU3oI~b47OtSHISnXK)?>b3yB9W=5s=r?NCZv5$Eh}LcpN$q?pW* z3lMM%$=RZqaGg%rb`e9smb6I(Z6VZz{!$tZf9?=4Xazbqd&$t9l(WYI0fW}jrA6&p zyxdoJ5$BnjR+nfS{j--#pEd&v+);9J6M-67;0QF)0z$m)00NEx!~#Toz0{)!xQP}B zfRy-psYem8ZwrJM0stejbfMvrHUqp!)03rueSrd454=eIP^TQC8wr4#q#QVch1~(D zKvQ-@gn&T_4De7BWAcP65HKhK@s>%w8=?vC0v_z&N&9a9+0^+nhadNy6zBjcJc67S z5b!SG{%dDwK)<D1|5jcIW#@A*7vE)KRy`=VbloP_vyZVGVhDn?LJ#)uq&wEWUpn{o z$yaIXuU;sQVUa;<+OUXT?e?<4{++b*xtB{8w*T50dcXJ2QoO78JVeXS94e0a_yELW z?|QHJEY4E#(ecFW^ul^BgdA_+rNMjonM1Vv%pogLLc|~yE}|7NiJ0FxLL_80z>5pb zTxRAbGxwNxrN2J;DiMt=G2H3y5_8dbkv8sz=vBZ(R1)!E|IVT@>*_rZm97y*%z&7i zO`S%?9CkjG(Zt;l*>k8QVA(@diFnHc2TJiSo%@K0h_2gyOJS9HA%A-Om@?ffr$2Db zDrgXcqkZMhhm0l)xrqX1cx#0gTb{o@`6^w#=b=KdGOpWxi}bwi8WkzTjV>-XQVSR^ zw1Q`^>CtcQAGyd|b}!JycSmB93GurRAD~Z<A5)4~$NTr5q&LpXv-^wJH^V|VoYXFK z8+SwWQwKiUr#s%-LtAz)(CbG>n?TboeWH&zcY-_K_sH{w$hYiXFy8;-yC2Z|_ns_{ z-#9;{`?t-E4#scvH~#u-h&TgMHewOwyBng)+Y2)mS|eW2ZAOJWT|KvCC0G3o<Oq$b zs+P=!CQ{ddRkYQG?pj^Ci8~?0+zrtu$r`bA;?1QI3$&9?Pi7#p>qcVnh|rA$nqh?* z{E8Zbo6BNm)>$UxM-ME~;8;Ju`M~;t9Fq}PL=(%a8pr{Wc9W)vS41afM#}oJR|_l- zr6igN7egsQ?%0U=o&!r!m(;0U2j+)Ms>VSxWG?fW!;d%0eFDIh>=(6Tg0!)uGRw=v z3n7Eh_%36q%Pc1J1CTMn7PVvUG9$Hk*`(^JNf_LDSsYoo2=76t&|R;~m&<)*`K}w! zG#OpB43cep+yAM`%9+C3POwGow%%So?^Cp?-4+oa`Qh(Tbp;1@57YIw@j_txJDc{5 zW8(7LgDh%Cua(6*ICY%*iuje%Nc3QBt&J&vs{4o!PIaF;`KXd#+c>uAn|^24x4d!r zUuU^HApl@REdh7^P3fDiyy&{}J7ZAGh0gIo*t~R9aco~$CO5U}eX7)v`M7nSmrcW& z?KQw3l`L>uA57H(?&C#fQ}?aXBHT1`$YV}avcNeHyf8JG*fgkAX`~XvP2C?p@?jgt zhN_KNUGL@zO|3d`6}J$KsM}?f3tjo0sqoecjW?`2T`AmM`JE}i_M#lV3Yd$#%iK&K z139WvXJnV{i(B?PP4_m%G376$QE5u`G2+Chd<p%aY=!GPAF&Id?eIubSQBVU{(?+q z006`R78rnxfq((X7&Kx9X2;?U#rIE6eBPS0Qltl_sU_g1w8S+LR=B@)@6(fWH2Utl zu*Xa*MS4ID8nHYhE8HUAyfq4QDeSVBWvH}N#7+;Gfq*?>Q@BN{7WSBFrAQCh0|D2h zO5ql<E$lJV3Y{LRUw(jqYp`SShFXPN<eRsiRthU-S}D>4)ri)O6mocA)%meLxcKe| z#b$1y?-4Vt6zPEpw&gThH&RG<$>rX@^C51;X0zWhgB9#z1<%_yHzutV>46E!7Padt zE`@!na5p%u6zKtbAYjkv3cK&Z9W$*I>G`IO4QCK=AY^+Shbr7L(@K$^FWM$vB8-I& z&ZTo7(U#o{Q3`m>v{Ix8rh$L~$QTG1fQ*5F0mv8#7=Vm{fB^_h$We&sMykOlCqAbg zi=*$K{by_C`+R#mN=Y|XIA&TY(rYszyRRVNny`XdrLeme?wDz%NDsIJ0b61k#p6=g z>lW@%X{ml=%-;swfPgKrb%S(;-FM;kotEi0#{6wLl47VP<^u-?i`sRMm_m*w;5H5< z2Y9ZjfdvM@6DeM1=m!RkBiCIFQ+Oi51f1(b0O^5CZqLl->w81gW5UC~&}6$2s&*)} zjjMWoVjSHzoK^FvO24V)s;T*^Lbi3_+#Z6s|1T4h?wsse-8o&FrZCm9ERQaE0Ab0t z4vc~W00weIMYgfE%pDcoR^Ihx*UHX`*u+t#YjYl?2Lg_WOhhubSrw0{?6#_0Thnzm z`IFV1;q^3+Y+dL!p=w-e5;^3ti@*Xm5M9f0ofc@&KC*3v1^~c?)&iFiG#v<71Kdtv zORASWTxb9?1{N5AjDdgw$QTG1Oo7I`e1L#kNL>M<@h%_Ghy_5#zybr1F%WP~P+x2o zU3(sIp#jJkSYQAWQO8?g*TMn=kTKq-6Rv!5g@}meHg75&vvVt7Tq(j>I6E)KGu?*| zH|0T=HfRomo31Jy_s?EVl#@L1Iv-dRizratb*B5M!o`&$AlT-^i}s$6*UN#Z)H&f* zz&65>#Zg&KRXC40=s<NXNQ+9e+qpPLj?Gj5kwL^<<&Sp@?BhC<1vcG_T`P0LK|E|k z3+fScNgY)^*u}!i!gZFO4>R2t_($g+>x2vITMe{AC!$TOJnmiZ72nSZVYb#50<MNP z0XN-EZJQNN{Q}@cyEv<k_tL6a#3u3j`mG`UXR>mytGf9vhm`~@%h=4!jF$|BVmO@s znJGk_T6lG^6|IO##7(lkVzrN*lXZdGhK20Tv=%V`!<sHuTX<2o%|iQT?|RQkv?3-E zzrA6t`prF|5*Xi>q8g{53JWb@t46GqFRrvkv^@N88V-j+MVzzcWt><oA0Ih3FOB!; zfu-U*6a5pjdJ#W+O^=@ZD!qt_<c*)A5M8KpjV(q2w^h6%Gcz+mMVz~MWfoHD_VR-< zRwr(^&I14Fg?W0iA#Suva8=7jRpHwZW!%efIE?ZEpbkuAO&ZB(n($z(1J|{{!{IQR z1+SY{Xg4}%_y#P7iwjMpccB+&sWC3J3yo`q7VBzt1RPVmKGKAM)pVf|D@UeW=+t$! zFCUYC2WfeG!y27frQ+j)O*c|qy0#JrqY=9ke)$;DwXf8V1Hw|WlB@m(a`+&%;Ymf% zI<U!|<wa?-wtPIDkZoOP*60<pD=8%*yRn))lv3C7Ycq4s6wjr>tIA9{)4eNOV3`11 zx%L%%H<`urVTJh?>lF2Lkr;i%A@9#yW^pnDFX-5_kW2#c)!J-3jWz^Y3#_xgHUd_O zgIUq4bzF9>Ow6)0#k`7LPF=CWv2mSF=+g?zhD6H3WZ|}P_;_!=`8xgdCl5&DeE#1r zY2(I?Q}^*PTh7@6i-o_6C9Wf0BDeam%-XU+8$|6H7TQGk<#7f#$D13h6E8dGyRY}Y z`}Qfrn0Q0rY=Kn+CS*d8Swr6~%c79QG<DWi1}t!RbaRH6Jai|S1nhD>PZdk83r}K! zMK{#dg6XX9HNP8)kA;iJvU}O&7uL2}s4Vj+%wIYsu{@{B%$+p%!}q+UDO*s&<{B9` z!j8U#n9c%=0y7ED)|xZ788nan*~_I*2v+`lr#f)(UMXC(-nOmAV!XOufGw4s^D2Tc zHC~D5ZMv4wKMYh9)^MP=us$tt6{5P(RS6|Dh!~idJ6t|ixznPBm04U}<Ckp4QRw!R zXfCv9d9Qt?n&`yqAYLG1Jy_!3yG9?L<C`WQ5!pGBrxuEMF&aZF_XFD?wg`(OuWUzG zxm;^AFhkd<g;wbHpcL;@3zP5PIZbni$8nEuniez>&AoVfbiaeUh%TKPoxJWgntSnd zc}0!~*N84~7v4xT_xoNcFO3<ARRxv1E3?i-@^d_{))%eO-NJbiJuhA+R3akkmBmX$ zbovw#2~#XDkp4ITUIpwT5Sj2~!X}z-%yM;^RU@&g2)PYQ<8%pW-|fMPP>cHUQwt^Q zI>n_^Qb877MtAG`uT=v|>Jq&hNhLm2>$J|w+6tK;eZ`N)sshB@9I8wqEG#MeFql9u zj9upO_d>K1@$xSMIxqP|z^et8_2ars7O=6(I#g--w7{S_RC<{*(Ow{;8%JMP4(=Me z#FKMM&hrN&H+p4Wu)ZITo0aA!<xABstg9PGAIKqFn~Jx5q2Mj644)Plgdy65eBP=u zSNZhB60=4pA}WjZJWX3w@tBDI_xFoLx6X_{E2A>c@72ZE%lY%Vb2_3lVyR{U`M$pj zSls55qH4lgmx*X3#%)wSR<UgozB0c?v^>7wutzI9wu}SJy&1B_;cfQ+;?Y{*xy_rL zL}#*WrlFGTnE%Vik=@@$l(rTZT}bhXz7)=RDp}K&yVr{EbMK71d>&jY$Ct6peTay* zat&D);$^6|+qJ#kYG($YYeO>^R{YC{6HU+26|WKF_{bN;+b&k-*NC=p!sNut&QH}} z8JsZZmU^@@GmdxH__~?$b#ue<y*@0<Nj9-THQAxcNUrExtMC?GCS;kgRf6@gj4T7< zO^fgDxs`*vi2gFF+s-YG1<Z+cZmBmB^s?jzjIBiU10wpv_`2cvUc7)sk#q4v<7IO* z7ZItfDZ7u01+J1d4@BE;m|zP53j)&#t_a&oqdM<D%JF2^rVwzYMl7-5yG)vw)pJeP znyyg+!2(()sk^H?7O$6b7ZswGhP`8(!FmMQ;JYb%1w*iaZzU$8q7KW4$pk#rx;%af z=)`Ulr!HbuBZz<j0C9*ulo9~o4+t25jDdh#Ojq{{>JtA4xR-W}@&n2400000NkvXX Hu0mjf+f6s3 diff --git a/examples/hyperspace-roll/src/background.rs b/examples/hyperspace-roll/src/background.rs index 85609f85..61035ce1 100644 --- a/examples/hyperspace-roll/src/background.rs +++ b/examples/hyperspace-roll/src/background.rs @@ -6,9 +6,9 @@ use agb::{ use crate::sfx::Sfx; include_background_gfx!(backgrounds, "121105", - stars => "gfx/stars.png", - title => "gfx/title-screen.png", - help => "gfx/help-text.png", + stars => "gfx/stars.aseprite", + title => "gfx/title-screen.aseprite", + help => "gfx/help-text.aseprite", descriptions1 => "gfx/descriptions1.png", descriptions2 => "gfx/descriptions2.png", ); diff --git a/examples/the-purple-night/gfx/background.png b/examples/the-purple-night/gfx/background.png deleted file mode 100644 index 32786957942310769d0206c6cdb8932e1f730b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2082 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 M07*qoM6N<$f+~LSjsO4v diff --git a/examples/the-purple-night/gfx/boss.png b/examples/the-purple-night/gfx/boss.png deleted file mode 100644 index b17c3a39247115e4bc9ede448886c6fa0ed14fa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3041 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 diff --git a/examples/the-purple-night/gfx/objects.png b/examples/the-purple-night/gfx/objects.png deleted file mode 100644 index 167e3a2fd3dee271287d4ae2773e07a8fa0cc5ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9719 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 Z_4Ic*nao2Y@JlY>nUa<wOx`@`{{ct;)_MQ{ diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 9be41653..cc861298 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -57,7 +57,7 @@ const SWORDLESS_JUMP: &Tag = TAG_MAP.get("jump swordless"); const SWORDLESS_ATTACK: &Tag = KNIFE_ATTACK; const SWORDLESS_JUMP_ATTACK: &Tag = KNIFE_JUMP_ATTACK; -agb::include_background_gfx!(background, "53269a", background => "gfx/background.png"); +agb::include_background_gfx!(background, "53269a", background => "gfx/background.aseprite"); type Number = FixedNum<8>; From 45343efe520a5cfe363e81d3758f59e4bf3285aa Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:33:59 +0100 Subject: [PATCH 46/60] Update lockfiles --- agb-gbafix/Cargo.lock | 152 ++++--------- book/games/pong/Cargo.lock | 126 ++--------- examples/combo/Cargo.lock | 120 ++--------- examples/hyperspace-roll/Cargo.lock | 126 ++--------- .../the-hat-chooses-the-wizard/Cargo.lock | 120 ++--------- examples/the-purple-night/Cargo.lock | 126 ++--------- mgba-test-runner/Cargo.lock | 46 +++- tools/Cargo.lock | 203 ++++++++++++------ 8 files changed, 300 insertions(+), 719 deletions(-) diff --git a/agb-gbafix/Cargo.lock b/agb-gbafix/Cargo.lock index 7bee57fa..a600b538 100644 --- a/agb-gbafix/Cargo.lock +++ b/agb-gbafix/Cargo.lock @@ -15,42 +15,51 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -79,18 +88,18 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "clap" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" dependencies = [ "anstream", "anstyle", @@ -106,19 +115,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "elf" @@ -128,13 +128,13 @@ checksum = "e2b183d6ce6ca4cf30e3db37abf5b52568b5f9015c97d9fbdd7026aa5dcdd758" [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -170,7 +170,7 @@ checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -182,7 +182,7 @@ dependencies = [ "hermit-abi", "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -199,16 +199,16 @@ checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "rustix" -version = "0.37.8" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aef160324be24d31a62147fae491c14d2204a3865c7ca8c3b0d7f7bcb3ea635" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -223,37 +223,13 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] @@ -262,93 +238,51 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.0" diff --git a/book/games/pong/Cargo.lock b/book/games/pong/Cargo.lock index 5915f0ec..1597215a 100644 --- a/book/games/pong/Cargo.lock +++ b/book/games/pong/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "agb_macros", "agb_sound_converter", "bare-metal", - "bitflags 2.0.2", + "bitflags 2.1.0", "modular-bitfield", "rustc-hash", ] @@ -44,9 +44,7 @@ dependencies = [ "image", "proc-macro2", "quote", - "serde", - "syn 2.0.8", - "toml", + "syn 2.0.15", ] [[package]] @@ -55,7 +53,7 @@ version = "0.14.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -65,7 +63,7 @@ dependencies = [ "hound", "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" [[package]] name = "bytemuck" @@ -176,15 +174,15 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", "ttf-parser", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -200,12 +198,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hound" version = "3.5.0" @@ -227,21 +219,11 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "log" @@ -252,12 +234,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -371,9 +347,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -393,35 +369,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.8", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -441,49 +388,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.15.2" @@ -507,12 +420,3 @@ name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] diff --git a/examples/combo/Cargo.lock b/examples/combo/Cargo.lock index 0d0332fc..ac40b044 100644 --- a/examples/combo/Cargo.lock +++ b/examples/combo/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "agb_macros", "agb_sound_converter", "bare-metal", - "bitflags 2.0.2", + "bitflags 2.1.0", "modular-bitfield", "rustc-hash", ] @@ -44,9 +44,7 @@ dependencies = [ "image", "proc-macro2", "quote", - "serde", - "syn 2.0.8", - "toml", + "syn 2.0.15", ] [[package]] @@ -55,7 +53,7 @@ version = "0.14.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -65,7 +63,7 @@ dependencies = [ "hound", "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -122,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" [[package]] name = "bytemuck" @@ -201,7 +199,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", "ttf-parser", ] @@ -216,9 +214,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "libc", @@ -234,12 +232,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hound" version = "3.5.0" @@ -268,16 +260,6 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "itoa" version = "1.0.6" @@ -286,9 +268,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libflate" @@ -311,12 +293,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -423,9 +399,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -459,44 +435,35 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -516,9 +483,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -561,40 +528,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.15.2" @@ -619,15 +552,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - [[package]] name = "xml-rs" version = "0.8.4" diff --git a/examples/hyperspace-roll/Cargo.lock b/examples/hyperspace-roll/Cargo.lock index b0461ff4..753b5b84 100644 --- a/examples/hyperspace-roll/Cargo.lock +++ b/examples/hyperspace-roll/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "agb_macros", "agb_sound_converter", "bare-metal", - "bitflags 2.0.2", + "bitflags 2.1.0", "modular-bitfield", "rustc-hash", ] @@ -44,9 +44,7 @@ dependencies = [ "image", "proc-macro2", "quote", - "serde", - "syn 2.0.8", - "toml", + "syn 2.0.15", ] [[package]] @@ -55,7 +53,7 @@ version = "0.14.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -65,7 +63,7 @@ dependencies = [ "hound", "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" [[package]] name = "bytemuck" @@ -176,15 +174,15 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", "ttf-parser", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -200,12 +198,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hound" version = "3.5.0" @@ -234,21 +226,11 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "log" @@ -259,12 +241,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -371,9 +347,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -393,35 +369,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.8", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -441,49 +388,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.15.2" @@ -507,12 +420,3 @@ name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] diff --git a/examples/the-hat-chooses-the-wizard/Cargo.lock b/examples/the-hat-chooses-the-wizard/Cargo.lock index 3bdb1ec3..4de4793d 100644 --- a/examples/the-hat-chooses-the-wizard/Cargo.lock +++ b/examples/the-hat-chooses-the-wizard/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "agb_macros", "agb_sound_converter", "bare-metal", - "bitflags 2.0.2", + "bitflags 2.1.0", "modular-bitfield", "rustc-hash", ] @@ -44,9 +44,7 @@ dependencies = [ "image", "proc-macro2", "quote", - "serde", - "syn 2.0.8", - "toml", + "syn 2.0.15", ] [[package]] @@ -55,7 +53,7 @@ version = "0.14.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -65,7 +63,7 @@ dependencies = [ "hound", "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -113,9 +111,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" [[package]] name = "bytemuck" @@ -176,15 +174,15 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", "ttf-parser", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -200,12 +198,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hound" version = "3.5.0" @@ -227,16 +219,6 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "itoa" version = "1.0.6" @@ -245,9 +227,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "log" @@ -258,12 +240,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -370,9 +346,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -400,44 +376,35 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -457,9 +424,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -475,40 +442,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.15.2" @@ -532,12 +465,3 @@ name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] diff --git a/examples/the-purple-night/Cargo.lock b/examples/the-purple-night/Cargo.lock index ac89ff17..8b6264da 100644 --- a/examples/the-purple-night/Cargo.lock +++ b/examples/the-purple-night/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "agb_macros", "agb_sound_converter", "bare-metal", - "bitflags 2.0.2", + "bitflags 2.1.0", "modular-bitfield", "rustc-hash", ] @@ -44,9 +44,7 @@ dependencies = [ "image", "proc-macro2", "quote", - "serde", - "syn 2.0.8", - "toml", + "syn 2.0.15", ] [[package]] @@ -55,7 +53,7 @@ version = "0.14.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -65,7 +63,7 @@ dependencies = [ "hound", "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -122,9 +120,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" [[package]] name = "bytemuck" @@ -191,7 +189,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a62391ecb864cf12ed06b2af4eda2e609b97657950d6a8f06841b17726ab253" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", "ttf-parser", ] @@ -206,9 +204,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "libc", @@ -224,12 +222,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hound" version = "3.5.0" @@ -251,21 +243,11 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libflate" @@ -288,12 +270,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -400,9 +376,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -428,35 +404,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.8", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -476,9 +423,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -512,40 +459,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "ttf-parser" version = "0.15.2" @@ -570,15 +483,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - [[package]] name = "xml-rs" version = "0.8.4" diff --git a/mgba-test-runner/Cargo.lock b/mgba-test-runner/Cargo.lock index bb4c6046..09bfcca0 100644 --- a/mgba-test-runner/Cargo.lock +++ b/mgba-test-runner/Cargo.lock @@ -77,6 +77,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + [[package]] name = "flate2" version = "1.0.25" @@ -84,14 +93,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.6.2", ] [[package]] name = "image" -version = "0.24.5" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", @@ -112,9 +121,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "memchr" @@ -141,6 +150,16 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -173,21 +192,22 @@ dependencies = [ [[package]] name = "png" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ "bitflags", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] name = "regex" -version = "1.7.2" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -199,3 +219,9 @@ name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" diff --git a/tools/Cargo.lock b/tools/Cargo.lock index 6c804fdc..ed67cdfc 100644 --- a/tools/Cargo.lock +++ b/tools/Cargo.lock @@ -11,6 +11,55 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -58,25 +107,31 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.13" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +dependencies = [ + "anstream", + "anstyle", "bitflags", "clap_lex", - "is-terminal", "strsim", - "termcolor", ] [[package]] name = "clap_lex" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "codespan-reporting" @@ -89,16 +144,22 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.3" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cxx" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -108,9 +169,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -118,24 +179,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] name = "cxxbridge-flags" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.15", ] [[package]] @@ -149,13 +210,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -194,9 +255,9 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -218,9 +279,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -228,9 +289,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ "hermit-abi", "libc", @@ -239,9 +300,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi", "io-lifetimes", @@ -260,9 +321,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "link-cplusplus" @@ -275,9 +336,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "log" @@ -319,12 +380,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - [[package]] name = "petgraph" version = "0.6.3" @@ -337,9 +392,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -355,9 +410,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.11" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", "errno", @@ -392,9 +447,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -461,6 +516,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -554,27 +615,27 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ "windows-targets", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -587,51 +648,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] From eb4476043c0fd6b5c730dd87c44420eec33d58e4 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:35:33 +0100 Subject: [PATCH 47/60] Add changelog entry --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c1024e1..eee11ee8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +- You can now import aseprite files directly (in addition to the already supported png and bmp files) when importing background tiles. + +### Changed +- Importing background tiles has been improved. You no longer need to use `include_gfx!` with the toml file. Instead, use `include_background_gfx`. See the documentation for usage. + ## [0.14.0] - 2023/04/11 ### Added From 293bb15c7bcc47f8a49ddb29545e83f895daec43 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Thu, 13 Apr 2023 22:46:03 +0100 Subject: [PATCH 48/60] Don't need this any more now I'm finished debugging --- agb/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/agb/src/lib.rs b/agb/src/lib.rs index e4c37070..5379d0fe 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -13,7 +13,6 @@ #![feature(alloc_error_handler)] #![feature(allocator_api)] #![feature(asm_const)] -#![feature(trace_macros)] #![warn(clippy::all)] #![deny(clippy::must_use_candidate)] #![deny(clippy::trivially_copy_pass_by_ref)] From bace62b8e30a3ddc698cfc5aacbe5c75919b7d88 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Fri, 14 Apr 2023 21:16:12 +0100 Subject: [PATCH 49/60] Don't use nightly only function --- agb-image-converter/src/image_loader.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/agb-image-converter/src/image_loader.rs b/agb-image-converter/src/image_loader.rs index 81c8fff8..a7909ce0 100644 --- a/agb-image-converter/src/image_loader.rs +++ b/agb-image-converter/src/image_loader.rs @@ -12,10 +12,7 @@ pub(crate) struct Image { impl Image { pub fn load_from_file(image_path: &path::Path) -> Self { - let img = if image_path - .extension() - .is_some_and(|extension| extension == OsStr::new("aseprite")) - { + let img = if image_path.extension() == Some(OsStr::new("aseprite")) { let ase = asefile::AsepriteFile::read_file(image_path).expect("failed to read aseprite file"); DynamicImage::ImageRgba8(ase.frame(0).image()) From c970ab9362af72b707f077cc29539c5f5cd7cce3 Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:31:05 +0100 Subject: [PATCH 50/60] fix positioning issues due --- examples/the-purple-night/src/lib.rs | 62 ++++++++++------------------ 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 4325f879..a65be820 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -21,7 +21,7 @@ use agb::{ }, Priority, HEIGHT, WIDTH, }, - fixnum::{FixedNum, Rect, Vector2D}, + fixnum::{num, FixedNum, Rect, Vector2D}, input::{Button, ButtonController, Tri}, interrupt::VBlank, rng, @@ -159,12 +159,12 @@ struct Entity<'a> { sprite: Object<'a>, position: Vector2D<Number>, velocity: Vector2D<Number>, - collision_mask: Rect<u16>, + collision_mask: Rect<Number>, visible: bool, } impl<'a> Entity<'a> { - fn new(object_controller: &'a ObjectController, collision_mask: Rect<u16>) -> Self { + fn new(object_controller: &'a ObjectController, collision_mask: Rect<Number>) -> Self { let s = object_controller.sprite(LONG_SWORD_IDLE.sprite(0)); let mut sprite = object_controller.object(s); sprite.set_priority(Priority::P1); @@ -213,18 +213,7 @@ impl<'a> Entity<'a> { } fn collider(&self) -> Rect<Number> { - let mut number_collision: Rect<Number> = Rect::new( - ( - self.collision_mask.position.x as i32, - self.collision_mask.position.y as i32, - ) - .into(), - ( - self.collision_mask.size.x as i32, - self.collision_mask.size.y as i32, - ) - .into(), - ); + let mut number_collision = self.collision_mask; number_collision.position = self.position + number_collision.position - number_collision.size / 2; number_collision @@ -273,11 +262,12 @@ impl<'a> Entity<'a> { (final_distance, has_collided) } - fn commit_with_fudge(&mut self, offset: Vector2D<Number>, fudge: Vector2D<i32>) { + fn commit_with_fudge(&mut self, offset: Vector2D<Number>, fudge: Vector2D<Number>) { if !self.visible { self.sprite.hide(); } else { - let position = (self.position - offset).floor() + fudge; + let position = + (self.position - offset + fudge + Vector2D::new(num!(0.5), num!(0.5))).floor(); self.sprite.set_position(position - (8, 8).into()); if position.x < -8 || position.x > WIDTH + 8 @@ -527,17 +517,14 @@ struct Player<'a> { attack_timer: AttackTimer, damage_cooldown: u16, sword: SwordState, - fudge_factor: Vector2D<i32>, + fudge_factor: Vector2D<Number>, hurtbox: Option<Rect<Number>>, controllable: bool, } impl<'a> Player<'a> { fn new(object_controller: &'a ObjectController<'a>) -> Player { - let mut entity = Entity::new( - object_controller, - Rect::new((0_u16, 0_u16).into(), (4_u16, 12_u16).into()), - ); + let mut entity = Entity::new(object_controller, Rect::new((0, 0).into(), (5, 12).into())); let s = object_controller.sprite(LONG_SWORD_IDLE.sprite(0)); entity.sprite.set_sprite(s); entity.sprite.show(); @@ -613,7 +600,7 @@ impl<'a> Player<'a> { AttackTimer::Attack(a) => { *a -= 1; let frame = self.sword.attack_frame(*a); - self.fudge_factor.x = self.sword.fudge(frame) * self.facing as i32; + self.fudge_factor.x += self.sword.fudge(frame) * self.facing as i32; let tag = self.sword.attack_tag(); let sprite = controller.sprite(tag.animation_sprite(frame as usize)); self.entity.sprite.set_sprite(sprite); @@ -627,7 +614,7 @@ impl<'a> Player<'a> { AttackTimer::Cooldown(a) => { *a -= 1; let frame = self.sword.hold_frame(); - self.fudge_factor.x = self.sword.fudge(frame) * self.facing as i32; + self.fudge_factor.x += self.sword.fudge(frame) * self.facing as i32; let tag = self.sword.attack_tag(); let sprite = controller.sprite(tag.animation_sprite(frame as usize)); self.entity.sprite.set_sprite(sprite); @@ -695,6 +682,8 @@ impl<'a> Player<'a> { let gravity = gravity / 16; self.entity.velocity.y += gravity; + self.fudge_factor.x -= num!(1.5) * (self.facing as i32); + let fudge_number = (self.fudge_factor.x, self.fudge_factor.y).into(); // convert the hurtbox to a location in the game @@ -1351,12 +1340,12 @@ enum UpdateInstruction { } impl EnemyData { - fn collision_mask(&self) -> Rect<u16> { + fn collision_mask(&self) -> Rect<Number> { match self { - EnemyData::Slime(_) => Rect::new((0u16, 0u16).into(), (4u16, 11u16).into()), - EnemyData::Bat(_) => Rect::new((0u16, 0u16).into(), (12u16, 4u16).into()), - EnemyData::MiniFlame(_) => Rect::new((0u16, 0u16).into(), (12u16, 12u16).into()), - EnemyData::Emu(_) => Rect::new((0u16, 0u16).into(), (7u16, 11u16).into()), + EnemyData::Slime(_) => Rect::new((0.into(), num!(1.5)).into(), (4, 11).into()), + EnemyData::Bat(_) => Rect::new((0, 0).into(), (12, 4).into()), + EnemyData::MiniFlame(_) => Rect::new((0, 0).into(), (12, 12).into()), + EnemyData::Emu(_) => Rect::new((0, 0).into(), (7, 11).into()), } } @@ -1533,10 +1522,7 @@ impl<'a> Particle<'a> { particle_data: ParticleData, position: Vector2D<Number>, ) -> Self { - let mut entity = Entity::new( - object_controller, - Rect::new((0u16, 0u16).into(), (0u16, 0u16).into()), - ); + let mut entity = Entity::new(object_controller, Rect::new((0, 0).into(), (0, 0).into())); entity.position = position; @@ -1611,10 +1597,7 @@ struct FollowingBoss<'a> { impl<'a> FollowingBoss<'a> { fn new(object_controller: &'a ObjectController, position: Vector2D<Number>) -> Self { - let mut entity = Entity::new( - object_controller, - Rect::new((0_u16, 0_u16).into(), (0_u16, 0_u16).into()), - ); + let mut entity = Entity::new(object_controller, Rect::new((0, 0).into(), (0, 0).into())); entity.position = position; Self { @@ -1695,10 +1678,7 @@ enum BossInstruction { impl<'a> Boss<'a> { fn new(object_controller: &'a ObjectController, screen_coords: Vector2D<Number>) -> Self { - let mut entity = Entity::new( - object_controller, - Rect::new((0_u16, 0_u16).into(), (28_u16, 28_u16).into()), - ); + let mut entity = Entity::new(object_controller, Rect::new((0, 0).into(), (28, 28).into())); entity.position = screen_coords + (144, 136).into(); Self { entity, From 692890b6d65954484579eca902c9b33605b4e0b1 Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:34:09 +0100 Subject: [PATCH 51/60] fix jitter between objects and background --- examples/the-purple-night/src/lib.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index a65be820..d3a45474 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -2066,10 +2066,6 @@ impl<'a> Game<'a> { .commit_with_fudge(this_frame_offset, (0, 0).into()); } - self.level.background.commit(vram); - self.level.foreground.commit(vram); - self.level.clouds.commit(vram); - for i in remove { self.particles.remove(i); } @@ -2274,6 +2270,9 @@ fn game_with_level(gba: &mut agb::Gba) { sfx.frame(); vblank.wait_for_vblank(); object.commit(); + game.level.background.commit(&mut vram); + game.level.foreground.commit(&mut vram); + game.level.clouds.commit(&mut vram); match game.advance_frame(&object, &mut vram, &mut sfx) { GameStatus::Continue => {} GameStatus::Lost => { From a2494040630a466dfb992838d51725bb385501af Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:48:00 +0100 Subject: [PATCH 52/60] fix player collision mask --- examples/the-purple-night/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index d3a45474..537884fd 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -524,7 +524,7 @@ struct Player<'a> { impl<'a> Player<'a> { fn new(object_controller: &'a ObjectController<'a>) -> Player { - let mut entity = Entity::new(object_controller, Rect::new((0, 0).into(), (5, 12).into())); + let mut entity = Entity::new(object_controller, Rect::new((0, 1).into(), (5, 10).into())); let s = object_controller.sprite(LONG_SWORD_IDLE.sprite(0)); entity.sprite.set_sprite(s); entity.sprite.show(); From 8bef21479791112c4c6e65967512ea0a65f74f2e Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:48:15 +0100 Subject: [PATCH 53/60] fix jitter --- examples/the-purple-night/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 537884fd..b6ec156a 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -1966,6 +1966,8 @@ impl<'a> Game<'a> { self.shake_time -= 1; } + let this_frame_offset = this_frame_offset.floor().into(); + self.input.update(); if let UpdateInstruction::CreateParticle(data, position) = self.player From a5c1d62cad5aaf7f7997aba9ae66878ed1d3626e Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:48:26 +0100 Subject: [PATCH 54/60] pointless capacity --- examples/the-purple-night/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index b6ec156a..e7467c9f 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -1978,7 +1978,7 @@ impl<'a> Game<'a> { self.particles.insert(new_particle); } - let mut remove = Vec::with_capacity(10); + let mut remove = Vec::new(); for (idx, enemy) in self.enemies.iter_mut() { if enemy.entity.position.x < self.offset.x - 8 { remove.push(idx); From f67ffac2273f207f6198b11dd2f3ca352ce9deda Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:48:48 +0100 Subject: [PATCH 55/60] prioritise audio and deprioritise objects --- examples/the-purple-night/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index e7467c9f..534602b0 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -2269,12 +2269,12 @@ fn game_with_level(gba: &mut agb::Gba) { ); start_at_boss = loop { - sfx.frame(); vblank.wait_for_vblank(); - object.commit(); + sfx.frame(); game.level.background.commit(&mut vram); game.level.foreground.commit(&mut vram); game.level.clouds.commit(&mut vram); + object.commit(); match game.advance_frame(&object, &mut vram, &mut sfx) { GameStatus::Continue => {} GameStatus::Lost => { From 3f9fdd7c3768e40787117f8ee0acc4379334fc60 Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Mon, 17 Apr 2023 23:53:44 +0100 Subject: [PATCH 56/60] just use equals like before --- examples/the-purple-night/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 534602b0..33c5c2af 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -600,7 +600,7 @@ impl<'a> Player<'a> { AttackTimer::Attack(a) => { *a -= 1; let frame = self.sword.attack_frame(*a); - self.fudge_factor.x += self.sword.fudge(frame) * self.facing as i32; + self.fudge_factor.x = (self.sword.fudge(frame) * self.facing as i32).into(); let tag = self.sword.attack_tag(); let sprite = controller.sprite(tag.animation_sprite(frame as usize)); self.entity.sprite.set_sprite(sprite); @@ -614,7 +614,7 @@ impl<'a> Player<'a> { AttackTimer::Cooldown(a) => { *a -= 1; let frame = self.sword.hold_frame(); - self.fudge_factor.x += self.sword.fudge(frame) * self.facing as i32; + self.fudge_factor.x = (self.sword.fudge(frame) * self.facing as i32).into(); let tag = self.sword.attack_tag(); let sprite = controller.sprite(tag.animation_sprite(frame as usize)); self.entity.sprite.set_sprite(sprite); From e601374207dfad459235abe935eb20eb654b3570 Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Tue, 18 Apr 2023 00:12:20 +0100 Subject: [PATCH 57/60] pull out common part of loop --- examples/the-purple-night/src/lib.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index 33c5c2af..a116061d 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -2193,15 +2193,12 @@ fn game_with_level(gba: &mut agb::Gba) { let mut start_at_boss = false; + let (background, mut vram) = gba.display.video.tiled0(); + vram.set_background_palettes(background::PALETTES); + let tileset = TileSet::new(background::background.tiles, TileFormat::FourBpp); + let object = gba.display.object.get(); + loop { - let (background, mut vram) = gba.display.video.tiled0(); - - vram.set_background_palettes(background::PALETTES); - - let tileset = TileSet::new(background::background.tiles, TileFormat::FourBpp); - - let object = gba.display.object.get(); - let backdrop = InfiniteScrolledMap::new( background.background( Priority::P2, From 6575a067b54c2d3edced8cad6ee9a2d7a1c80773 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 18 Apr 2023 20:07:08 +0100 Subject: [PATCH 58/60] Fix documentation compilation --- agb/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agb/src/lib.rs b/agb/src/lib.rs index 5379d0fe..72926375 100644 --- a/agb/src/lib.rs +++ b/agb/src/lib.rs @@ -71,10 +71,10 @@ /// tiled::{RegularBackgroundSize, TileFormat, TileSet, TileSetting, Tiled0, TiledMap, VRamManager}, /// Priority, /// }, -/// include_gfx, +/// include_background_gfx, /// }; /// -/// agb::include_background_gfx!(water_tiles, tiles => "exmaples/water_tiles.png"); +/// agb::include_background_gfx!(water_tiles, tiles => "examples/water_tiles.png"); /// /// # fn load_tileset(mut gfx: Tiled0, mut vram: VRamManager) { /// let tileset = TileSet::new(water_tiles::tiles.tiles, TileFormat::FourBpp); From f3c4593a516ad71e13be032e153338db7674ac0a Mon Sep 17 00:00:00 2001 From: Corwin <corwin@kuiper.dev> Date: Tue, 18 Apr 2023 20:25:31 +0100 Subject: [PATCH 59/60] move mixer frame --- examples/the-purple-night/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/the-purple-night/src/lib.rs b/examples/the-purple-night/src/lib.rs index a116061d..5c370ab8 100644 --- a/examples/the-purple-night/src/lib.rs +++ b/examples/the-purple-night/src/lib.rs @@ -2266,8 +2266,8 @@ fn game_with_level(gba: &mut agb::Gba) { ); start_at_boss = loop { - vblank.wait_for_vblank(); sfx.frame(); + vblank.wait_for_vblank(); game.level.background.commit(&mut vram); game.level.foreground.commit(&mut vram); game.level.clouds.commit(&mut vram); From 1e0102d6159d0085a78771a9d72e9b88ac3cdd68 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani <gw@ilym.me> Date: Tue, 18 Apr 2023 20:29:45 +0100 Subject: [PATCH 60/60] Also update the combo rom --- examples/combo/gfx/games.toml | 16 ---------------- examples/combo/src/lib.rs | 9 +++++++-- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 examples/combo/gfx/games.toml diff --git a/examples/combo/gfx/games.toml b/examples/combo/gfx/games.toml deleted file mode 100644 index 6fa1825c..00000000 --- a/examples/combo/gfx/games.toml +++ /dev/null @@ -1,16 +0,0 @@ -version = "1.0" - -[image.hat] -filename = "hat.png" -tile_size = "8x8" -transparent_colour = "121105" - -[image.purple] -filename = "purple.png" -tile_size = "8x8" -transparent_colour = "121105" - -[image.hyperspace] -filename = "hyperspace.png" -tile_size = "8x8" -transparent_colour = "121105" diff --git a/examples/combo/src/lib.rs b/examples/combo/src/lib.rs index 9d341eb1..0092078a 100644 --- a/examples/combo/src/lib.rs +++ b/examples/combo/src/lib.rs @@ -12,7 +12,7 @@ use agb::{ Priority, }, fixnum::{Num, Vector2D}, - include_gfx, + include_background_gfx, input::Button, }; @@ -42,7 +42,12 @@ impl Game { } } -include_gfx!("gfx/games.toml"); +include_background_gfx!( + games, "121105", + hat => "gfx/hat.png", + purple => "gfx/purple.png", + hyperspace => "gfx/hyperspace.png" +); fn get_game(gba: &mut agb::Gba) -> Game { let mut input = agb::input::ButtonController::new();