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

- Add RD7 and DV2 namespace

Browse Source 
- Restructer Default Theme System
- Rename NIMG_Engine to swr (SoftwareRender)
- Begin Adding Debug Lines to UI7
- Remove GUI ErrorSystem
This commit is contained in:
Tobi-D7
2024-02-21 12:48:56 +01:00
parent 688570b3cd
commit 968c2576b9
17 changed files with 269 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
rd7tf/source/main.cpp
View File

@ -1,32 +1,24 @@
#include "scene.hpp"
void ColorThemeSample() {
RenderD7::ColorNew(RD7Color_Text, RenderD7::Color::Hex("#000000", 255));
RenderD7::ColorNew(RD7Color_TextDisabled,
RenderD7::Color::Hex("#212121", 200));
RenderD7::ColorNew(RD7Color_Text2, RenderD7::Color::Hex("#ffffff", 255));
RenderD7::ColorNew(RD7Color_Background, RenderD7::Color::Hex("#eeeeee", 170));
RenderD7::ColorNew(RD7Color_Header, RenderD7::Color::Hex("#222222", 190));
RenderD7::ColorNew(RD7Color_Selector, RenderD7::Color::Hex("#4444dd", 200));
RenderD7::ColorNew(RD7Color_SelectorFade,
RenderD7::Color::Hex("#7777dd", 200));
RenderD7::ColorNew(RD7Color_List0, RenderD7::Color::Hex("#555555", 130));
RenderD7::ColorNew(RD7Color_List1, RenderD7::Color::Hex("#777777", 130));
RenderD7::ColorNew(RD7Color_MessageBackground,
RenderD7::Color::Hex("#222222", 180));
RenderD7::ColorNew(RD7Color_Button, RenderD7::Color::Hex("#4444dd", 150));
RenderD7::ColorNew(RD7Color_ButtonHovered,
RenderD7::Color::Hex("#6666dd", 150));
RenderD7::ColorNew(RD7Color_ButtonDisabled,
RenderD7::Color::Hex("#2222dd", 150));
RenderD7::ColorNew(RD7Color_ButtonActive,
RenderD7::Color::Hex("#7777dd", 150));
RenderD7::ColorNew(RD7Color_Checkmark, RenderD7::Color::Hex("#4444dd", 130));
RenderD7::ColorNew(RD7Color_FrameBg, RenderD7::Color::Hex("#555555", 160));
RenderD7::ColorNew(RD7Color_FrameBgHovered,
RenderD7::Color::Hex("#777777", 160));
RenderD7::ColorNew(RD7Color_Progressbar,
RenderD7::Color::Hex("#4444dd", 200));
RD7::ColorNew(RD7Color_Text, RD7::Color::Hex("#000000", 255));
RD7::ColorNew(RD7Color_TextDisabled, RD7::Color::Hex("#212121", 200));
RD7::ColorNew(RD7Color_Text2, RD7::Color::Hex("#ffffff", 255));
RD7::ColorNew(RD7Color_Background, RD7::Color::Hex("#eeeeee", 170));
RD7::ColorNew(RD7Color_Header, RD7::Color::Hex("#222222", 190));
RD7::ColorNew(RD7Color_Selector, RD7::Color::Hex("#4444dd", 200));
RD7::ColorNew(RD7Color_SelectorFade, RD7::Color::Hex("#7777dd", 200));
RD7::ColorNew(RD7Color_List0, RD7::Color::Hex("#555555", 130));
RD7::ColorNew(RD7Color_List1, RD7::Color::Hex("#777777", 130));
RD7::ColorNew(RD7Color_MessageBackground, RD7::Color::Hex("#222222", 180));
RD7::ColorNew(RD7Color_Button, RD7::Color::Hex("#4444dd", 150));
RD7::ColorNew(RD7Color_ButtonHovered, RD7::Color::Hex("#6666dd", 150));
RD7::ColorNew(RD7Color_ButtonDisabled, RD7::Color::Hex("#2222dd", 150));
RD7::ColorNew(RD7Color_ButtonActive, RD7::Color::Hex("#7777dd", 150));
RD7::ColorNew(RD7Color_Checkmark, RD7::Color::Hex("#4444dd", 130));
RD7::ColorNew(RD7Color_FrameBg, RD7::Color::Hex("#555555", 160));
RD7::ColorNew(RD7Color_FrameBgHovered, RD7::Color::Hex("#777777", 160));
RD7::ColorNew(RD7Color_Progressbar, RD7::Color::Hex("#4444dd", 200));
}
extern void IdbServer();
@ -34,24 +26,24 @@ extern void IdbServer();
int main() {
rd7_enable_memtrack = true;
rd7_do_splash = true;
RenderD7::Ftrace::Beg("app", "app_init");
RenderD7::Init::Main("rd7tf");
RenderD7::FadeIn();
RD7::Ftrace::Beg("app", "app_init");
RD7::Init::Main("rd7tf");
RD7::FadeIn();
// IdbServer();
ColorThemeSample();
RenderD7::Init::NdspFirm();
RenderD7::Scene::Load(std::make_unique<Sample>());
RenderD7::Ftrace::End("app", "app_init");
while (RenderD7::MainLoop()) {
RenderD7::OnScreen(Top);
RenderD7::Ftrace::Beg("app", "app_mainloop");
RD7::Init::NdspFirm();
RD7::Scene::Load(std::make_unique<Sample>());
RD7::Ftrace::End("app", "app_init");
while (RD7::MainLoop()) {
RD7::OnScreen(Top);
RD7::Ftrace::Beg("app", "app_mainloop");
if (d7_hDown & KEY_START) {
RenderD7::FadeOut();
RenderD7::ExitApp();
RD7::FadeOut();
RD7::ExitApp();
}
RenderD7::OnScreen(Top);
RenderD7::FrameEnd();
RenderD7::Ftrace::End("app", "app_mainloop");
RD7::OnScreen(Top);
RD7::FrameEnd();
RD7::Ftrace::End("app", "app_mainloop");
}
return 0;

48
rd7tf/source/scene.cpp
View File

@ -25,27 +25,25 @@ static void Wave(int index, R7Vec2 position, R7Vec2 size, float time,
y_position = std::min(y_position, position.y + size.y - (90 - shrink));
if (dbg)
RenderD7::Draw2::TriangleLined(
DV2::TriangleLined(
R7Vec2(x_position, y_position),
R7Vec2(x_position + 300, y_position + (90 - shrink)),
R7Vec2(x_position - 300, y_position + (90 - shrink)),
RenderD7::Color::RGBA(.94f - .17f * color_effect,
.61f - .25f * color_effect,
.36f + .38f * color_effect)
RD7::Color::RGBA(.94f - .17f * color_effect, .61f - .25f * color_effect,
.36f + .38f * color_effect)
.toRGBA());
else
RenderD7::Draw2::TriangleSolid(
DV2::TriangleSolid(
R7Vec2(x_position, y_position),
R7Vec2(x_position + 300, y_position + (90 - shrink)),
R7Vec2(x_position - 300, y_position + (90 - shrink)),
RenderD7::Color::RGBA(.94f - .17f * color_effect,
.61f - .25f * color_effect,
.36f + .38f * color_effect)
RD7::Color::RGBA(.94f - .17f * color_effect, .61f - .25f * color_effect,
.36f + .38f * color_effect)
.toRGBA());
}
void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) {
RenderD7::Draw2::RectFilledSolid(position, size, 0xff64c9fd);
DV2::RectFilledSolid(position, size, 0xff64c9fd);
int i = 0;
for (; i < 44; i++) Wave(i, position, size, time, dbg);
}
@ -53,7 +51,7 @@ void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) {
R7Vec2 testv2 = R7Vec2(48, 48);
Sample::Sample() {
auto t = RenderD7::FileSystem::GetDirContent("sdmc:/music/");
auto t = RD7::FileSystem::GetDirContent("sdmc:/music/");
for (const auto& it : t) {
names.push_back(it.name);
files.push_back(it.path);
@ -67,32 +65,32 @@ Sample::~Sample() {
void Sample::Draw() const {
// Draw Things to Screen:
// Step 1 -> Select Screen
RenderD7::OnScreen(Top);
RD7::OnScreen(Top);
// Step 2 -> Draw Things
// The hbloader Triangle Wave
DrawWave(R7Vec2(0, 0), R7Vec2(400, 240), RenderD7::GetTime(),
debug_background);
DrawWave(R7Vec2(0, 0), R7Vec2(400, 240), RD7::GetTime(), debug_background);
// For Example A Rect with Draw2 and StyleColorApi
// And the RFS Wrapper for RectFilledSolid lol
/*RenderD7::Draw2::RFS(R7Vec2(0, 0), R7Vec2(400, 20),
RenderD7::StyleColor(RD7Color_Header));
/*DV2::RFS(R7Vec2(0, 0), R7Vec2(400, 20),
RD7::StyleColor(RD7Color_Header));
// As the Top bar is Dark you need TextColor2
RenderD7::RedirectColor(RD7Color_Text, RD7Color_Text2);
RenderD7::Draw2::Text(R7Vec2(5, 2), "RenderD7 - Test Framework");
RenderD7::Draw2::Text(R7Vec2(395, 2), RENDERD7VSTRING,
RD7::RedirectColor(RD7Color_Text, RD7Color_Text2);
DV2::Text(R7Vec2(5, 2), "RenderD7 - Test Framework");
DV2::Text(R7Vec2(395, 2), RENDERD7VSTRING,
RD7TextFlags_AlignRight);
RenderD7::UndoColorEdit(RD7Color_Text);*/
RD7::UndoColorEdit(RD7Color_Text);*/
if (UI7::BeginMenu("RenderD7 Test Framework")) {
UI7::SetCursorPos(R7Vec2(395, 2));
UI7::Label(RenderD7::FormatBytes(RenderD7::Memory::GetCurrent()),
UI7::Label(RD7::FormatBytes(RD7::Memory::GetCurrent()),
RD7TextFlags_AlignRight);
UI7::RestoreCursor();
if (state == State_Menu) {
UI7::Label("Test App");
UI7::BrowserList(names, sel);
}
UI7::EndMenu();
}
RenderD7::OnScreen(Bottom);
RD7::OnScreen(Bottom);
if (UI7::BeginMenu("Control Center")) {
if (state == State_Menu) {
if (UI7::Button("RenderD7 Settings"))
@ -116,14 +114,14 @@ void Sample::Draw() const {
}
void Sample::Logic() {
RenderD7::CustomTextSize(txt_size);
RD7::CustomTextSize(txt_size);
for (const auto& it : shared_requests) {
if (it.first == 1U) {
if (it.second) RenderD7::LoadSettings();
if (it.second) RD7::LoadSettings();
} else if (it.first == 2U) {
if (it.second)
RenderD7::PushMessage(RenderD7::Message(
"Test Message", "Button Bressed\nBest Msg Handler..."));
RD7::PushMessage(RD7::Message("Test Message",
"Button Bressed\nBest Msg Handler..."));
} else if (it.first == 3U) {
state = (State)it.second;
}

2
rd7tf/source/scene.hpp
View File

@ -2,7 +2,7 @@
#include <rd7.hpp>
class Sample : public RenderD7::Scene {
class Sample : public RD7::Scene {
public:
enum State {
State_Menu,