inline void OverlayBMP(Document & doc, const char * input, const char * output, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
{
- View view(doc, bounds, c);
+
Screen scr;
+ View view(doc, scr, bounds, c);
if (input != NULL)
scr.RenderBMP(input);
view.Render();
inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f))
{
- View view(doc,bounds, c);
+ // order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
Screen scr;
+ View view(doc,scr, bounds, c);
scr.DebugFontInit("DejaVuSansMono.ttf");
scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] wtf
{
static bool oldButtonDown = false;
static int oldx, oldy;
- if (buttons > 1 && !oldButtonDown)
+ if (buttons == 3 && !oldButtonDown)
{
oldButtonDown = true;
view.ToggleGPUTransform();
oldy = y;
return;
}
+ if (buttons == 2 && !oldButtonDown)
+ {
+ oldButtonDown = true;
+ view.ToggleGPURendering();
+ oldx = x;
+ oldy = y;
+ }
if (buttons && !oldButtonDown)
{
// We're beginning a drag.
}
);
- double init_time = SDL_GetPerformanceCounter();
while (scr.PumpEvents())
{
scr.Clear();
view.Render(scr.ViewportWidth(), scr.ViewportHeight());
- scr.DebugFontPrintF("[CPU] Render took %lf ms (%lf FPS)\n", (SDL_GetPerformanceCounter() - init_time)* 1000.0/SDL_GetPerformanceFrequency(), SDL_GetPerformanceFrequency()/(SDL_GetPerformanceCounter() - init_time));
+ scr.DebugFontPrintF("[CPU] Render took %lf ms (%lf FPS)\n", (scr.GetLastFrameTimeCPU())* 1000.0, 1.0/scr.GetLastFrameTimeCPU());
+ scr.DebugFontPrintF("[GPU] Render took %lf ms (%lf FPS)\n", (scr.GetLastFrameTimeGPU())* 1000.0, 1.0/scr.GetLastFrameTimeGPU());
scr.DebugFontPrintF("View bounds: %s\n", view.GetBounds().Str().c_str());
if (view.UsingGPUTransform())
{
{
scr.DebugFontPrint("Doing coordinate transform on the CPU.\n");
}
+ if (view.UsingGPURendering())
+ {
+ scr.DebugFontPrint("Doing rendering using GPU.\n");
+ }
+ else
+ {
+ scr.DebugFontPrint("Doing rendering using CPU.\n");
+ }
scr.Present();
- init_time = SDL_GetPerformanceCounter();
}
}