X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=92bf0964877a71877e85cec489bdd1c390f47a3b;hp=d20ea528b10b6397301b7d101fe3849dd51fa9da;hb=ea748154f1bc7dbc81cb52611a52865e63109439;hpb=20788af97c06b76040ea2de5ab3ddc683a261365

diff --git a/src/main.h b/src/main.h
index d20ea52..92bf096 100644
--- a/src/main.h
+++ b/src/main.h
@@ -53,11 +53,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 	}
 	if (buttons)
 	{
-		#if REALTYPE == REAL_RATIONAL
-			view->Translate(Real(oldx, scr->ViewportWidth()) -Real(x,scr->ViewportWidth()), Real(oldy, scr->ViewportHeight()) - Real(y,scr->ViewportHeight()));
-		#else			
-			view->Translate(Real(oldx-x)/Real(scr->ViewportWidth()), Real(oldy-y)/Real(scr->ViewportHeight()));
-		#endif
+		view->Translate(Real(oldx-x)/Real(scr->ViewportWidth()), Real(oldy-y)/Real(scr->ViewportHeight()));
 	}
 	else
 	{
@@ -69,17 +65,12 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 		
 	if (wheel)
 	{
-		#if REALTYPE == REAL_RATIONAL
-			view->ScaleAroundPoint(Real(x,scr->ViewportWidth()), Real(y,scr->ViewportHeight()), Real(20-wheel, 20));
-		#else
-			view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f)));
-		#endif
-	
+		view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f)));
 	}
 }
 
 
-inline void MainLoop(Document & doc, Screen & scr, View & view)
+inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 {
 	// order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
 
@@ -98,7 +89,8 @@ inline void MainLoop(Document & doc, Screen & scr, View & view)
 	double data_rate = 0; // period between data output to stdout (if <= 0 there will be no output)
 	uint64_t data_points = 0;
 	setbuf(stdout, NULL);
-	while (scr.PumpEvents())
+	int frame_number = 0;
+	while (scr.PumpEvents() && (max_frames < 0 || frame_number++ < max_frames))
 	{
 		real_clock_prev = real_clock_now;
 		++frames;
@@ -122,14 +114,15 @@ inline void MainLoop(Document & doc, Screen & scr, View & view)
 			data_points++;
 		}
 		scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
+		scr.DebugFontPrintF("Lazy Rendering = %d\n", view.UsingLazyRendering());
 		scr.DebugFontPrintF("[CPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", cpu_frame*1e3, 1.0/cpu_frame, total_cpu_time,frames/total_cpu_time);
 		scr.DebugFontPrintF("[GPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", gpu_frame*1e3, 1.0/gpu_frame, total_gpu_time, frames/total_gpu_time);
 		scr.DebugFontPrintF("[REALTIME] Render+Present+Cruft took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", real_frame*1e3, 1.0/real_frame, total_real_time,frames/total_real_time);
 		scr.DebugFontPrintF("View bounds: %s\n", view.GetBounds().Str().c_str());
 		scr.DebugFontPrintF("type of Real == %s\n", g_real_name[REALTYPE]);
-		#if REALTYPE == REAL_MPFRCPP
-			scr.DebugFontPrintf("Precision: %s\nRounding: %s\n");
-		#endif 
+		//#if REALTYPE == REAL_MPFRCPP
+		//	scr.DebugFontPrintf("Precision: %s\nRounding: %s\n");
+		//#endif 
 
 		if (view.UsingGPUTransform())
 		{