X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=75c4b18ffea581805bcd2e7a041934919674783a;hp=1f057eaffb2f0f92b554142331ccbc9d447de772;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=5ef972c655ad9d17ac01e208c3d7bc57a4c10c7c

diff --git a/src/main.h b/src/main.h
index 1f057ea..75c4b18 100644
--- a/src/main.h
+++ b/src/main.h
@@ -4,6 +4,7 @@
 #include "view.h"
 #include "screen.h"
 #include "debugscript.h"
+#include "profiler.h"
 #include <unistd.h>
 
 
@@ -77,24 +78,40 @@ 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", 18);
 	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;
 	double total_real_time = 0;
+
+	// MINGW doesn't support a lot of ctime stuff here
+	#ifndef __MINGW32__	
 	struct timespec real_clock_start;
 	struct timespec real_clock_now;
 	struct timespec real_clock_prev;
 	clock_gettime(CLOCK_MONOTONIC_RAW, &real_clock_start);
 	real_clock_now = real_clock_start;
+	#endif
+
+
 	double frames = 0;
 	double data_rate = 0; // period between data output to stdout (if <= 0 there will be no output)
 	uint64_t data_points = 0;
@@ -102,9 +119,13 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 	int frame_number = 0;
 	while (scr.PumpEvents() && (max_frames < 0 || frame_number++ < max_frames))
 	{
+		#ifndef __MINGW32__
 		real_clock_prev = real_clock_now;
+		#endif
 		++frames;
+		g_profiler.BeginZone("scr.Clear()");
 		scr.Clear();
+		g_profiler.EndZone();
 		//view.ForceBoundsDirty();
 		//view.ForceBufferDirty();
 		//view.ForceRenderDirty();
@@ -115,23 +136,35 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 				return;
 		}
 
+		g_profiler.BeginZone("view.Render");
 		view.Render(scr.ViewportWidth(), scr.ViewportHeight());
+		g_profiler.EndZone();
 
 		double cpu_frame = scr.GetLastFrameTimeCPU();
 		double gpu_frame = scr.GetLastFrameTimeGPU();
+		total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
+		
+		#ifndef __MINGW32__
 		clock_gettime(CLOCK_MONOTONIC_RAW, &real_clock_now);
 		double real_frame = (real_clock_now.tv_sec - real_clock_prev.tv_sec) + 1e-9*(real_clock_now.tv_nsec - real_clock_prev.tv_nsec);
-
-
-		total_real_time += real_frame; total_cpu_time += cpu_frame; total_gpu_time += gpu_frame;
+		#else
+		double real_frame = cpu_frame;
+		#endif
+		
+		total_real_time += real_frame; 
 		if (data_rate > 0 && total_real_time > data_rate*(data_points+1)) 
 		{
 			printf("%lu\t%f\t%f\t%f\t%f\t%f\t%f\n", (long unsigned int)frames, total_real_time, total_cpu_time, total_gpu_time, real_frame, cpu_frame, gpu_frame);
 			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("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());
+		scr.DebugFontPrintF("Zoom: %s %%\n", Str(VReal(100)/VReal(view.GetBounds().w)).c_str());
+		//scr.DebugFontPrintF("Similar size: %s\n", HumanScale(view.GetBounds().w * VReal(22e-3)));
 		
 		#if 0
 		scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
@@ -140,10 +173,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");
@@ -177,6 +211,9 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 		}
 		#endif // 0
 		
+		g_profiler.BeginZone("scr.Present()");
 		scr.Present();
+		g_profiler.EndZone();
+		g_profiler.EndFrame();
 	}
 }