From 7a13681d90106d18170de09f6514f8e328dbdcf2 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Fri, 30 May 2025 23:12:16 +0300 Subject: [PATCH] Glitter: Renamed inner Disp Type enums --- src/CRE/Glitter/effect_inst.cpp | 14 ++++----- src/CRE/Glitter/file_reader.cpp | 8 +++--- src/CRE/Glitter/file_writer.cpp | 4 +-- src/CRE/Glitter/glitter.hpp | 38 ++++++++++++------------- src/CRE/render_manager.cpp | 8 +++--- src/ReDIVA/data_edit/glitter_editor.cpp | 4 +-- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/CRE/Glitter/effect_inst.cpp b/src/CRE/Glitter/effect_inst.cpp index f098d1df..ab2a143c 100644 --- a/src/CRE/Glitter/effect_inst.cpp +++ b/src/CRE/Glitter/effect_inst.cpp @@ -365,8 +365,8 @@ namespace Glitter { } DispType F2EffectInst::GetDispType() { - if (data.flags & EFFECT_ALPHA) - return DISP_ALPHA; + if (data.flags & EFFECT_PRE_TRANSLUCENT) + return DISP_PRE_TRANSLUCENT; return DISP_NORMAL; } @@ -689,7 +689,7 @@ namespace Glitter { counter.Increment(); if (load_flags & 0x01) - enum_or(flags, EFFECT_INST_FLAG_23); + enum_or(flags, EFFECT_INST_POST_TRANSLUCENT); if (data.flags & EFFECT_USE_SEED) random = data.seed; @@ -1054,10 +1054,10 @@ namespace Glitter { DispType XEffectInst::GetDispType() { if (data.flags & EFFECT_LOCAL) return DISP_LOCAL; - else if (data.flags & EFFECT_ALPHA) - return DISP_ALPHA; - else if (flags & EFFECT_INST_FLAG_23) - return DISP_TYPE_2; + else if (data.flags & EFFECT_PRE_TRANSLUCENT) + return DISP_PRE_TRANSLUCENT; + else if (flags & EFFECT_INST_POST_TRANSLUCENT) + return DISP_POST_TRANSLUCENT; return DISP_NORMAL; } diff --git a/src/CRE/Glitter/file_reader.cpp b/src/CRE/Glitter/file_reader.cpp index b93cbcb9..e2e2c052 100644 --- a/src/CRE/Glitter/file_reader.cpp +++ b/src/CRE/Glitter/file_reader.cpp @@ -1133,8 +1133,8 @@ namespace Glitter { } d += 56; - if (flags & EFFECT_FILE_ALPHA) - enum_or(eff->data.flags, EFFECT_ALPHA); + if (flags & EFFECT_FILE_PRE_TRANSLUCENT) + enum_or(eff->data.flags, EFFECT_PRE_TRANSLUCENT); if (flags & EFFECT_FILE_FOG) enum_or(eff->data.flags, EFFECT_FOG); @@ -1330,8 +1330,8 @@ namespace Glitter { } d += 56; - if (flags & EFFECT_FILE_ALPHA) - enum_or(eff->data.flags, EFFECT_ALPHA); + if (flags & EFFECT_FILE_PRE_TRANSLUCENT) + enum_or(eff->data.flags, EFFECT_PRE_TRANSLUCENT); if (flags & EFFECT_FILE_FOG) enum_or(eff->data.flags, EFFECT_FOG); diff --git a/src/CRE/Glitter/file_writer.cpp b/src/CRE/Glitter/file_writer.cpp index 7665a71c..aebd9af4 100644 --- a/src/CRE/Glitter/file_writer.cpp +++ b/src/CRE/Glitter/file_writer.cpp @@ -705,8 +705,8 @@ namespace Glitter { size_t d = (size_t)st->data.data(); EffectFileFlag flags = (EffectFileFlag)0; - if (eff->data.flags & EFFECT_ALPHA) - enum_or(flags, EFFECT_FILE_ALPHA); + if (eff->data.flags & EFFECT_PRE_TRANSLUCENT) + enum_or(flags, EFFECT_FILE_PRE_TRANSLUCENT); if (eff->data.flags & EFFECT_FOG) enum_or(flags, EFFECT_FILE_FOG); diff --git a/src/CRE/Glitter/glitter.hpp b/src/CRE/Glitter/glitter.hpp index 457332ca..cd88ff35 100644 --- a/src/CRE/Glitter/glitter.hpp +++ b/src/CRE/Glitter/glitter.hpp @@ -136,11 +136,11 @@ namespace Glitter { }; enum DispType { - DISP_OPAQUE = 0, - DISP_NORMAL = 1, - DISP_ALPHA = 2, // 3 in X - DISP_TYPE_2 = 3, // 2 in X - DISP_LOCAL = 4, + DISP_OPAQUE = 0, + DISP_NORMAL = 1, + DISP_PRE_TRANSLUCENT = 2, // 3 in X + DISP_POST_TRANSLUCENT = 3, // 2 in X + DISP_LOCAL = 4, }; enum EffectExtAnimFlag { @@ -178,22 +178,22 @@ namespace Glitter { }; enum EffectFlag { - EFFECT_NONE = 0x00, - EFFECT_LOOP = 0x01, - EFFECT_LOCAL = 0x02, - EFFECT_ALPHA = 0x04, - EFFECT_FOG = 0x08, - EFFECT_FOG_HEIGHT = 0x10, - EFFECT_EMISSION = 0x20, - EFFECT_USE_SEED = 0x40, + EFFECT_NONE = 0x00, + EFFECT_LOOP = 0x01, + EFFECT_LOCAL = 0x02, + EFFECT_PRE_TRANSLUCENT = 0x04, + EFFECT_FOG = 0x08, + EFFECT_FOG_HEIGHT = 0x10, + EFFECT_EMISSION = 0x20, + EFFECT_USE_SEED = 0x40, }; enum EffectFileFlag { - EFFECT_FILE_ALPHA = 0x01, - EFFECT_FILE_FOG = 0x02, - EFFECT_FILE_FOG_HEIGHT = 0x04, - EFFECT_FILE_EMISSION = 0x08, - EFFECT_FILE_USE_SEED = 0x10, + EFFECT_FILE_PRE_TRANSLUCENT = 0x01, + EFFECT_FILE_FOG = 0x02, + EFFECT_FILE_FOG_HEIGHT = 0x04, + EFFECT_FILE_EMISSION = 0x08, + EFFECT_FILE_USE_SEED = 0x10, }; enum EffectInstFlag { @@ -220,7 +220,7 @@ namespace Glitter { EFFECT_INST_DISP = 0x0080000, EFFECT_INST_CAMERA = 0x0100000, EFFECT_INST_MESH = 0x0200000, - EFFECT_INST_FLAG_23 = 0x0400000, + EFFECT_INST_POST_TRANSLUCENT = 0x0400000, EFFECT_INST_JUST_INIT = 0x0800000, EFFECT_INST_NOT_ENDED = 0x1000000, }; diff --git a/src/CRE/render_manager.cpp b/src/CRE/render_manager.cpp index 5b238bca..8c6c0e8f 100644 --- a/src/CRE/render_manager.cpp +++ b/src/CRE/render_manager.cpp @@ -1068,7 +1068,7 @@ namespace rndr { rend_data_ctx.state.disable_depth_test(); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); - Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_ALPHA, cam); + Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_PRE_TRANSLUCENT, cam); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); /*if (npr_param == 1) { @@ -1090,7 +1090,7 @@ namespace rndr { } rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); // X - Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_TYPE_2, cam); + Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_POST_TRANSLUCENT, cam); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); rend_data_ctx.state.set_depth_mask(GL_TRUE); @@ -2059,7 +2059,7 @@ static void draw_pass_reflect_full(render_data_context& rend_data_ctx, rndr::Ren rend_data_ctx.state.disable_depth_test(); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); - Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_ALPHA, cam); + Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_PRE_TRANSLUCENT, cam); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); /*if (npr_param == 1) { @@ -2082,7 +2082,7 @@ static void draw_pass_reflect_full(render_data_context& rend_data_ctx, rndr::Ren } rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); // X - Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_TYPE_2, cam); + Glitter::glt_particle_manager->DispScenes(rend_data_ctx, Glitter::DISP_POST_TRANSLUCENT, cam); rend_data_ctx.state.set_color_mask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); rend_data_ctx.state.disable_depth_test(); diff --git a/src/ReDIVA/data_edit/glitter_editor.cpp b/src/ReDIVA/data_edit/glitter_editor.cpp index f2fa7b52..eb297b6e 100644 --- a/src/ReDIVA/data_edit/glitter_editor.cpp +++ b/src/ReDIVA/data_edit/glitter_editor.cpp @@ -2952,9 +2952,9 @@ static void glitter_editor_property_effect(GlitterEditor* glt_edt) { Glitter::EFFECT_LOOP)) changed = true; - if (ImGui::CheckboxFlagsEnterKeyPressed("Draw as Transparent", + if (ImGui::CheckboxFlagsEnterKeyPressed("Draw before Translucent Geometry", (uint32_t*)&effect->data.flags, - Glitter::EFFECT_ALPHA)) + Glitter::EFFECT_PRE_TRANSLUCENT)) changed = true; if (ImGui::CheckboxFlagsEnterKeyPressed("Fog",