tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update renderd7.cpp

Browse Source
This commit is contained in:
tobid7
2021-11-28 05:37:58 +01:00
committed by GitHub
parent aa6c96c9a3
commit 6c03dde215
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
renderd7.cpp
View File

@@ -36,6 +36,9 @@ float d11framerate = 0;
//Metrik------------------------------------- //Metrik-------------------------------------
u32 mt_color; u32 mt_color;
u32 mt_txtcolor;
C3D_RenderTarget *mt_screen;
float mt_txtSize;
//------------------------------------------- //-------------------------------------------
bool currentScreen = false; bool currentScreen = false;
bool metrikd = false; bool metrikd = false;
@@ -546,8 +549,11 @@ Result RenderD7::Init::Main(std::string app_name)
cfgstruct["settings"]["super-reselution"] = "0"; cfgstruct["settings"]["super-reselution"] = "0";
cfgstruct["metrik-settings"]["enableoverlay"] = "0"; cfgstruct["metrik-settings"]["enableoverlay"] = "0";
cfgstruct["metrik-settings"]["Screen"] = "0"; cfgstruct["metrik-settings"]["Screen"] = "0";
cfgstruct["metrik-settings"]["Color"] = "#ffffff"; cfgstruct["metrik-settings"]["txtColor"] = "#ffffff";
cfgstruct["metrik-settings"]["ColorA"] = "255"; cfgstruct["metrik-settings"]["txtColorA"] = "255";
cfgstruct["metrik-settings"]["ColorA"] = "255";
cfgstruct["metrik-settings"]["Color"] = "#000000";
cfgstruct["metrik-settings"]["txtSize"] = "0.7f";
cfgfile->write(cfgstruct); cfgfile->write(cfgstruct);
} }
cfgfile = std::make_unique<INI::INIFile>(cfgpath+ "/config.ini"); cfgfile = std::make_unique<INI::INIFile>(cfgpath+ "/config.ini");
@@ -555,8 +561,19 @@ Result RenderD7::Init::Main(std::string app_name)
std::string Fps = cfgstruct["settings"]["forceFrameRate"]; std::string Fps = cfgstruct["settings"]["forceFrameRate"];
C3D_FrameRate(RenderD7::Convert::StringtoFloat(Fps)); C3D_FrameRate(RenderD7::Convert::StringtoFloat(Fps));
metrikd = RenderD7::Convert::FloatToBool(RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["enableoverlay"])); metrikd = RenderD7::Convert::FloatToBool(RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["enableoverlay"]));
mt_color = RenderD7::Color::Hex(cfgstruct["metrik-settings"]["Color"], (u8)RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["ColorA"])); mt_txtcolor = RenderD7::Color::Hex(cfgstruct["metrik-settings"]["txtColor"], (u8)RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["txtColorA"]));
osSetSpeedupEnable(true); mt_color = RenderD7::Color::Hex(cfgstruct["metrik-settings"]["Color"], (u8)RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["ColorA"]));
mt_txtSize = RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["txtSize"]);
switch (RenderD7::Convert::StringtoFloat(cfgstruct["metrik-settings"]["txtSize"]))
{
case 0:
mt_screen = Top;
case 1:
mt_screen = Bottom;
default:
mt_screen = Bottom;
}
osSetSpeedupEnable(true);
/*if(metrikd) /*if(metrikd)
{ {
RenderD7::Thread tr(MetrikThread); RenderD7::Thread tr(MetrikThread);
@@ -805,8 +822,8 @@ void RenderD7::DrawList1(RenderD7::ScrollList1 &l, float txtsize, C3D_RenderTarg
void RenderD7::DrawMetrikOvl() void RenderD7::DrawMetrikOvl()
{ {
RenderD7::OnScreen(Top); RenderD7::OnScreen(mt_screen);
RenderD7::DrawText(0, 0, 0.6f, mt_color, "HI"); RenderD7::DrawText(0, 0, mt_txtSize, mt_txtcolor, "HI");
} }
/*RenderD7::Console::Console() /*RenderD7::Console::Console()