Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-27 08:20:47 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[jak2] update sprite to check matrix == -1 (#2415)

Browse Source 
Fixes an issue where glow sprites are drawn twice, sometimes causing the
weird black outlines
This commit is contained in:
water111 2023-03-25 19:46:07 -04:00 committed by GitHub
parent 58654ce60b
commit d82ce11e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
game/graphics/opengl_renderer/sprite/Sprite3.cpp
View File

@ -503,6 +503,7 @@ void Sprite3::draw_debug_window() {
m_debug_stats.count_2d_grp1);
ImGui::Checkbox("Culling", &m_enable_culling);
ImGui::Checkbox("2d", &m_2d_enable);
ImGui::Checkbox("Glow", &m_enable_glow);
ImGui::SameLine();
ImGui::Checkbox("3d", &m_3d_enable);
ImGui::Checkbox("Distort", &m_distort_enable);
@ -730,6 +731,16 @@ void Sprite3::do_block_common(SpriteMode mode,
}
}
if (render_state->version > GameVersion::Jak1) {
// glow code sets the matrix to -1,
// jak 2 adds:
// ibltz vi08, L4
// which is set from ilw.y vi08, 1(vi02)
if (m_vec_data_2d[sprite_idx].matrix() == -1) {
continue;
}
}
auto& adgif = m_adgif[sprite_idx];
handle_tex0(adgif.tex0_data, render_state, prof);
handle_tex1(adgif.tex1_data, render_state, prof);

1
game/graphics/opengl_renderer/sprite/Sprite3.h
View File

@ -163,6 +163,7 @@ class Sprite3 : public BucketRenderer {
bool m_enable_distort_instancing = true;
bool m_enable_culling = true;
bool m_enable_glow = true;
bool m_2d_enable = true;
bool m_3d_enable = true;

9
game/graphics/opengl_renderer/sprite/Sprite3_Glow.cpp
View File

@ -213,10 +213,13 @@ void Sprite3::glow_dma_and_draw(DmaFollower& dma,
ASSERT(vecdata_xfer.size_bytes == 4 * 16);
ASSERT(shader_xfer.size_bytes == 5 * 16);
auto* out = m_glow_renderer.alloc_sprite();
if (!glow_math(&consts, vecdata_xfer.data, shader_xfer.data, out)) {
m_glow_renderer.cancel_sprite();
if (m_enable_glow) {
auto* out = m_glow_renderer.alloc_sprite();
if (!glow_math(&consts, vecdata_xfer.data, shader_xfer.data, out)) {
m_glow_renderer.cancel_sprite();
}
}
control_xfer = dma.read_and_advance();
while (control_xfer.size_bytes == 0 && control_xfer.vifcode0().kind == VifCode::Kind::NOP &&
control_xfer.vifcode1().kind == VifCode::Kind::NOP) {