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

gpu: Fix blending problems for light/darken

Browse source 
This issue rised in Pokemon Emerald main menu, where all the menu items
are highlighted and not just the selected one.


Former-commit-id: 503652ad5d8fccb37603a1c5df670632e02b2f14
This commit is contained in:
Michel Heily 2020-04-30 08:41:57 +03:00
parent ecd916cae3
commit 08bda05d52
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rustboyadvance-core/src/core/gpu/sfx.rs
View file

@ -200,23 +200,21 @@ impl Gpu {
if !(top_layer_flags.contains_render_layer(&layers[0]) || obj_sfx) { if !(top_layer_flags.contains_render_layer(&layers[0]) || obj_sfx) {
break 'blend; break 'blend;
} }
if layers.len() > 1 && !(bot_layer_flags.contains_render_layer(&layers[1])) {
break 'blend;
}
let mut blend_mode = self.bldcnt.mode();
// push another backdrop layer in case there is only 1 layer
// unsafe { layers.push_unchecked(RenderLayer::backdrop(backdrop_color)); }
// if this is object alpha blending, ensure that the bottom layer contains a color to blend with // if this is object alpha blending, ensure that the bottom layer contains a color to blend with
if obj_sfx && layers.len() > 1 && bot_layer_flags.contains_render_layer(&layers[1]) let blend_mode = if obj_sfx && layers.len() > 1 && bot_layer_flags.contains_render_layer(&layers[1]) {
{ BldMode::BldAlpha
blend_mode = BldMode::BldAlpha; } else {
} self.bldcnt.mode()
};
match blend_mode { match blend_mode {
BldMode::BldAlpha => { BldMode::BldAlpha => {
let bot_pixel = if layers.len() > 1 { let bot_pixel = if layers.len() > 1 {
if !(bot_layer_flags.contains_render_layer(&layers[1])) {
break 'blend;
}
layers[1].pixel //self.layer_to_pixel(x, y, &layers[1]) layers[1].pixel //self.layer_to_pixel(x, y, &layers[1])
} else { } else {
backdrop_color backdrop_color