0
0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-28 01:04:41 +08:00

(profiler) Proper color names and 6 new colors

This commit is contained in:
Victor Zarubkin 2016-08-07 19:31:09 +03:00
parent 57654670f0
commit b39057049e
2 changed files with 16 additions and 10 deletions

View File

@ -51,7 +51,7 @@ Block will be automatically completed by destructor
\ingroup profiler \ingroup profiler
*/ */
#define PROFILER_BEGIN_BLOCK(name) profiler::Block TOKEN_CONCATENATE(unique_profiler_mark_name_,__LINE__)(name,0,profiler::BLOCK_TYPE_BLOCK);\ #define PROFILER_BEGIN_BLOCK(name) profiler::Block TOKEN_CONCATENATE(unique_profiler_mark_name_,__LINE__)(name,profiler::colors::Clay,profiler::BLOCK_TYPE_BLOCK);\
profiler::beginBlock(&TOKEN_CONCATENATE(unique_profiler_mark_name_,__LINE__)); profiler::beginBlock(&TOKEN_CONCATENATE(unique_profiler_mark_name_,__LINE__));
/** Macro of beginning of block with custom name and custom identification /** Macro of beginning of block with custom name and custom identification
@ -199,12 +199,12 @@ namespace profiler
const color_t Magenta = (Red | Blue); const color_t Magenta = (Red | Blue);
const color_t Cyan = (Green | Blue); const color_t Cyan = (Green | Blue);
const color_t Yellow = (Red | Green); const color_t Yellow = (Red | Green);
const color_t Lightred = 0x60; const color_t Darkred = 0x60;
const color_t Lightgreen = 0x0C; const color_t Darkgreen = 0x0C;
const color_t Lightblue = 0x01; const color_t Darkblue = 0x01;
const color_t Lightmagenta = (Lightred | Lightblue); const color_t Darkmagenta = (Darkred | Darkblue);
const color_t Lightcyan = (Lightgreen | Lightblue); const color_t Darkcyan = (Darkgreen | Darkblue);
const color_t Lightyellow = (Lightred | Lightgreen); const color_t Darkyellow = (Darkred | Darkgreen);
const color_t Navy = 0x02; const color_t Navy = 0x02;
const color_t Teal = 0x12; const color_t Teal = 0x12;
const color_t Maroon = 0x80; const color_t Maroon = 0x80;
@ -212,6 +212,12 @@ namespace profiler
const color_t Olive = 0x90; const color_t Olive = 0x90;
const color_t Grey = 0x92; const color_t Grey = 0x92;
const color_t Silver = 0xDB; const color_t Silver = 0xDB;
const color_t Orange = 0xF4;
const color_t Coral = 0xF6;
const color_t Brick = 0xED;
const color_t Clay = 0xD6;
const color_t Skin = 0xFA;
const color_t Palegold = 0xFE;
inline int get_red(color_t color){ inline int get_red(color_t color){
return (color >> 5) * 0x20; return (color >> 5) * 0x20;

View File

@ -18,7 +18,7 @@ int MODELLING_STEPS = 1000;
int RESOURCE_LOADING_COUNT = 100; int RESOURCE_LOADING_COUNT = 100;
void loadingResources(){ void loadingResources(){
PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Lightcyan); PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Darkcyan);
std::this_thread::sleep_for(std::chrono::milliseconds(50)); std::this_thread::sleep_for(std::chrono::milliseconds(50));
} }
@ -64,7 +64,7 @@ void calcBrain(){
} }
void calculateBehavior(){ void calculateBehavior(){
PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Lightblue); PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Darkblue);
calcPhys(); calcPhys();
calcBrain(); calcBrain();
} }
@ -76,7 +76,7 @@ void modellingStep(){
} }
void prepareRender(){ void prepareRender(){
PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Lightred); PROFILER_BEGIN_FUNCTION_BLOCK_GROUPED(profiler::colors::Darkred);
volatile int i = 0; volatile int i = 0;
for (; i < 200000; ++i); for (; i < 200000; ++i);
//std::this_thread::sleep_for(std::chrono::milliseconds(8)); //std::this_thread::sleep_for(std::chrono::milliseconds(8));