Merge branch 'master' of https://github.com/tildearrow/furnace into k053260
This commit is contained in:
commit
e1dbc16d96
10 changed files with 229 additions and 75 deletions
|
|
@ -1154,6 +1154,17 @@ struct FurnaceGUIImage {
|
|||
ch(0) {}
|
||||
};
|
||||
|
||||
struct FurnaceGUIPerfMetric {
|
||||
const char* name;
|
||||
int elapsed;
|
||||
FurnaceGUIPerfMetric(const char* n, int t):
|
||||
name(n),
|
||||
elapsed(t) {}
|
||||
FurnaceGUIPerfMetric():
|
||||
name(NULL),
|
||||
elapsed(0) {}
|
||||
};
|
||||
|
||||
class FurnaceGUI {
|
||||
DivEngine* e;
|
||||
|
||||
|
|
@ -1739,6 +1750,12 @@ class FurnaceGUI {
|
|||
int renderTimeBegin, renderTimeEnd, renderTimeDelta;
|
||||
int eventTimeBegin, eventTimeEnd, eventTimeDelta;
|
||||
|
||||
FurnaceGUIPerfMetric perfMetrics[64];
|
||||
int perfMetricsLen;
|
||||
|
||||
FurnaceGUIPerfMetric perfMetricsLast[64];
|
||||
int perfMetricsLastLen;
|
||||
|
||||
std::map<FurnaceGUIImages,FurnaceGUIImage*> images;
|
||||
|
||||
int chanToMove, sysToMove, sysToDelete, opToMove;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue