X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=b9da3d754833ce1834035ff21210d67a85f0af5c;hp=9929d69e333bb86b8a4444094c881f6a3ae536cf;hb=1d179b93f6a1b2a4fe3823c26fba862c24bc5d6e;hpb=6ce000e7212d9f5db6e5998c41df15bcad2022c8

diff --git a/src/main.h b/src/main.h
index 9929d69..b9da3d7 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,12 +65,7 @@ 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)));
 	}
 }
 
@@ -123,15 +114,23 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
 			data_points++;
 		}
 		scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
-		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("Lazy Rendering = %d\n", view.UsingLazyRendering());
+		if (cpu_frame > 0 && total_cpu_time > 0)
+			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);
+		if (gpu_frame > 0 && total_gpu_time > 0)
+			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);
+		if (real_frame > 0 && total_real_time > 0)
+			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 
 
+		#ifdef TRANSFORM_OBJECTS_NOT_VIEW
+		scr.DebugFontPrint("Doing cumulative coordinate transforms on Objects.\n");
+		#else
 		if (view.UsingGPUTransform())
 		{
 			scr.DebugFontPrint("Doing coordinate transform on the GPU.\n");
@@ -140,6 +139,7 @@ inline void MainLoop(Document & doc, Screen & scr, View & view, int max_frames =
 		{
 			scr.DebugFontPrint("Doing coordinate transform on the CPU.\n");
 		}
+		#endif
 		if (view.UsingGPURendering())
 		{
 			scr.DebugFontPrint("Doing rendering using GPU.\n");