RenderD7 Settings Fix

This commit is contained in:
skymz4 2022-04-25 17:06:35 +02:00 committed by GitHub
parent d07d2a246a
commit 2cc908b043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -742,6 +742,7 @@ void RenderD7::ToggleRD7SR()
C3D_FrameEnd(0); C3D_FrameEnd(0);
// Toggle 400px/800px mode // Toggle 400px/800px mode
gfxSetWide(gfxIsWide() ? false : true); gfxSetWide(gfxIsWide() ? false : true);
rd7_superreselution = gfxIsWide();
RenderD7::Init::Reload(); RenderD7::Init::Reload();
} }
@ -1210,7 +1211,7 @@ void RenderD7::RSettings::Draw(void) const
RenderD7::DrawTextLeft(400, 0, 0.7f, RenderD7::Color::Hex("#ffffff"), RENDERD7VSTRING); RenderD7::DrawTextLeft(400, 0, 0.7f, RenderD7::Color::Hex("#ffffff"), RENDERD7VSTRING);
RenderD7::DrawText(0, 30, 0.7f, DSEVENBLACK, "RD7SR: " + rd7srstate); RenderD7::DrawText(0, 30, 0.7f, DSEVENBLACK, "RD7SR: " + rd7srstate);
RenderD7::DrawText(0, 50, 0.7f, DSEVENBLACK, "Metrik to Csv: " + csvstate); RenderD7::DrawText(0, 50, 0.7f, DSEVENBLACK, "Metrik to Csv: " + csvstate);
RenderD7::DrawText(0, 70, 0.7f, DSEVENBLACK, "Metrik to Csv-Loop: " + csvlstate); RenderD7::DrawText(0, 70, 0.7f, DSEVENBLACK, "Metrik Overlay: " + mtovlstate);
RenderD7::DrawText(0, 90, 0.7f, DSEVENBLACK, "Force FPS: " + fpsstate); RenderD7::DrawText(0, 90, 0.7f, DSEVENBLACK, "Force FPS: " + fpsstate);
RenderD7::DrawText(0, 110, 0.7f, DSEVENBLACK, "Metrik BG RGB: " + mtcolstate); RenderD7::DrawText(0, 110, 0.7f, DSEVENBLACK, "Metrik BG RGB: " + mtcolstate);
RenderD7::DrawText(0, 130, 0.7f, DSEVENBLACK, "Metrik Text RGB: " + mttxtcolstate); RenderD7::DrawText(0, 130, 0.7f, DSEVENBLACK, "Metrik Text RGB: " + mttxtcolstate);
@ -1239,7 +1240,7 @@ void RenderD7::RSettings::Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition tou
{ {
rd7srstate = rd7_superreselution ? "true" : "false"; rd7srstate = rd7_superreselution ? "true" : "false";
csvstate = mt_dumpcsv ? "true" : "false"; csvstate = mt_dumpcsv ? "true" : "false";
csvlstate = mt_csvloop ? "true" : "false"; mtovlstate = metrikd ? "true" : "false";
fpsstate = d11framerate; fpsstate = d11framerate;
if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[0])) if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[0]))
{ {
@ -1264,7 +1265,7 @@ void RenderD7::RSettings::Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition tou
} }
if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[2])) if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[2]))
{ {
mt_csvloop = mt_csvloop ? false : true; metrikd = metrikd ? false : true;
} }
if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[3])) if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[3]))
{ {

View File

@ -165,7 +165,7 @@ namespace RenderD7
private: private:
std::string rd7srstate = "false"; std::string rd7srstate = "false";
std::string csvstate = "false"; std::string csvstate = "false";
std::string csvlstate = "false"; std::string mtovlstate = "false";
std::string fpsstate = "60"; std::string fpsstate = "60";
std::string mtcolstate = "#000000"; std::string mtcolstate = "#000000";
std::string mttxtcolstate = "#ffffff"; std::string mttxtcolstate = "#ffffff";
@ -177,7 +177,7 @@ namespace RenderD7
{ {
{20, 35, 120, 35, "RD7SR", -11, 10}, {20, 35, 120, 35, "RD7SR", -11, 10},
{20, 85, 120, 35, "MT_CSV", -15, 9}, {20, 85, 120, 35, "MT_CSV", -15, 9},
{20, 135, 120, 35, "MT_CSV-L", -19, 10}, {20, 135, 120, 35, "MT_OVL", -19, 10},
{20, 185, 120, 35, "FPS", 6, 10}, {20, 185, 120, 35, "FPS", 6, 10},
{180, 35, 120, 35, "MTCOL", -10, 10}, {180, 35, 120, 35, "MTCOL", -10, 10},
{180, 85, 120, 35, "MTTEXT", -13, 10}, {180, 85, 120, 35, "MTTEXT", -13, 10},