X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=cdb2d0aee74d1741970c1d1fb21040dddfbe8b57;hp=a2693d1460b9c8832957b3c03b734bdf4a615c04;hb=d68c91a7a2a3a4b3a312a50cbab5a7539d4cd7d5;hpb=6ce000e7212d9f5db6e5998c41df15bcad2022c8

diff --git a/src/main.cpp b/src/main.cpp
index a2693d1..cdb2d0a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,6 +10,7 @@
 #include <signal.h>
 
 bool ignore_sigfpe = false;
+const char *script_filename;
 
 void sigfpe_handler(int sig)
 {
@@ -20,6 +21,9 @@ void sigfpe_handler(int sig)
 
 int main(int argc, char ** argv)
 {	
+	
+	
+	//Debug("Main!");
 	signal(SIGFPE, sigfpe_handler);
 	#if REALTYPE == REAL_IRRAM
 	  iRRAM_initialize(argc,argv);
@@ -30,9 +34,16 @@ int main(int argc, char ** argv)
 	#endif
 
 	// We want to crash if we ever get a NaN.
+	// AH, so *this* is where that got enabled, I was looking for compiler flags
+	#ifndef __MINGW32__
 	feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+	#endif
+	#if REALTYPE == REAL_MPFRCPP
+	mpfr_set_default_prec(6);
+	#endif
+	DebugRealInfo();
+
 
-	Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REALTYPE, g_real_name[REALTYPE], sizeof(Real));
 
 	Document doc("","fonts/ComicSans.ttf");
 	srand(time(NULL));
@@ -45,19 +56,16 @@ int main(int argc, char ** argv)
 	const char * output_bmp = NULL;
 	const char * input_filename = NULL;
 	const char * input_text = NULL;
-	float b[4] = {0,0,1,1};
+	Real b[4] = {0,0,1,1};
 	int max_frames = -1;
-	bool hide_control_panel;
+	bool hide_control_panel = false;
 	bool lazy_rendering = true;
+	bool window_visible = true;
+	bool gpu_transform = USE_GPU_TRANSFORM;
+	bool gpu_rendering = USE_GPU_RENDERING;
 	
 
 	
-	Screen scr;
-	View view(doc,scr, {0,0,1,1});
-	
-	if (!lazy_rendering)
-		view.SetLazyRendering(false);
-	
 	int i = 0;
 	while (++i < argc)
 	{
@@ -82,10 +90,7 @@ int main(int argc, char ** argv)
 				{
 					if (i+j >= argc)
 						Fatal("No %d bounds component following -b switch", j);
-					char * e;
-					b[j-1] = strtof(argv[i+j], &e);
-					if (*e != '\0')
-						Fatal("Bounds component %d not a valid float", j); 
+					b[j-1] = RealFromStr(argv[i+j]);
 				}
 				i += 4;
 				break;
@@ -105,11 +110,11 @@ int main(int argc, char ** argv)
 					Fatal("Expected \"gpu\" or \"cpu\" after -r switch");
 				if (strcmp(argv[i], "gpu") == 0)
 				{
-					view.SetGPURendering(true);
+					gpu_rendering = true;
 				}
 				else if (strcmp(argv[i], "cpu") == 0)
 				{
-					view.SetGPURendering(false);
+					gpu_rendering = false;
 				}
 				else
 				{
@@ -124,11 +129,11 @@ int main(int argc, char ** argv)
 					Fatal("Expected \"gpu\" or \"cpu\" after -T switch");
 				if (strcmp(argv[i], "gpu") == 0)
 				{
-					view.SetGPUTransform(true);
+					gpu_transform = true;
 				}
 				else if (strcmp(argv[i], "cpu") == 0)
 				{
-					view.SetGPUTransform(false);
+					gpu_transform = false;
 				}
 				else
 				{
@@ -139,7 +144,7 @@ int main(int argc, char ** argv)
 			
 			
 			case 'l':
-				view.SetLazyRendering(!view.UsingLazyRendering());
+				lazy_rendering = !lazy_rendering;
 				break;
 			
 			case 'f':
@@ -153,27 +158,44 @@ int main(int argc, char ** argv)
 				hide_control_panel = true;
 				break;
 					
+			case 'Q':
+				hide_control_panel = true;
+				window_visible = !window_visible;
+				break;
+			case 's':
+				hide_control_panel = true;
+				if (++i >= argc)
+					Fatal("Expected filename after -s switch");
+				script_filename = argv[i];
+				break;
 		}	
 	}
 
 	Rect bounds(b[0],b[1],b[2],b[3]);
-	view.SetBounds(bounds);
+	Screen scr(window_visible);
+	View view(doc,scr, bounds);
+	
+	view.SetLazyRendering(lazy_rendering);
+	view.SetGPURendering(gpu_rendering);
+	view.SetGPUTransform(gpu_transform);
+
 	if (input_filename != NULL)
 	{
-		
-		doc.LoadSVG(input_filename, Rect(bounds.x+bounds.w/Real(2),bounds.y+bounds.h/Real(2),bounds.w/Real(800),bounds.h/Real(600)));
+		#ifdef TRANSFORM_OBJECTS_NOT_VIEW
+			doc.LoadSVG(input_filename, Rect(Real(1)/Real(2),Real(1)/Real(2),Real(1)/Real(800),Real(1)/Real(600)));		
+		#else
+			doc.LoadSVG(input_filename, Rect(bounds.x+bounds.w/Real(2),bounds.y+bounds.h/Real(2),bounds.w/Real(800),bounds.h/Real(600)));
+		#endif
 	}
 	else if (input_text != NULL)
 	{
 		doc.AddText(input_text, bounds.h/Real(2), bounds.x, bounds.y+bounds.h/Real(2));
 	}
-	else
-	{
-		doc.Add(RECT_OUTLINE, Rect(0,0,0,0),0); // hack to stop segfault if document is empty (:S)
-	}
+
 
 
 	#ifndef CONTROLPANEL_DISABLED
+	if (!scr.Valid()) hide_control_panel = true;
 	SDL_Thread * cp_thread = NULL;
 	if (!hide_control_panel)
 	{
@@ -184,16 +206,15 @@ int main(int argc, char ** argv)
 			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
 		}
 	}
-	#endif //CONTROLPANEL_DISABLED
+	#else //CONTROLPANEL_DISABLED
+		Debug("No control panel, hide_control_panel is %d", hide_control_panel);
+	#endif 
 
 	if (mode == LOOP)
 		MainLoop(doc, scr, view, max_frames);
-	else if (mode == OUTPUT_TO_BMP) //TODO: Remove this shit
+	else if (mode == OUTPUT_TO_BMP)
 	{
-		if (view.UsingGPURendering())
-			OverlayBMP(doc, output_bmp, output_bmp, bounds, c);
-		else
-			view.SaveCPUBMP(output_bmp);
+		view.SaveBMP(output_bmp);
 	}
 		
 	#ifndef CONTROLPANEL_DISABLED