nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only change color if it has changed in nightmode settings

Browse Source 
This also fixes a more common crash on config load
This commit is contained in:
BenCat07 2020-07-30 11:03:18 +02:00
parent 1fbed11f9b
commit b3188a6344
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hooks/visual/FrameStageNotify.cpp
View File

@ -65,26 +65,44 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_, ClientFrameStage_t sta
if (should_filter) if (should_filter)
{ {
if (should_filter == 1 && *nightmode_gui > 0.0f) if (should_filter == 1 && *nightmode_gui > 0.0f)
{ {
// Map to PI/2 so we get full color scale // Map to PI/2 so we get full color scale
rgba_t draw_color = colors::Fade(colors::white, *nightmode_gui_color, (*nightmode_gui / 100.0f) * (PI / 2), 1.0f); rgba_t draw_color = colors::Fade(colors::white, *nightmode_gui_color, (*nightmode_gui / 100.0f) * (PI / 2), 1.0f);
pMaterial->ColorModulate(draw_color.r, draw_color.g, draw_color.b); // Check for change
pMaterial->AlphaModulate((*nightmode_gui_color).a); float r, g, b, a;
pMaterial->GetColorModulation(&r, &g, &b);
a = pMaterial->GetAlphaModulation();
if (r != draw_color.r || g != draw_color.g || b != draw_color.b)
pMaterial->ColorModulate(draw_color.r, draw_color.g, draw_color.b);
if (a != draw_color.a)
pMaterial->AlphaModulate((*nightmode_gui_color).a);
} }
else if (should_filter == 2 && *nightmode_world > 0.0f) else if (should_filter == 2 && *nightmode_world > 0.0f)
{ {
// Map to PI/2 so we get full color scale // Map to PI/2 so we get full color scale
rgba_t draw_color = colors::Fade(colors::white, *nightmode_world_color, (*nightmode_world / 100.0f) * (PI / 2), 1.0f); rgba_t draw_color = colors::Fade(colors::white, *nightmode_world_color, (*nightmode_world / 100.0f) * (PI / 2), 1.0f);
pMaterial->ColorModulate(draw_color.r, draw_color.g, draw_color.b); // Check for change
pMaterial->AlphaModulate((*nightmode_world_color).a); float r, g, b, a;
pMaterial->GetColorModulation(&r, &g, &b);
a = pMaterial->GetAlphaModulation();
if (r != draw_color.r || g != draw_color.g || b != draw_color.b)
pMaterial->ColorModulate(draw_color.r, draw_color.g, draw_color.b);
if (a != draw_color.a)
pMaterial->AlphaModulate((*nightmode_world_color).a);
} }
else else
{ {
pMaterial->ColorModulate(1.0f, 1.0f, 1.0f); float r, g, b, a;
pMaterial->GetColorModulation(&r, &g, &b);
a = pMaterial->GetAlphaModulation();
if (r != 1.0f || g != 1.0f || b != 1.0f)
pMaterial->ColorModulate(1.0f, 1.0f, 1.0f);
if (a != 1.0f)
pMaterial->AlphaModulate(1.0f);
} }
} }
} }