@@ -862,7 +862,12 @@ void updateFPS(struct FPScounter* fps, float frameTime) | |||||
#define AVG_SIZE 20 | #define AVG_SIZE 20 | ||||
void renderFPS(struct NVGcontext* vg, float x, float y, struct FPScounter* fps, enum FPSRenderStyle style, const char* name) | |||||
void renderFPS(struct NVGcontext* vg, float x, float y, struct FPScounter* fps) | |||||
{ | |||||
renderFPSEx(vg,x,y,fps,RENDER_FPS,NULL); | |||||
} | |||||
void renderFPSEx(struct NVGcontext* vg, float x, float y, struct FPScounter* fps, enum FPSRenderStyle style, const char* name) | |||||
{ | { | ||||
int i, head; | int i, head; | ||||
float avg, w, h; | float avg, w, h; | ||||
@@ -29,7 +29,8 @@ struct FPScounter | |||||
void initFPS(struct FPScounter* fps); | void initFPS(struct FPScounter* fps); | ||||
void updateFPS(struct FPScounter* fps, float frameTime); | void updateFPS(struct FPScounter* fps, float frameTime); | ||||
void renderFPS(struct NVGcontext* vg, float x, float y, struct FPScounter* fps, enum FPSRenderStyle style, const char* name ); | |||||
void renderFPSEx(struct NVGcontext* vg, float x, float y, struct FPScounter* fps, enum FPSRenderStyle style, const char* name ); | |||||
void renderFPS(struct NVGcontext* vg, float x, float y, struct FPScounter* fps); | |||||
#ifdef __cplusplus | #ifdef __cplusplus | ||||
} | } | ||||
@@ -159,9 +159,9 @@ int main() | |||||
nvgBeginFrame(vg, winWidth, winHeight, pxRatio); | nvgBeginFrame(vg, winWidth, winHeight, pxRatio); | ||||
renderDemo(vg, mx,my, winWidth,winHeight, t, blowup, &data); | renderDemo(vg, mx,my, winWidth,winHeight, t, blowup, &data); | ||||
renderFPS(vg, 5,5, &fps, RENDER_FPS, NULL ); | |||||
renderFPS(vg, 310,5, &cpuTimes, RENDER_MS, "CPU Time"); | |||||
renderFPS(vg, 615,5, &gpuTimes, RENDER_MS, "GPU Time"); | |||||
renderFPS(vg, 5,5, &fps); | |||||
renderFPSEx(vg, 310,5, &cpuTimes, RENDER_MS, "CPU Time"); | |||||
renderFPSEx(vg, 615,5, &gpuTimes, RENDER_MS, "GPU Time"); | |||||
nvgEndFrame(vg); | nvgEndFrame(vg); | ||||