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

diff --git a/src/main.h b/src/main.h
index 46c1544..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))
@@ -70,9 +69,9 @@ 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");