git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Circles (ellipses) have been added (filled only)
[ipdf/code.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index
e866bc1
..
332b021
100644
(file)
--- 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.
@@
-58,14
+65,21
@@
inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
}
);
- double init_time = SDL_GetPerformanceCounter();
while (scr.PumpEvents())
{
scr.Clear();
- view.Render();
- 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);
+ view.Render(scr.ViewportWidth(), scr.ViewportHeight());
+ 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 GPU.\n");
+ }
+ else
+ {
+ scr.DebugFontPrint("Doing coordinate transform on the CPU.\n");
+ }
scr.Present();
- init_time = SDL_GetPerformanceCounter();
}
}
UCC
git Repository :: git.ucc.asn.au