AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consistency

Browse Source
This commit is contained in:
Irlan 2019-03-30 11:59:20 -03:00
parent f59df50fbd
commit 117f984698
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/testbed/framework/main.cpp
View File

@ -120,7 +120,7 @@ static void Run()
if (g_settings->drawProfile) if (g_settings->drawProfile)
{ {
const b3Array<ProfilerRecord>& records = g_profilerRecorder->GetRecords(); const b3Array<ProfilerRecord>& records = g_recorderProfiler->GetRecords();
for (u32 i = 0; i < records.Count(); ++i) for (u32 i = 0; i < records.Count(); ++i)
{ {
const ProfilerRecord& r = records[i]; const ProfilerRecord& r = records[i];

4
examples/testbed/framework/model.cpp
View File

@ -26,7 +26,7 @@ Model::Model()
g_draw = &m_draw; g_draw = &m_draw;
g_camera = &m_camera; g_camera = &m_camera;
g_profiler = &m_profiler; g_profiler = &m_profiler;
g_profilerRecorder = &m_profilerListener.m_recorderListener; g_recorderProfiler = &m_profilerListener.m_recorderListener;
g_profilerListener = &m_profilerListener; g_profilerListener = &m_profilerListener;
m_test = nullptr; m_test = nullptr;
@ -53,7 +53,7 @@ Model::~Model()
g_draw = nullptr; g_draw = nullptr;
g_camera = nullptr; g_camera = nullptr;
g_profiler = nullptr; g_profiler = nullptr;
g_profilerRecorder = nullptr; g_recorderProfiler = nullptr;
g_profilerListener = nullptr; g_profilerListener = nullptr;
delete m_test; delete m_test;

4
examples/testbed/framework/model.h
View File

@ -20,7 +20,7 @@
#define MODEL_H #define MODEL_H
#include <testbed/framework/draw.h> #include <testbed/framework/draw.h>
#include <testbed/framework/testbed_listener.h> #include <testbed/framework/testbed_profiler.h>
class Test; class Test;
@ -63,7 +63,7 @@ private:
Draw m_draw; Draw m_draw;
Camera m_camera; Camera m_camera;
Profiler m_profiler; Profiler m_profiler;
TestbedListener m_profilerListener; TestbedProfiler m_profilerListener;
Test* m_test; Test* m_test;
bool m_setTest; bool m_setTest;
bool m_pause; bool m_pause;

2
examples/testbed/framework/recorder_profiler.cpp
View File

@ -18,7 +18,7 @@
#include <testbed/framework/recorder_profiler.h> #include <testbed/framework/recorder_profiler.h>
RecorderProfiler* g_profilerRecorder = nullptr; RecorderProfiler* g_recorderProfiler = nullptr;
void RecorderProfiler::BeginEvents() void RecorderProfiler::BeginEvents()
{ {

6
examples/testbed/framework/recorder_profiler.h
View File

@ -46,14 +46,14 @@ public:
void EndEvent(const char* name, float64 time); void EndEvent(const char* name, float64 time);
ProfilerRecord* FindRecord(const char* name);
const b3Array<ProfilerRecord>& GetRecords() const { return m_records; } const b3Array<ProfilerRecord>& GetRecords() const { return m_records; }
private: private:
ProfilerRecord* FindRecord(const char* name);
b3StackArray<ProfilerRecord, 256> m_records; // persistent records sorted by call order b3StackArray<ProfilerRecord, 256> m_records; // persistent records sorted by call order
u32 m_call; u32 m_call;
}; };
extern RecorderProfiler* g_profilerRecorder; extern RecorderProfiler* g_recorderProfiler;
#endif #endif

5
examples/testbed/framework/testbed_listener.h → examples/testbed/framework/testbed_profiler.h
View File

@ -22,7 +22,7 @@
#include <testbed/framework/profiler.h> #include <testbed/framework/profiler.h>
#include <testbed/framework/recorder_profiler.h> #include <testbed/framework/recorder_profiler.h>
// Set to 1 then the testbed listener will write profile events into a .json file. // Set to 1 then the testbed profiler will write profile events into a .json file.
// Set to 0 otherwise. // Set to 0 otherwise.
#define PROFILE_JSON 0 #define PROFILE_JSON 0
@ -30,8 +30,7 @@
#include <testbed\framework\json_profiler.h> #include <testbed\framework\json_profiler.h>
#endif #endif
class TestbedProfiler : public ProfilerListener
class TestbedListener : public ProfilerListener
{ {
public: public:
void BeginEvents() override void BeginEvents() override