git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Can render a BMP but things are still going wrong
[ipdf/code.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
339ea8d
..
12d8d56
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-4,19
+4,66
@@
int main(int argc, char ** argv)
{
Document doc;
srand(time(NULL));
- if (argc > 1)
+
+ enum {OUTPUT_TO_BMP, LOOP} mode = LOOP;
+
+ Rect bounds(0,0,1,1);
+ Colour c(0,0,0,1);
+ const char * input_bmp = NULL;
+ const char * output_bmp = NULL;
+ const char * input_filename = NULL;
+
+ int i = 0;
+ while (++i < argc)
{
-
for (int i = 2; i < argc; ++i
)
+
if (argv[i][0] != '-'
)
{
- if (fork() == 0) doc.Load(argv[i]);
+ input_filename = argv[i];
+ continue;
}
- doc.Load(argv[1]);
+ switch (argv[i][1])
+ {
+ 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];
+
+ break;
+ case 'c':
+ {
+ Debug("Reading paint colour");
+ for (int j = 1; j <= 4; ++j)
+ {
+ if (i+j >= argc)
+ Fatal("No %d colour component following -c switch", j);
+ char * e;
+ float * comp = (j == 1) ? (&c.r) : ((j == 2) ? (&c.g) : ((j == 3) ? (&c.b) : &(c.a)));
+ *comp = strtof(argv[i+j], &e);
+ if (*e != '\0')
+ Fatal("Colour component %d not a valid float", j);
+ }
+ i += 4;
+ break;
+ }
+ }
+ }
+
+ if (input_filename != NULL)
+ {
+ doc.Load(input_filename);
}
- else
+ else
{
- Debug("Add random object");
- doc.Add(RECT_FILLED, Rect(Random()*0.5, Random()*0.5, Random()*0.5, Random()*0.5));
+ doc.Add(RECT_FILLED, Rect(0.2,0.2,0.6,0.6));
}
- MainLoop(doc);
+
+ if (mode == LOOP)
+ MainLoop(doc, bounds, c);
+ else if (mode == OUTPUT_TO_BMP)
+ OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
return 0;
}
UCC
git Repository :: git.ucc.asn.au