X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=70997a31c935d5d251ec3651127584fcf54445ca;hb=cfe7da763b5d8ef4252ddb94558abb080bbd893d;hp=46c1544e29e7924ba9fd600f2897c6ee7c33937d;hpb=6ad7439e8ebf969fcd2d3a710a4b16e2b1ee131f;p=ipdf%2Fcode.git

diff --git a/src/main.h b/src/main.h
index 46c1544..70997a3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -11,27 +11,28 @@ using namespace IPDF;
 
 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;
-	scr.RenderBMP(input);
+	View view(doc, scr, bounds, c);
+	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))
 {
-	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();
@@ -39,6 +40,13 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
 			oldy = y;
 			return;
 		}
+		if (buttons == 2 && !oldButtonDown)
+		{
+			oldButtonDown = true;
+			view.ToggleGPURendering();
+			oldx = x;
+			oldy = y;
+		}
 		if (buttons && !oldButtonDown)
 		{
 			// We're beginning a drag.
@@ -66,13 +74,13 @@ 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");
@@ -81,7 +89,14 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const
 		{
 			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();
 	}
 }