Merge branch 'master' of git.ucc.asn.au:/ipdf/code

[ipdf/code.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 598de72..9af7bbc 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,15 +2,24 @@
 #include <unistd.h> // Because we can.
 int main(int argc, char ** argv)
 {      
+       #ifndef __STDC_IEC_559__
+               Warn("__STDC_IEC_559__ not defined. IEEE 754 floating point not fully supported.\n");
+       #endif
+
+
+       Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REAL, g_real_name[REAL], sizeof(Real));
+
        Document doc;
        srand(time(NULL));
 
        enum {OUTPUT_TO_BMP, LOOP} mode = LOOP;
        
-       Rect bounds(0,0,1,1);
+       
        Colour c(0,0,0,1);
-       const char * output_to_bmp = NULL;
+       const char * input_bmp = NULL;
+       const char * output_bmp = NULL;
        const char * input_filename = NULL;
+       float b[4] = {0,0,1,1};
 
        int i = 0;
        while (++i < argc)
@@ -25,8 +34,12 @@ int main(int argc, char ** argv)
                        case 'o':
                                mode = OUTPUT_TO_BMP;
                                if (++i >= argc)
-                                       Fatal("No argument following -o switch");
-                               output_to_bmp = argv[i];
+                                       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];
+
                                break;
                        case 'c':
                        {
@@ -44,6 +57,21 @@ int main(int argc, char ** argv)
                                i += 4;
                                break;
                        }
+                       case 'b':
+                       {
+                               Debug("Reading view bounds");
+                               for (int j = 1; j <= 4; ++j)
+                               {
+                                       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); 
+                               }
+                               i += 4;
+                               break;
+                       }
                }       
        }
 
@@ -51,14 +79,35 @@ int main(int argc, char ** argv)
        {
                doc.Load(input_filename);
        }
-       else
+       else 
        {
-               doc.Add(RECT_FILLED, Rect(0.2,0.2,0.6,0.6));
+               doc.AddBezierData(Bezier(0,0,0,1,1,0));
+               //doc.AddBezierData(Bezier(0,0,1,0,0,1));
+               //doc.AddBezierData(Bezier(0,0,1,1,1,0));
+               //doc.AddBezierData(Bezier(0,1,1,0,0,1));
+               
+               
+               
+               for(int x = 0; x < 8; ++x)
+               {
+                       
+                       for (int y = 0; y < 8; ++y)
+                       {
+                               //doc.Add(static_cast<IPDF::ObjectType>((x^y)%3), Rect(0.2+x-4.0,0.2+y-4.0,0.6,0.6));
+                               //doc.Add(BEZIER, Rect(0.2+x-4.0, 0.2+y-4.0, 0.6,0.6), (x^y)%3);
+                       }
+               }
+               Debug("Make rect");
+               doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 0);
+               Debug("Made rect");
+               
        }
+       Debug("Start!");
+       Rect bounds(b[0],b[1],b[2],b[3]);
 
        if (mode == LOOP)
                MainLoop(doc, bounds, c);
        else if (mode == OUTPUT_TO_BMP)
-               OverlayBMP(doc, output_to_bmp, bounds, c);
+               OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
        return 0;
 }