X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=d5ad7a987c7a5b120a5b5847ec9ee7959ec016e9;hp=af7df436066c7810b0489b5f80e5984b53a5bcdf;hb=6c0dfe752994312ee58d307b383948bfeb2d6e2e;hpb=a54254dcb23c8db9b78d5bd42e1ca54efda4c8e8

diff --git a/src/main.h b/src/main.h
index af7df43..d5ad7a9 100644
--- a/src/main.h
+++ b/src/main.h
@@ -12,6 +12,8 @@ using namespace IPDF;
 
 
 extern const char *script_filename;
+extern bool make_movie; // whyyy
+extern const char * program_name;
 
 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))
 {
@@ -69,7 +71,7 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 		
 	if (wheel)
 	{
-		view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), Real(expf(-wheel/20.f)));
+		view->ScaleAroundPoint(Real(x)/Real(scr->ViewportWidth()),Real(y)/Real(scr->ViewportHeight()), exp(Real(-wheel)/Real(20)));
 	}
 }
 
@@ -77,15 +79,25 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 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 -_-
-	DebugScript script;
+	
 
-	scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 32);
+	//scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
+	scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 36);
 	scr.SetMouseHandler(RatCatcher);
 
-	if (script_filename)
+	ifstream tmp;
+	istream * script_input = NULL;
+	if (script_filename != NULL)
 	{
-		script.Load(script_filename);
+		if (strcmp(script_filename, "stdin") == 0)
+			script_input = &cin;
+		else
+		{
+			tmp.open(script_filename);
+			script_input = &tmp;
+		}
 	}
+	DebugScript script(script_input);
 
 	double total_cpu_time = 0;
 	double total_gpu_time = 0;
@@ -143,8 +155,15 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 			data_points++;
 		}
 		
-		scr.DebugFontPrintF("View Width = %s m\n", Str(view.GetBounds().w * VReal(22e-3)).c_str());
-		scr.DebugFontPrintF("Similar size: %s\n", HumanScale(view.GetBounds().w * VReal(22e-3)));
+
+		
+		scr.DebugFontPrintF("%s\n", program_name);
+		scr.DebugFontPrintF("Top Left: (%s,%s)\n", Str(view.GetBounds().x).c_str(),Str(view.GetBounds().y).c_str());
+		scr.DebugFontPrintF("Width: %s\n", Str(view.GetBounds().w).c_str());
+		Real zoom(100);
+		zoom = zoom/Real(view.GetBounds().w);
+		scr.DebugFontPrintF("Zoom: %s %%\n", Str(zoom).c_str());
+		scr.DebugFontPrintF("Similar size: %s\n", HumanScale(ClampFloat(Double(view.GetBounds().w))));
 		
 		#if 0
 		scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
@@ -153,10 +172,11 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 			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("[REALTIME] Render 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("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");
@@ -189,7 +209,15 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 			scr.DebugFontPrint("Doing rendering using CPU.\n");
 		}
 		#endif // 0
-		
+
 		scr.Present();
+
+		if (make_movie)
+		{
+			std::stringstream s;
+			s << "frame" << frames << ".bmp";
+			scr.ScreenShot(s.str().c_str());
+		}		
+
 	}
 }