diff --git a/renderd7.cpp b/renderd7.cpp index a806976..0aa3c19 100644 --- a/renderd7.cpp +++ b/renderd7.cpp @@ -1213,10 +1213,10 @@ void RenderD7::RSettings::Draw(void) const RenderD7::DrawText(0, 50, 0.7f, DSEVENBLACK, "Metrik to Csv: " + csvstate); RenderD7::DrawText(0, 70, 0.7f, DSEVENBLACK, "Metrik Overlay: " + mtovlstate); RenderD7::DrawText(0, 90, 0.7f, DSEVENBLACK, "Force FPS: " + fpsstate); - 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, 110, 0.7f, DSEVENBLACK, "Metrik Screen: " + mtscreenstate); + /*RenderD7::DrawText(0, 130, 0.7f, DSEVENBLACK, "Metrik Text RGB: " + mttxtcolstate); RenderD7::DrawText(0, 150, 0.7f, DSEVENBLACK, "Metrik Alpha: " + mtcola); - RenderD7::DrawText(0, 170, 0.7f, DSEVENBLACK, "Metrik Text Alpha: " + mttxtcola); + RenderD7::DrawText(0, 170, 0.7f, DSEVENBLACK, "Metrik Text Alpha: " + mttxtcola);*/ RenderD7::OnScreen(Bottom); std::string verc = "Config Version: "; verc += CFGVER; @@ -1241,10 +1241,12 @@ void RenderD7::RSettings::Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition tou rd7srstate = rd7_superreselution ? "true" : "false"; csvstate = mt_dumpcsv ? "true" : "false"; mtovlstate = metrikd ? "true" : "false"; - fpsstate = d11framerate; + fpsstate = cfgstruct["settings"]["forceFrameRate"]; + mtscreenstate = mt_screen ? "Top" : "Bottom"; if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[0])) { RenderD7::ToggleRD7SR(); + cfgstruct["settings"]["super-reselution"] = rd7_superreselution ? "1" : "0"; } if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[1])) { @@ -1266,6 +1268,7 @@ void RenderD7::RSettings::Logic(u32 hDown, u32 hHeld, u32 hUp, touchPosition tou if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[2])) { metrikd = metrikd ? false : true; + cfgstruct["metril-settings"]["enableoverlay"] = metrikd ? "1" : "0"; } if (d7_hDown & KEY_TOUCH && RenderD7::touchTObj(d7_touch, buttons[3])) { diff --git a/renderd7.hpp b/renderd7.hpp index eea1307..62ca142 100644 --- a/renderd7.hpp +++ b/renderd7.hpp @@ -167,7 +167,7 @@ namespace RenderD7 std::string csvstate = "false"; std::string mtovlstate = "false"; std::string fpsstate = "60"; - std::string mtcolstate = "#000000"; + std::string mtscreenstate = "Top"; std::string mttxtcolstate = "#ffffff"; std::string mtcola = "255"; std::string mttxtcola = "255"; @@ -179,10 +179,10 @@ namespace RenderD7 {20, 85, 120, 35, "MT_CSV", -15, 9}, {20, 135, 120, 35, "MT_OVL", -19, 10}, {20, 185, 120, 35, "FPS", 6, 10}, - {180, 35, 120, 35, "MTCOL", -10, 10}, - {180, 85, 120, 35, "MTTEXT", -13, 10}, - {180, 135, 120, 35, "MTA", 2, 10}, - {180, 185, 120, 35, "MTTXTA", -13, 10} + {180, 35, 120, 35, "MTSCREEN", -10, 10}, + {180, 85, 120, 35, "", -13, 10}, + {180, 135, 120, 35, "", 2, 10}, + {180, 185, 120, 35, "", -13, 10} }; public: RSettings();