devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Fix OBJ priorities (tonc prio_demo.gba works)

Browse source 
Former-commit-id: a55b3be7688ef7e1446a54c38fc5ddb5034cb4b9
This commit is contained in:
Michel Heily 2019-08-31 14:13:21 +02:00
parent ba9b4662d4
commit 9ebb0d3d2d
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/gpu/mod.rs
View file

@ -215,6 +215,7 @@ pub struct Gpu {
pub bldy: u16, pub bldy: u16,
pub obj_line: Scanline<Rgb15>, pub obj_line: Scanline<Rgb15>,
pub obj_line_priorities: Scanline<u16>,
pub frame_buffer: FrameBuffer, pub frame_buffer: FrameBuffer,
} }
@ -238,6 +239,7 @@ impl Gpu {
current_scanline: 0, current_scanline: 0,
cycles: 0, cycles: 0,
obj_line: Scanline::default(), obj_line: Scanline::default(),
obj_line_priorities: Scanline([3; DISPLAY_WIDTH]),
frame_buffer: FrameBuffer([0; DISPLAY_WIDTH * DISPLAY_HEIGHT]), frame_buffer: FrameBuffer([0; DISPLAY_WIDTH * DISPLAY_HEIGHT]),
} }
} }

6
src/core/gpu/obj.rs
View file

@ -96,6 +96,7 @@ impl Gpu {
let screen_y = self.current_scanline; let screen_y = self.current_scanline;
// reset the scanline // reset the scanline
self.obj_line = Scanline::default(); self.obj_line = Scanline::default();
self.obj_line_priorities = Scanline([3; DISPLAY_WIDTH]);
for obj_num in (0..128).rev() { for obj_num in (0..128).rev() {
let obj = read_obj_attrs(sb, obj_num); let obj = read_obj_attrs(sb, obj_num);
if obj.is_hidden() { if obj.is_hidden() {
@ -140,6 +141,9 @@ impl Gpu {
if screen_x > DISPLAY_WIDTH { if screen_x > DISPLAY_WIDTH {
break; break;
} }
if self.obj_line_priorities[screen_x] < obj.2.priority() {
continue;
}
let mut sprite_y = screen_y - obj_y; let mut sprite_y = screen_y - obj_y;
let mut sprite_x = screen_x - obj_x; let mut sprite_x = screen_x - obj_x;
if (!is_affine) { if (!is_affine) {
@ -169,8 +173,8 @@ impl Gpu {
let pixel_color = let pixel_color =
self.get_palette_color(sb, pixel_index as u32, palette_bank, PALRAM_OFS_FG); self.get_palette_color(sb, pixel_index as u32, palette_bank, PALRAM_OFS_FG);
if pixel_color != Rgb15::TRANSPARENT { if pixel_color != Rgb15::TRANSPARENT {
// TODO - handle priority
self.obj_line[screen_x] = pixel_color; self.obj_line[screen_x] = pixel_color;
self.obj_line_priorities[screen_x] = obj.2.priority();
} }
} }
} }

2
src/core/gpu/sfx.rs
View file

@ -47,12 +47,12 @@ impl Gpu {
bflags: BlendFlags, bflags: BlendFlags,
wflags: WindowFlags, wflags: WindowFlags,
) -> Option<Layer> { ) -> Option<Layer> {
// TODO - only BGs are supported, don't forget OBJs
// priorities are 0-4 when 0 is the highest // priorities are 0-4 when 0 is the highest
'outer: for priority in 0..4 { 'outer: for priority in 0..4 {
if bflags.contains(BlendFlags::OBJ) if bflags.contains(BlendFlags::OBJ)
&& wflags.contains(WindowFlags::OBJ) && wflags.contains(WindowFlags::OBJ)
&& !self.obj_line[screen_x].is_transparent() && !self.obj_line[screen_x].is_transparent()
&& self.obj_line_priorities[screen_x] == priority
{ {
return Some(Layer { return Some(Layer {
color: self.obj_line[screen_x], color: self.obj_line[screen_x],