1
1
use wasm_bindgen:: prelude:: * ;
2
2
3
- use gbc:: Gameboy as Gameboy_ ;
4
3
use gbc:: cartridge:: Cartridge as Cartridge_ ;
5
4
use gbc:: joypad:: { JoypadEvent , JoypadInput as JoypadInput_ } ;
6
- use gbc:: ppu:: { GameboyRgb , LCD_WIDTH , LCD_HEIGHT } ;
5
+ use gbc:: ppu:: { GameboyRgb , LCD_HEIGHT , LCD_WIDTH } ;
6
+ use gbc:: Gameboy as Gameboy_ ;
7
7
8
8
// Re-exported JopypadInput enum
9
9
#[ wasm_bindgen]
@@ -42,9 +42,10 @@ impl Cartridge {
42
42
#[ wasm_bindgen( constructor) ]
43
43
pub fn new ( data : Box < [ u8 ] > ) -> Result < Cartridge , JsValue > {
44
44
let cartridge = Cartridge_ :: from_bytes ( Vec :: from ( data) , false ) ;
45
- cartridge. validate ( )
46
- . map ( |_| Self ( cartridge) )
47
- . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) )
45
+ cartridge
46
+ . validate ( )
47
+ . map ( |_| Self ( cartridge) )
48
+ . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) )
48
49
}
49
50
}
50
51
@@ -59,14 +60,11 @@ impl Gameboy {
59
60
/// Create a new `Gameboy` from a valid cartridge
60
61
#[ wasm_bindgen( constructor) ]
61
62
pub fn new ( cartridge : Cartridge ) -> Result < Gameboy , JsValue > {
62
- let inner = Gameboy_ :: init ( cartridge . 0 , false )
63
- . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) ) ?;
63
+ let inner =
64
+ Gameboy_ :: init ( cartridge . 0 , false ) . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) ) ?;
64
65
let inputs = Vec :: new ( ) ;
65
66
66
- Ok ( Self {
67
- inner,
68
- inputs,
69
- } )
67
+ Ok ( Self { inner, inputs } )
70
68
}
71
69
72
70
/// Run the Gameboy for a single frame.
@@ -111,11 +109,11 @@ impl Gameboy {
111
109
/// Create a Gameboy from an existing save state
112
110
pub fn load ( data : & [ u8 ] , cartridge : Cartridge ) -> Result < Gameboy , JsValue > {
113
111
Gameboy_ :: load ( data, cartridge. 0 )
114
- . map ( |gameboy| Self {
115
- inner : gameboy,
116
- inputs : Vec :: new ( ) ,
117
- } )
118
- . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) )
112
+ . map ( |gameboy| Self {
113
+ inner : gameboy,
114
+ inputs : Vec :: new ( ) ,
115
+ } )
116
+ . map_err ( |e| JsValue :: from_str ( & e. to_string ( ) ) )
119
117
}
120
118
121
119
pub fn lcd_width ( ) -> usize {
0 commit comments