diff --git a/Makefile.rv b/Makefile.rv index 266116f7..fdb2900d 100644 --- a/Makefile.rv +++ b/Makefile.rv @@ -191,6 +191,9 @@ treeoflife-white: hyper collatz: hyper ${CMD} -canvas h -dftcolor 206020FF -ggamma 2 -collatz .3,.5,-.4,.4 +collatz-bird: hyper + ${CMD} -canvas h -dftcolor R -ggamma 2 -geo 435h -collatz3 txy .3 fd .25 tyz pi/2 / txy -.4 fd .2 tyz pi/2 -PM 0 -rvshape 3 -I Flash 100 -I Speed 100 + fullnet: hyper ${CMD} -dftcolor 808080FF -ggamma 2 -back FFFFFF -net diff --git a/commandline.cpp b/commandline.cpp index c94672f4..6085d16a 100644 --- a/commandline.cpp +++ b/commandline.cpp @@ -60,9 +60,10 @@ namespace arg { int pos; void lshift() { pos++; } + void unshift() { pos--; } void shift() { - lshift(); if(pos > isize(argument)) { printf("Missing parameter\n"); exit(1); } + lshift(); if(pos >= isize(argument)) { printf("Missing parameter\n"); exit(1); } } bool nomore() { return pos >= isize(argument); } @@ -74,7 +75,7 @@ namespace arg { ld argf() { return parseld(args()); } bool argis(const string& s) { if(args()[0] == '-' && args()[1] == '-') return args().substr(1) == s; return args() == s; } - void init(int argc, char **argv) { for(int i=0; i