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

Remove rd7tf/Add RD7Flags

Browse Source
This commit is contained in:
tobid7
2024-07-01 18:06:54 +02:00
parent 410d6bf919
commit d620c6f5b2
31 changed files with 45 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/Memory.cpp
View File

@ -22,16 +22,16 @@
static RenderD7::Memory::memory_metrics metrics;
bool rd7_enable_memtrack;
bool rd7i_enable_memtrack;
void *operator new(size_t size) {
void *ptr = malloc(size);
if (rd7_enable_memtrack) metrics.t_TotalAllocated += size;
if (rd7i_enable_memtrack) metrics.t_TotalAllocated += size;
return ptr;
}
void operator delete(void *memory, size_t size) {
if (rd7_enable_memtrack) metrics.t_TotalFreed += size;
if (rd7i_enable_memtrack) metrics.t_TotalFreed += size;
free(memory);
}
@ -41,7 +41,7 @@ std::map<void *, size_t> sizes;
void *operator new[](size_t size) {
void *ptr = malloc(size);
if (rd7_enable_memtrack) {
if (rd7i_enable_memtrack) {
allocations++;
total_size += size;
sizes[ptr] = size;
@ -52,7 +52,7 @@ void *operator new[](size_t size) {
}
void operator delete[](void *ptr) {
if (rd7_enable_memtrack) {
if (rd7i_enable_memtrack) {
allocations--;
total_size -= sizes[ptr];
metrics.t_TotalFreed += sizes[ptr];

4
source/Message.cpp
View File

@ -23,7 +23,7 @@
#include <renderd7/renderd7.hpp>
#include <vector>
extern bool rd7_debugging;
extern bool rd7i_debugging;
static std::vector<std::shared_ptr<RenderD7::Message>> msg_lst;
static int fade_outs = 200; // Start of fadeout
@ -72,7 +72,7 @@ void ProcessMessages() {
R2()->AddRect(pos, R7Vec2(150, 50), bgc);
R2()->AddText(pos + R7Vec2(5, 1), msg_lst[i]->title, tc);
R2()->AddText(pos + R7Vec2(5, 17), msg_lst[i]->message, tc);
if (rd7_debugging)
if (rd7i_debugging)
R2()->AddText(pos + R7Vec2(155, 1),
std::to_string(msg_lst[i]->animationframe), tc);
// Why Frameadd? because Message uses int as frame and

6
source/Overlays.cpp
View File

@ -341,7 +341,7 @@ void Ovl_Metrik::Draw(void) const {
mt_tbs =
"TextBuf: " + std::to_string(C2D_TextBufGetNumGlyphs(rd7i_text_buffer)) +
"/4096";
if (rd7_enable_memtrack)
if (rd7i_enable_memtrack)
mt_mem = "Mem: " + RenderD7::FormatBytes(RenderD7::Memory::GetCurrent()) +
" | " +
RenderD7::FormatBytes(RenderD7::Memory::GetTotalAllocated()) +
@ -358,7 +358,7 @@ void Ovl_Metrik::Draw(void) const {
(unsigned int)i_mt_color[0]);
R2()->AddRect(R7Vec2(0, 50 + dim_y * 4), R2()->GetTextDimensions(mt_tbs),
(unsigned int)i_mt_color[0]);
if (rd7_enable_memtrack)
if (rd7i_enable_memtrack)
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),
@ -373,7 +373,7 @@ void Ovl_Metrik::Draw(void) const {
(unsigned int)i_txt_color[0]);
R2()->AddText(R7Vec2(0, 50 + dim_y * 4), mt_tbs,
(unsigned int)i_txt_color[0]);
if (rd7_enable_memtrack)
if (rd7i_enable_memtrack)
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]);

2
source/Render2.cpp
View File

@ -182,7 +182,7 @@ void R2Base::Process() {
// Look into Old Draw2 Code
// TODO: Create Code for this
}
if (rd7_debugging) {
if (rd7i_debugging) {
this->DrawNextLined();
this->AddRect(newpos, dim, 0xff0000ff);
}

7
source/internal_db.cpp
View File

@ -31,6 +31,7 @@
#include <renderd7/renderd7.hpp>
/// Base ///
RD7Flags rd7_flags = RD7Flags_Default;
static RenderD7::Thread rd7i_idb_server; // Protected
std::string rd7i_app_name;
std::string rd7i_config_path;
@ -96,9 +97,9 @@ touchPosition d7_touch;
// Modern Global Api
int rd7_max_objects = C2D_DEFAULT_MAX_OBJECTS;
bool rd7_do_splash = false;
bool rd7_enable_scene_system = true;
bool rd7_debugging = false;
bool rd7i_do_splash = false;
bool rd7i_enable_scene_system = true;
bool rd7i_debugging = false;
C3D_RenderTarget *rd7_top;
C3D_RenderTarget *rd7_top_right;
C3D_RenderTarget *rd7_bottom;

16
source/renderd7.cpp
View File

@ -326,7 +326,7 @@ bool RenderD7::MainLoop() {
C2D_TargetClear(rd7_top, C2D_Color32(0, 0, 0, 0));
C2D_TargetClear(rd7_bottom, C2D_Color32(0, 0, 0, 0));
frameloop();
if (rd7_enable_scene_system) {
if (rd7i_enable_scene_system) {
RenderD7::Scene::doDraw();
RenderD7::Scene::doLogic();
}
@ -353,6 +353,10 @@ Result RenderD7::Init::Main(std::string app_name) {
rd7i_app_name = app_name;
rd7i_logger = LoggerBase::New();
rd7i_glogger = LoggerBase::New();
rd7i_do_splash = (rd7_flags & RD7Flags_ShowSplash);
rd7i_enable_scene_system= (rd7_flags & RD7Flags_SceneSystem);
rd7i_enable_memtrack = (rd7_flags & RD7Flags_MemTrack);
gfxInitDefault();
atexit(gfxExit);
@ -405,7 +409,7 @@ Result RenderD7::Init::Main(std::string app_name) {
rd7i_graphics_on = true;
rd7i_last_tm = svcGetSystemTick();
if (rd7_do_splash) PushSplash();
if (rd7i_do_splash) PushSplash();
rd7i_init_input();
rd7i_init_theme();
@ -421,6 +425,10 @@ Result RenderD7::Init::Minimal(std::string app_name) {
rd7i_logger = LoggerBase::New();
rd7i_glogger = LoggerBase::New();
rd7i_do_splash = (rd7_flags & RD7Flags_ShowSplash);
rd7i_enable_scene_system= (rd7_flags & RD7Flags_SceneSystem);
rd7i_enable_memtrack = (rd7_flags & RD7Flags_MemTrack);
gfxInitDefault();
atexit(gfxExit);
romfsInit();
@ -462,7 +470,7 @@ Result RenderD7::Init::Minimal(std::string app_name) {
rd7i_render2 = R2Base::New();
rd7i_graphics_on = true;
if (rd7_do_splash) PushSplash();
if (rd7i_do_splash) PushSplash();
// Check if citra
s64 citracheck = 0;
@ -533,7 +541,7 @@ void OvlHandler() {
void RenderD7::FrameEnd() {
Ftrace::ScopedTrace st("rd7-core", f2s(FrameEnd));
C3D_FrameBegin(2);
if (!rd7_enable_scene_system && rd7i_settings) {
if (!rd7i_enable_scene_system && rd7i_settings) {
RenderD7::Scene::doDraw();
RenderD7::Scene::doLogic();
}