tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1c4917fab4
renderd7/source/Overlays.cpp

497 lines
20 KiB
C++
Raw Normal View History

0.9.5 preview1
2024-02-19 19:20:37 +01:00
#include <renderd7/FunctionTrace.hpp>
#include <renderd7/Hid.hpp>
#include <renderd7/Overlays.hpp>
#include <renderd7/internal_db.hpp>
#include <renderd7/renderd7.hpp>
///////////////////////////////
struct Key {
std::string disp;
R7Vec2 pos;
R7Vec2 size;
// 0 = default key
// 1 = Shift
// 2 = Backsp
// 3 = Enter
// 4 = Cancel
// 5 = Confirm
// 6 = Tab
// 7 = Caps
// 8 = Space
int action = 0;
};
Changes: New Theme API NumPad UI7 Color Selector Color 2 Hex UI7 New Draw API (DrawCmd) UI7 New Debug API (DrawCmd) Add ThemeEditor Base
2024-06-05 12:32:51 +02:00
std::vector<Key> keyboard_layout_num{
// 1st row
{"7", R7Vec2(5, 135), R7Vec2(36, 24), 0},
{"8", R7Vec2(43, 135), R7Vec2(36, 24), 0},
{"9", R7Vec2(81, 135), R7Vec2(36, 24), 0},
// 2nd row
{"4", R7Vec2(5, 161), R7Vec2(36, 24), 0},
{"5", R7Vec2(43, 161), R7Vec2(36, 24), 0},
{"6", R7Vec2(81, 161), R7Vec2(36, 24), 0},
// 3rd row
{"1", R7Vec2(5, 187), R7Vec2(36, 24), 0},
{"2", R7Vec2(43, 187), R7Vec2(36, 24), 0},
{"3", R7Vec2(81, 187), R7Vec2(36, 24), 0},
// 4th row
{"0", R7Vec2(5, 213), R7Vec2(74, 24), 0},
{".", R7Vec2(81, 213), R7Vec2(36, 24), 0},
// additional actions
Changes: Formatting UI7 Docs/Sizing R2::GetCurrentScreenSize Hardware Fix BatteryPercent/AddGetWifiLevel
2024-06-16 22:28:16 +02:00
{"<---", R7Vec2(119, 135), R7Vec2(74, 24), 2},
Changes: New Theme API NumPad UI7 Color Selector Color 2 Hex UI7 New Draw API (DrawCmd) UI7 New Debug API (DrawCmd) Add ThemeEditor Base
2024-06-05 12:32:51 +02:00
//{"", R7Vec2(119, 161), R7Vec2(74, 24), 0},
{"Confirm", R7Vec2(119, 187), R7Vec2(74, 24), 5},
{"Cancel", R7Vec2(119, 213), R7Vec2(74, 24), 4},
};
0.9.5 preview1
2024-02-19 19:20:37 +01:00
std::vector<Key> keyboard_layout = {
// 1st row
{"`", R7Vec2(5, 137), R7Vec2(18, 18), 0},
{"1", R7Vec2(25, 137), R7Vec2(18, 18), 0},
{"2", R7Vec2(45, 137), R7Vec2(18, 18), 0},
{"3", R7Vec2(65, 137), R7Vec2(18, 18), 0},
{"4", R7Vec2(85, 137), R7Vec2(18, 18), 0},
{"5", R7Vec2(105, 137), R7Vec2(18, 18), 0},
{"6", R7Vec2(125, 137), R7Vec2(18, 18), 0},
{"7", R7Vec2(145, 137), R7Vec2(18, 18), 0},
{"8", R7Vec2(165, 137), R7Vec2(18, 18), 0},
{"9", R7Vec2(185, 137), R7Vec2(18, 18), 0},
{"0", R7Vec2(205, 137), R7Vec2(18, 18), 0},
{"-", R7Vec2(225, 137), R7Vec2(18, 18), 0},
{"=", R7Vec2(245, 137), R7Vec2(18, 18), 0},
Changes: Formatting UI7 Docs/Sizing R2::GetCurrentScreenSize Hardware Fix BatteryPercent/AddGetWifiLevel
2024-06-16 22:28:16 +02:00
{"<---", R7Vec2(265, 137), R7Vec2(50, 18), 2},
0.9.5 preview1
2024-02-19 19:20:37 +01:00
// 2nd row
{"Tab", R7Vec2(5, 157), R7Vec2(40, 18), 6},
{"q", R7Vec2(47, 157), R7Vec2(18, 18), 0},
{"w", R7Vec2(67, 157), R7Vec2(18, 18), 0},
{"e", R7Vec2(87, 157), R7Vec2(18, 18), 0},
{"r", R7Vec2(107, 157), R7Vec2(18, 18), 0},
{"t", R7Vec2(127, 157), R7Vec2(18, 18), 0},
{"y", R7Vec2(147, 157), R7Vec2(18, 18), 0},
{"u", R7Vec2(167, 157), R7Vec2(18, 18), 0},
{"i", R7Vec2(187, 157), R7Vec2(18, 18), 0},
{"o", R7Vec2(207, 157), R7Vec2(18, 18), 0},
{"p", R7Vec2(227, 157), R7Vec2(18, 18), 0},
{"[", R7Vec2(247, 157), R7Vec2(18, 18), 0},
{"]", R7Vec2(267, 157), R7Vec2(18, 18), 0},
{"\\", R7Vec2(287, 157), R7Vec2(28, 18), 0},
// 3rd row
{"Caps", R7Vec2(5, 177), R7Vec2(50, 18), 7},
{"a", R7Vec2(57, 177), R7Vec2(18, 18), 0},
{"s", R7Vec2(77, 177), R7Vec2(18, 18), 0},
{"d", R7Vec2(97, 177), R7Vec2(18, 18), 0},
{"f", R7Vec2(117, 177), R7Vec2(18, 18), 0},
{"g", R7Vec2(137, 177), R7Vec2(18, 18), 0},
{"h", R7Vec2(157, 177), R7Vec2(18, 18), 0},
{"j", R7Vec2(177, 177), R7Vec2(18, 18), 0},
{"k", R7Vec2(197, 177), R7Vec2(18, 18), 0},
{"l", R7Vec2(217, 177), R7Vec2(18, 18), 0},
{";", R7Vec2(237, 177), R7Vec2(18, 18), 0},
{"'", R7Vec2(257, 177), R7Vec2(18, 18), 0},
{"Enter", R7Vec2(277, 177), R7Vec2(38, 18), 3},
// 4th row
{"Shift", R7Vec2(5, 197), R7Vec2(60, 18), 1},
{"z", R7Vec2(67, 197), R7Vec2(18, 18), 0},
{"x", R7Vec2(87, 197), R7Vec2(18, 18), 0},
{"c", R7Vec2(107, 197), R7Vec2(18, 18), 0},
{"v", R7Vec2(127, 197), R7Vec2(18, 18), 0},
{"b", R7Vec2(147, 197), R7Vec2(18, 18), 0},
{"n", R7Vec2(167, 197), R7Vec2(18, 18), 0},
{"m", R7Vec2(187, 197), R7Vec2(18, 18), 0},
{",", R7Vec2(207, 197), R7Vec2(18, 18), 0},
{".", R7Vec2(227, 197), R7Vec2(18, 18), 0},
{"/", R7Vec2(247, 197), R7Vec2(18, 18), 0},
{"Shift", R7Vec2(267, 197), R7Vec2(48, 18), 1},
// 5th row
{"Cancel", R7Vec2(5, 217), R7Vec2(70, 18), 4},
{"(X)", R7Vec2(77, 217), R7Vec2(23, 18), 10},
{"Space", R7Vec2(102, 217), R7Vec2(108, 18), 8},
{"(!)", R7Vec2(212, 217), R7Vec2(23, 18), 10},
{"Confirm", R7Vec2(237, 217), R7Vec2(78, 18), 5},
/*{"←", R7Vec2(237, 217), R7Vec2(18, 18)},
{"→", R7Vec2(257, 217), R7Vec2(18, 18)},
{"↓", R7Vec2(277, 217), R7Vec2(18, 18)},
{"↑", R7Vec2(297, 217), R7Vec2(18, 18)},*/
};
std::vector<Key> keyboard_layout_caps = {
// 1st row
{"`", R7Vec2(5, 137), R7Vec2(18, 18), 0},
{"1", R7Vec2(25, 137), R7Vec2(18, 18), 0},
{"2", R7Vec2(45, 137), R7Vec2(18, 18), 0},
{"3", R7Vec2(65, 137), R7Vec2(18, 18), 0},
{"4", R7Vec2(85, 137), R7Vec2(18, 18), 0},
{"5", R7Vec2(105, 137), R7Vec2(18, 18), 0},
{"6", R7Vec2(125, 137), R7Vec2(18, 18), 0},
{"7", R7Vec2(145, 137), R7Vec2(18, 18), 0},
{"8", R7Vec2(165, 137), R7Vec2(18, 18), 0},
{"9", R7Vec2(185, 137), R7Vec2(18, 18), 0},
{"0", R7Vec2(205, 137), R7Vec2(18, 18), 0},
{"-", R7Vec2(225, 137), R7Vec2(18, 18), 0},
{"=", R7Vec2(245, 137), R7Vec2(18, 18), 0},
Changes: Formatting UI7 Docs/Sizing R2::GetCurrentScreenSize Hardware Fix BatteryPercent/AddGetWifiLevel
2024-06-16 22:28:16 +02:00
{"<---", R7Vec2(265, 137), R7Vec2(50, 18), 2},
0.9.5 preview1
2024-02-19 19:20:37 +01:00
// 2nd row
{"Tab", R7Vec2(5, 157), R7Vec2(40, 18), 6},
{"Q", R7Vec2(47, 157), R7Vec2(18, 18), 0},
{"W", R7Vec2(67, 157), R7Vec2(18, 18), 0},
{"E", R7Vec2(87, 157), R7Vec2(18, 18), 0},
{"R", R7Vec2(107, 157), R7Vec2(18, 18), 0},
{"T", R7Vec2(127, 157), R7Vec2(18, 18), 0},
{"Y", R7Vec2(147, 157), R7Vec2(18, 18), 0},
{"U", R7Vec2(167, 157), R7Vec2(18, 18), 0},
{"I", R7Vec2(187, 157), R7Vec2(18, 18), 0},
{"O", R7Vec2(207, 157), R7Vec2(18, 18), 0},
{"P", R7Vec2(227, 157), R7Vec2(18, 18), 0},
{"[", R7Vec2(247, 157), R7Vec2(18, 18), 0},
{"]", R7Vec2(267, 157), R7Vec2(18, 18), 0},
{"\\", R7Vec2(287, 157), R7Vec2(28, 18), 0},
// 3rd row
{"Caps", R7Vec2(5, 177), R7Vec2(50, 18), 7},
{"A", R7Vec2(57, 177), R7Vec2(18, 18), 0},
{"S", R7Vec2(77, 177), R7Vec2(18, 18), 0},
{"D", R7Vec2(97, 177), R7Vec2(18, 18), 0},
{"F", R7Vec2(117, 177), R7Vec2(18, 18), 0},
{"G", R7Vec2(137, 177), R7Vec2(18, 18), 0},
{"H", R7Vec2(157, 177), R7Vec2(18, 18), 0},
{"J", R7Vec2(177, 177), R7Vec2(18, 18), 0},
{"K", R7Vec2(197, 177), R7Vec2(18, 18), 0},
{"L", R7Vec2(217, 177), R7Vec2(18, 18), 0},
{";", R7Vec2(237, 177), R7Vec2(18, 18), 0},
{"'", R7Vec2(257, 177), R7Vec2(18, 18), 0},
{"Enter", R7Vec2(277, 177), R7Vec2(38, 18), 3},
// 4th row
{"Shift", R7Vec2(5, 197), R7Vec2(60, 18), 1},
{"Z", R7Vec2(67, 197), R7Vec2(18, 18), 0},
{"X", R7Vec2(87, 197), R7Vec2(18, 18), 0},
{"C", R7Vec2(107, 197), R7Vec2(18, 18), 0},
{"V", R7Vec2(127, 197), R7Vec2(18, 18), 0},
{"B", R7Vec2(147, 197), R7Vec2(18, 18), 0},
{"N", R7Vec2(167, 197), R7Vec2(18, 18), 0},
{"M", R7Vec2(187, 197), R7Vec2(18, 18), 0},
{",", R7Vec2(207, 197), R7Vec2(18, 18), 0},
{".", R7Vec2(227, 197), R7Vec2(18, 18), 0},
{"/", R7Vec2(247, 197), R7Vec2(18, 18), 0},
{"Shift", R7Vec2(267, 197), R7Vec2(48, 18), 1},
// 5th row
{"Cancel", R7Vec2(5, 217), R7Vec2(70, 18), 4},
{"(X)", R7Vec2(77, 217), R7Vec2(23, 18), 10},
{"Space", R7Vec2(102, 217), R7Vec2(108, 18), 8},
{"(!)", R7Vec2(212, 217), R7Vec2(23, 18), 10},
{"Confirm", R7Vec2(237, 217), R7Vec2(78, 18), 5},
/*{"←", R7Vec2(237, 217), R7Vec2(18, 18)},
{"→", R7Vec2(257, 217), R7Vec2(18, 18)},
{"↑", R7Vec2(277, 217), R7Vec2(18, 18)},
{"↓", R7Vec2(297, 217), R7Vec2(18, 18)},*/
};
std::vector<Key> keyboard_layout_shift = {
// 1st row
{"~", R7Vec2(5, 137), R7Vec2(18, 18), 0},
{"!", R7Vec2(25, 137), R7Vec2(18, 18), 0},
{"@", R7Vec2(45, 137), R7Vec2(18, 18), 0},
{"#", R7Vec2(65, 137), R7Vec2(18, 18), 0},
{"$", R7Vec2(85, 137), R7Vec2(18, 18), 0},
{"%", R7Vec2(105, 137), R7Vec2(18, 18), 0},
{"^", R7Vec2(125, 137), R7Vec2(18, 18), 0},
{"&", R7Vec2(145, 137), R7Vec2(18, 18), 0},
{"*", R7Vec2(165, 137), R7Vec2(18, 18), 0},
{"(", R7Vec2(185, 137), R7Vec2(18, 18), 0},
{")", R7Vec2(205, 137), R7Vec2(18, 18), 0},
{"_", R7Vec2(225, 137), R7Vec2(18, 18), 0},
{"+", R7Vec2(245, 137), R7Vec2(18, 18), 0},
Changes: Formatting UI7 Docs/Sizing R2::GetCurrentScreenSize Hardware Fix BatteryPercent/AddGetWifiLevel
2024-06-16 22:28:16 +02:00
{"<---", R7Vec2(265, 137), R7Vec2(50, 18), 2},
0.9.5 preview1
2024-02-19 19:20:37 +01:00
// 2nd row
{"Tab", R7Vec2(5, 157), R7Vec2(40, 18), 6},
{"Q", R7Vec2(47, 157), R7Vec2(18, 18), 0},
{"W", R7Vec2(67, 157), R7Vec2(18, 18), 0},
{"E", R7Vec2(87, 157), R7Vec2(18, 18), 0},
{"R", R7Vec2(107, 157), R7Vec2(18, 18), 0},
{"T", R7Vec2(127, 157), R7Vec2(18, 18), 0},
{"Y", R7Vec2(147, 157), R7Vec2(18, 18), 0},
{"U", R7Vec2(167, 157), R7Vec2(18, 18), 0},
{"I", R7Vec2(187, 157), R7Vec2(18, 18), 0},
{"O", R7Vec2(207, 157), R7Vec2(18, 18), 0},
{"P", R7Vec2(227, 157), R7Vec2(18, 18), 0},
{"{", R7Vec2(247, 157), R7Vec2(18, 18), 0},
{"}", R7Vec2(267, 157), R7Vec2(18, 18), 0},
{"|", R7Vec2(287, 157), R7Vec2(28, 18), 0},
// 3rd row
{"Caps", R7Vec2(5, 177), R7Vec2(50, 18), 7},
{"A", R7Vec2(57, 177), R7Vec2(18, 18), 0},
{"S", R7Vec2(77, 177), R7Vec2(18, 18), 0},
{"D", R7Vec2(97, 177), R7Vec2(18, 18), 0},
{"F", R7Vec2(117, 177), R7Vec2(18, 18), 0},
{"G", R7Vec2(137, 177), R7Vec2(18, 18), 0},
{"H", R7Vec2(157, 177), R7Vec2(18, 18), 0},
{"J", R7Vec2(177, 177), R7Vec2(18, 18), 0},
{"K", R7Vec2(197, 177), R7Vec2(18, 18), 0},
{"L", R7Vec2(217, 177), R7Vec2(18, 18), 0},
{":", R7Vec2(237, 177), R7Vec2(18, 18), 0},
{"\"", R7Vec2(257, 177), R7Vec2(18, 18), 0},
{"Enter", R7Vec2(277, 177), R7Vec2(38, 18), 3},
// 4th row
{"Shift", R7Vec2(5, 197), R7Vec2(60, 18), 1},
{"Z", R7Vec2(67, 197), R7Vec2(18, 18), 0},
{"X", R7Vec2(87, 197), R7Vec2(18, 18), 0},
{"C", R7Vec2(107, 197), R7Vec2(18, 18), 0},
{"V", R7Vec2(127, 197), R7Vec2(18, 18), 0},
{"B", R7Vec2(147, 197), R7Vec2(18, 18), 0},
{"N", R7Vec2(167, 197), R7Vec2(18, 18), 0},
{"M", R7Vec2(187, 197), R7Vec2(18, 18), 0},
{"<", R7Vec2(207, 197), R7Vec2(18, 18), 0},
{">", R7Vec2(227, 197), R7Vec2(18, 18), 0},
{"?", R7Vec2(247, 197), R7Vec2(18, 18), 0},
{"Shift", R7Vec2(267, 197), R7Vec2(48, 18), 1},
// 5th row
{"Cancel", R7Vec2(5, 217), R7Vec2(70, 18), 4},
{"(X)", R7Vec2(77, 217), R7Vec2(23, 18), 10},
{"Space", R7Vec2(102, 217), R7Vec2(108, 18), 8},
{"(!)", R7Vec2(212, 217), R7Vec2(23, 18), 10},
{"Confirm", R7Vec2(237, 217), R7Vec2(78, 18), 5},
/*{"←", R7Vec2(237, 217), R7Vec2(18, 18)},
{"→", R7Vec2(257, 217), R7Vec2(18, 18)},
{"↑", R7Vec2(277, 217), R7Vec2(18, 18)},
{"↓", R7Vec2(297, 217), R7Vec2(18, 18)},*/
};
// From UI7
bool UI7_InBox(R7Vec2 inpos, R7Vec2 boxpos, R7Vec2 boxsize) {
if ((inpos.x > boxpos.x) && (inpos.y > boxpos.y) &&
(inpos.x < boxpos.x + boxsize.x) && (inpos.y < boxpos.y + boxsize.y))
return true;
return false;
}
namespace RenderD7 {
Ovl_Ftrace::Ovl_Ftrace(bool* is_enabled) { i_is_enabled = is_enabled; }
void Ovl_Ftrace::Draw(void) const {
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
float tmp_txt = R2()->GetTextSize();
R2()->DefaultTextSize();
R2()->OnScreen(R2Screen_Top);
Fix some Format stuff
2024-05-03 15:51:06 +02:00
RenderD7::Color::RGBA bg(RD7Color_Background);
bg.changeA(150);
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->AddRect(R7Vec2(0, 0), R7Vec2(400, 20), bg.toRGBA());
0.9.5 preview1
2024-02-19 19:20:37 +01:00
std::vector<RenderD7::Ftrace::FTRes> dt;
for (auto const& it : RenderD7::Ftrace::rd7_traces)
if (it.second.is_ovl && dt.size() < 10) dt.push_back(it.second);
for (size_t i = 0; i < (dt.size() < 10 ? dt.size() : 10); i++) {
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->AddText(R7Vec2(5, 30 + i * 15), dt[i].func_name, RD7Color_Text);
R2()->AddText(R7Vec2(295, 30 + i * 15), RenderD7::MsTimeFmt(dt[i].time_of),
RD7Color_Text);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->SetTextSize(tmp_txt);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
void Ovl_Ftrace::Logic() {
if (!i_is_enabled[0]) this->Kill();
}
Ovl_Metrik::Ovl_Metrik(bool* is_enabled, bool* screen, uint32_t* mt_color,
uint32_t* txt_color, float* txt_size) {
i_is_enabled = is_enabled;
i_screen = screen;
i_mt_color = mt_color;
i_txt_color = txt_color;
i_txt_size = txt_size;
}
void Ovl_Metrik::Draw(void) const {
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
float tmp_txt = R2()->GetTextSize();
R2()->DefaultTextSize();
R2()->OnScreen(i_screen[0] ? R2Screen_Bottom : R2Screen_Top);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
std::string info =
"RenderD7 " + std::string(RENDERD7VSTRING) + " Debug Overlay";
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
float dim_y = R2()->GetTextDimensions(info).y;
0.9.5 preview1
2024-02-19 19:20:37 +01:00
float infoy = 240 - dim_y;
mt_fps = "FPS: " + RenderD7::GetFramerate();
if (rd7i_idb_running) mt_fps += " IDB -> ON";
mt_cpu = "CPU: " +
std::to_string(C3D_GetProcessingTime() * (RenderD7::GetFps() / 10))
.substr(0, 4) +
"%/" + std::to_string(C3D_GetProcessingTime()).substr(0, 4) + "ms";
mt_gpu = "GPU: " +
std::to_string(C3D_GetDrawingTime() * (RenderD7::GetFps() / 10))
.substr(0, 4) +
"%/" + std::to_string(C3D_GetDrawingTime()).substr(0, 4) + "ms";
mt_cmd =
"CMD: " + std::to_string(C3D_GetCmdBufUsage() * 100.0f).substr(0, 4) +
"%";
mt_lfr = "Linear: " + RenderD7::FormatBytes(linearSpaceFree());
mt_tbs =
"TextBuf: " + std::to_string(C2D_TextBufGetNumGlyphs(rd7i_text_buffer)) +
"/4096";
Remove rd7tf/Add RD7Flags
2024-07-01 18:06:54 +02:00
if (rd7i_enable_memtrack)
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
mt_mem = "Mem: " + RenderD7::FormatBytes(RenderD7::Memory::GetCurrent()) +
" | " +
RenderD7::FormatBytes(RenderD7::Memory::GetTotalAllocated()) +
" | " + RenderD7::FormatBytes(RenderD7::Memory::GetTotalFreed());
R2()->AddRect(R7Vec2(0, 0), R2()->GetTextDimensions(mt_fps),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50), R2()->GetTextDimensions(mt_cpu),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50 + dim_y * 1), R2()->GetTextDimensions(mt_gpu),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50 + dim_y * 2), R2()->GetTextDimensions(mt_cmd),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50 + dim_y * 3), R2()->GetTextDimensions(mt_lfr),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50 + dim_y * 4), R2()->GetTextDimensions(mt_tbs),
(unsigned int)i_mt_color[0]);
Remove rd7tf/Add RD7Flags
2024-07-01 18:06:54 +02:00
if (rd7i_enable_memtrack)
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->AddRect(R7Vec2(0, 50 + dim_y * 5), R2()->GetTextDimensions(mt_mem),
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, infoy), R2()->GetTextDimensions(info),
(unsigned int)i_mt_color[0]);
R2()->AddText(R7Vec2(0, 0), mt_fps, (unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50), mt_cpu, (unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50 + dim_y * 1), mt_gpu,
(unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50 + dim_y * 2), mt_cmd,
(unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50 + dim_y * 3), mt_lfr,
(unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50 + dim_y * 4), mt_tbs,
(unsigned int)i_txt_color[0]);
Remove rd7tf/Add RD7Flags
2024-07-01 18:06:54 +02:00
if (rd7i_enable_memtrack)
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->AddText(R7Vec2(0, 50 + dim_y * 5), mt_mem,
(unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, infoy), info, (unsigned int)i_txt_color[0]);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
// Force Bottom (Debug Touchpos)
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->OnScreen(R2Screen_Bottom);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
if (Hid::IsEvent("touch", Hid::Held)) {
Changes: Fix some Typenames Add Sound to RD7 Namespace Add Line to Render2 Fix scrollbar dragging
2024-06-30 15:43:48 +02:00
R2()->AddLine(R7Vec2(Hid::GetTouchPosition().x, 0),
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R7Vec2(Hid::GetTouchPosition().x, 240),
RenderD7::Color::Hex("#ff0000"));
R2()->AddLine(R7Vec2(0, Hid::GetTouchPosition().y),
R7Vec2(320, Hid::GetTouchPosition().y),
Changes: Fix some Typenames Add Sound to RD7 Namespace Add Line to Render2 Fix scrollbar dragging
2024-06-30 15:43:48 +02:00
RenderD7::Color::Hex("#ff0000"));
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->SetTextSize(tmp_txt);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
void Ovl_Metrik::Logic() {
if (!i_is_enabled[0]) this->Kill();
}
Fix some Format stuff
2024-05-03 15:51:06 +02:00
Ovl_Keyboard::Ovl_Keyboard(std::string& ref, RD7KeyboardState& state,
const std::string& hint, RD7Keyboard type) {
0.9.5 preview1
2024-02-19 19:20:37 +01:00
// Blocks All Input outside of Keyboard
// Doesnt work for Hidkeys down etc
RenderD7::Hid::Lock();
typed_text = &ref;
Fix some Format stuff
2024-05-03 15:51:06 +02:00
this->state = &state;
Changes: New Theme API NumPad UI7 Color Selector Color 2 Hex UI7 New Draw API (DrawCmd) UI7 New Debug API (DrawCmd) Add ThemeEditor Base
2024-06-05 12:32:51 +02:00
this->type = type;
Fix some Format stuff
2024-05-03 15:51:06 +02:00
*this->state = RD7KeyboardState_None;
0.9.5 preview1
2024-02-19 19:20:37 +01:00
str_bak = ref;
ft3 = 0;
}
Ovl_Keyboard::~Ovl_Keyboard() {
// And Unlock when closing Keyboard lol
RenderD7::Hid::Unlock();
}
void Ovl_Keyboard::Draw(void) const {
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
float tmp_txt = R2()->GetTextSize();
R2()->DefaultTextSize();
0.9.5 preview1
2024-02-19 19:20:37 +01:00
if (ft3 > 5) RenderD7::Hid::Unlock();
Changes: New Theme API NumPad UI7 Color Selector Color 2 Hex UI7 New Draw API (DrawCmd) UI7 New Debug API (DrawCmd) Add ThemeEditor Base
2024-06-05 12:32:51 +02:00
auto key_table =
(type == RD7Keyboard_Numpad) ? keyboard_layout_num : keyboard_layout;
0.9.5 preview1
2024-02-19 19:20:37 +01:00
if (mode == 1)
key_table = keyboard_layout_caps;
else if (mode == 2)
key_table = keyboard_layout_shift;
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->OnScreen(R2Screen_Top);
R2()->AddRect(R7Vec2(0, 0), R7Vec2(400, 240),
RenderD7::Color::RGBA(RD7Color_FrameBg).changeA(150).toRGBA());
R2()->OnScreen(R2Screen_Bottom);
R2()->AddRect(R7Vec2(0, 0), R7Vec2(320, 112),
RenderD7::Color::RGBA(RD7Color_FrameBg).changeA(150).toRGBA());
R2()->AddRect(R7Vec2(0, 112), R7Vec2(320, 128), RD7Color_FrameBg);
R2()->AddRect(R7Vec2(0, 112), R7Vec2(320, 20), RD7Color_Header);
R2()->AddText(R7Vec2(5, 114), "> " + *typed_text,
RenderD7::ThemeActive()->AutoText(RD7Color_Header));
0.9.5 preview1
2024-02-19 19:20:37 +01:00
for (auto const& it : key_table) {
Changes: Make Timer SmartCtor ClangFormat Reactivate Graphical Error Screen Fix Logger Fix Image Rendering
2024-06-15 15:12:06 +02:00
R7Vec2 szs = it.size;
R7Vec2 pos = it.pos;
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R7Vec2 txtdim = R2()->GetTextDimensions(it.disp);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
RD7Color btn = RD7Color_Button;
Changes: New Theme API NumPad UI7 Color Selector Color 2 Hex UI7 New Draw API (DrawCmd) UI7 New Debug API (DrawCmd) Add ThemeEditor Base
2024-06-05 12:32:51 +02:00
if (RenderD7::Hid::IsEvent("cancel", RenderD7::Hid::Up)) {
RenderD7::Hid::Clear();
shared_data[0x05] = 1;
}
0.9.5 preview1
2024-02-19 19:20:37 +01:00
if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Up) &&
Changes: Make Timer SmartCtor ClangFormat Reactivate Graphical Error Screen Fix Logger Fix Image Rendering
2024-06-15 15:12:06 +02:00
UI7_InBox(RenderD7::Hid::GetLastTouchPosition(), pos, szs)) {
0.9.5 preview1
2024-02-19 19:20:37 +01:00
if (mode == 2) // Request Disable Shift
shared_data[0x02] = 1;
if (it.action == 0)
shared_data[0x01] = it.disp[0];
else if (it.action == 1)
shared_data[0x02] = 1;
else if (it.action == 2)
shared_data[0x03] = 1;
else if (it.action == 3)
shared_data[0x04] = 1;
else if (it.action == 4)
shared_data[0x05] = 1;
else if (it.action == 5)
shared_data[0x06] = 1;
else if (it.action == 6)
shared_data[0x07] = 1;
else if (it.action == 7)
shared_data[0x08] = 1;
else if (it.action == 8)
shared_data[0x09] = 1;
} else if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Held) &&
UI7_InBox(RenderD7::Hid::GetTouchPosition(), it.pos, it.size)) {
btn = RD7Color_ButtonHovered;
Changes: Make Timer SmartCtor ClangFormat Reactivate Graphical Error Screen Fix Logger Fix Image Rendering
2024-06-15 15:12:06 +02:00
pos -= R7Vec2(1, 1);
szs += R7Vec2(2, 2);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
Changes: Make Timer SmartCtor ClangFormat Reactivate Graphical Error Screen Fix Logger Fix Image Rendering
2024-06-15 15:12:06 +02:00
R7Vec2 txtpos = R7Vec2(pos.x + szs.x * 0.5 - txtdim.x * 0.5,
pos.y + szs.y * 0.5 - txtdim.y * 0.5);
R2()->AddRect(pos, szs, btn);
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->AddText(txtpos, it.disp, RenderD7::ThemeActive()->AutoText(btn));
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
if (ft3 > 5) RenderD7::Hid::Lock();
Changes: Remove MEMTRACK Flag Replace Draw2 with Render2 Rename sound and font to uppercase Add SMART_CTOR to Image Sprite Sound Port Everything to R2
2024-06-08 21:00:40 +02:00
R2()->SetTextSize(tmp_txt);
0.9.5 preview1
2024-02-19 19:20:37 +01:00
}
void Ovl_Keyboard::Logic() {
ft3++;
for (const auto& it : shared_data) {
if (it.first == 0x01) {
typed_text->push_back(it.second);
} else if (it.first == 0x02) {
// Shift
mode = (mode == 2) ? 0 : 2;
} else if (it.first == 0x03) {
if (typed_text->length() >= 1)
typed_text->erase(typed_text->begin() + typed_text->length() - 1);
} else if (it.first == 0x04) {
// Enter
} else if (it.first == 0x05) {
*typed_text = str_bak;
Fix some Format stuff
2024-05-03 15:51:06 +02:00
*state = RD7KeyboardState_Cancel;
0.9.5 preview1
2024-02-19 19:20:37 +01:00
this->Kill();
} else if (it.first == 0x06) {
Fix some Format stuff
2024-05-03 15:51:06 +02:00
*state = RD7KeyboardState_Confirm;
0.9.5 preview1
2024-02-19 19:20:37 +01:00
this->Kill();
} else if (it.first == 0x07) {
// this->typed_text += '\t'; // Tab
} else if (it.first == 0x08) {
// Caps
mode = (mode == 1) ? 0 : 1;
} else if (it.first == 0x09) {
typed_text->append(" "); // Space
}
}
shared_data.clear();
}
} // namespace RenderD7
Reference in New Issue Copy Permalink