Browse Source

Changed name of new functionality to keep other examples compiling.

shared-context
Doug Binks 11 years ago
parent
commit
7d6058c572
3 changed files with 11 additions and 5 deletions
  1. +6
    -1
      example/demo.c
  2. +2
    -1
      example/demo.h
  3. +3
    -3
      example/example_gl3.c

+ 6
- 1
example/demo.c View File

@@ -862,7 +862,12 @@ void updateFPS(struct FPScounter* fps, float frameTime)

#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;
float avg, w, h;


+ 2
- 1
example/demo.h View File

@@ -29,7 +29,8 @@ struct FPScounter

void initFPS(struct FPScounter* fps);
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
}


+ 3
- 3
example/example_gl3.c View File

@@ -159,9 +159,9 @@ int main()
nvgBeginFrame(vg, winWidth, winHeight, pxRatio);

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);



Loading…
Cancel
Save