X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=e6100eda2d0768b7fd185ddc685d7180e11fa7bf;hp=e866bc1d36e199d3b0d56198448ad9f427599f48;hb=bdda0103bf26d215d41093316ca0e15cd67fec1d;hpb=700f1449af19115ff2bbe50ad67ea7c73f9aa5cd diff --git a/src/main.h b/src/main.h index e866bc1..e6100ed 100644 --- a/src/main.h +++ b/src/main.h @@ -13,13 +13,12 @@ inline void OverlayBMP(Document & doc, const char * input, const char * output, { View view(doc, bounds, c); Screen scr; - scr.RenderBMP(input); + if (input != NULL) + scr.RenderBMP(input); view.Render(); + if (output != NULL) + scr.ScreenShot(output); scr.Present(); - sleep(5); - scr.RenderBMP(input); - view.Render(); - scr.ScreenShot(output); } 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)) @@ -31,6 +30,14 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const { static bool oldButtonDown = false; static int oldx, oldy; + if (buttons > 1 && !oldButtonDown) + { + oldButtonDown = true; + view.ToggleGPUTransform(); + oldx = x; + oldy = y; + return; + } if (buttons && !oldButtonDown) { // We're beginning a drag. @@ -62,9 +69,17 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const while (scr.PumpEvents()) { scr.Clear(); - view.Render(); + 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("View bounds: (%f, %f) - (%f, %f)\n", view.GetBounds().x, view.GetBounds().y, view.GetBounds().w, view.GetBounds().h); + scr.DebugFontPrintF("View bounds: %s\n", view.GetBounds().Str().c_str()); + if (view.UsingGPUTransform()) + { + scr.DebugFontPrint("Doing coordinate transform on the GPU.\n"); + } + else + { + scr.DebugFontPrint("Doing coordinate transform on the CPU.\n"); + } scr.Present(); init_time = SDL_GetPerformanceCounter(); }