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

diff --git a/src/main.cpp b/src/main.cpp
index d65dc60..a2693d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,10 +7,20 @@
 #define _GNU_SOURCE
 #endif
 #include <fenv.h>
+#include <signal.h>
 
+bool ignore_sigfpe = false;
+
+void sigfpe_handler(int sig)
+{
+	if (!ignore_sigfpe)
+		Fatal("Floating point exception!");
+	exit(EXIT_SUCCESS);
+}
 
 int main(int argc, char ** argv)
 {	
+	signal(SIGFPE, sigfpe_handler);
 	#if REALTYPE == REAL_IRRAM
 	  iRRAM_initialize(argc,argv);
 	#endif
@@ -31,11 +41,23 @@ int main(int argc, char ** argv)
 	
 	
 	Colour c(0,0,0,1);
-	const char * input_bmp = NULL;
+	
 	const char * output_bmp = NULL;
 	const char * input_filename = NULL;
+	const char * input_text = NULL;
 	float b[4] = {0,0,1,1};
+	int max_frames = -1;
+	bool hide_control_panel;
+	bool lazy_rendering = true;
+	
 
+	
+	Screen scr;
+	View view(doc,scr, {0,0,1,1});
+	
+	if (!lazy_rendering)
+		view.SetLazyRendering(false);
+	
 	int i = 0;
 	while (++i < argc)
 	{
@@ -48,13 +70,10 @@ int main(int argc, char ** argv)
 		{
 			case 'o':
 				mode = OUTPUT_TO_BMP;
-				if (++i >= argc)
-					Fatal("No input argument following -o switch");
-				input_bmp = argv[i];
 				if (++i >= argc)
 					Fatal("No output argument following -o switch");
 				output_bmp = argv[i];
-
+				hide_control_panel = true;
 				break;
 			case 'b':
 			{
@@ -71,39 +90,113 @@ int main(int argc, char ** argv)
 				i += 4;
 				break;
 			}
+			case 't':
+			{
+				if (++i >= argc)
+					Fatal("No text input following -t switch");
+				input_text = argv[i];
+				Debug("Insert text: %s", input_text);
+				break;
+			}
+			
+			case 'r':
+			{
+				if (++i >= argc)
+					Fatal("Expected \"gpu\" or \"cpu\" after -r switch");
+				if (strcmp(argv[i], "gpu") == 0)
+				{
+					view.SetGPURendering(true);
+				}
+				else if (strcmp(argv[i], "cpu") == 0)
+				{
+					view.SetGPURendering(false);
+				}
+				else
+				{
+					Fatal("Expected \"gpu\" or \"cpu\" after -r switch, not \"%s\"", argv[i]);
+				}
+				break;
+			}
+			
+			case 'T':
+			{
+				if (++i >= argc)
+					Fatal("Expected \"gpu\" or \"cpu\" after -T switch");
+				if (strcmp(argv[i], "gpu") == 0)
+				{
+					view.SetGPUTransform(true);
+				}
+				else if (strcmp(argv[i], "cpu") == 0)
+				{
+					view.SetGPUTransform(false);
+				}
+				else
+				{
+					Fatal("Expected \"gpu\" or \"cpu\" after -T switch, not \"%s\"", argv[i]);
+				}
+				break;
+			}
+			
+			
+			case 'l':
+				view.SetLazyRendering(!view.UsingLazyRendering());
+				break;
+			
+			case 'f':
+				if (++i >= argc)
+					Fatal("No frame number following -f switch");
+				max_frames = strtol(argv[i], NULL, 10);
+				hide_control_panel = true;
+				break;
+				
+			case 'q':
+				hide_control_panel = true;
+				break;
+					
 		}	
 	}
 
+	Rect bounds(b[0],b[1],b[2],b[3]);
+	view.SetBounds(bounds);
 	if (input_filename != NULL)
 	{
-		doc.LoadSVG(input_filename, Rect(0,0,Real(1)/Real(800),Real(1)/Real(600)));
+		
+		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)));
+	}
+	else if (input_text != NULL)
+	{
+		doc.AddText(input_text, bounds.h/Real(2), bounds.x, bounds.y+bounds.h/Real(2));
 	}
-	else 
+	else
 	{
 		doc.Add(RECT_OUTLINE, Rect(0,0,0,0),0); // hack to stop segfault if document is empty (:S)
 	}
-	Debug("Start!");
-	Rect bounds(b[0],b[1],b[2],b[3]);
-	
-	Screen scr;
-	View view(doc,scr, bounds);
+
 
 	#ifndef CONTROLPANEL_DISABLED
+	SDL_Thread * cp_thread = NULL;
+	if (!hide_control_panel)
+	{
 		ControlPanel::RunArgs args = {argc, argv, view, doc, scr};
-		SDL_Thread * cp_thread = SDL_CreateThread(ControlPanel::Run, "ControlPanel", &args);
+		cp_thread = SDL_CreateThread(ControlPanel::Run, "ControlPanel", &args);
 		if (cp_thread == NULL)
 		{
 			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
 		}
+	}
 	#endif //CONTROLPANEL_DISABLED
 
 	if (mode == LOOP)
-		MainLoop(doc, scr, view);
+		MainLoop(doc, scr, view, max_frames);
 	else if (mode == OUTPUT_TO_BMP) //TODO: Remove this shit
-		OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
+	{
+		if (view.UsingGPURendering())
+			OverlayBMP(doc, output_bmp, output_bmp, bounds, c);
+		else
+			view.SaveCPUBMP(output_bmp);
+	}
 		
 	#ifndef CONTROLPANEL_DISABLED
-		
 		if (cp_thread != NULL)
 		{
 			int cp_return;
@@ -113,5 +206,7 @@ int main(int argc, char ** argv)
 			Debug("ControlPanel thread returned %d", cp_return);
 		}
 	#endif //CONTROLPANEL_DISABLED
+	
+	ignore_sigfpe = true;
 	return 0;
 }