From e7f1780c5c05840ec3eca54b83d76c2658bf5de8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 11 Jul 2017 21:40:43 +0200 Subject: blind-spiral-gradient: add -t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/blind-spiral-gradient.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/blind-spiral-gradient.c b/src/blind-spiral-gradient.c index 5d80bef..1eb71bd 100644 --- a/src/blind-spiral-gradient.c +++ b/src/blind-spiral-gradient.c @@ -1,10 +1,11 @@ /* See LICENSE file for copyright and license details. */ #include "common.h" -USAGE("[-s spirals] [-al] -w width -h height") +USAGE("[-s spirals | t] [-al] -w width -h height") static int anticlockwise = 0; static int logarithmic = 0; +static int angle = 0; static double spirals = 1; static size_t width = 0; static size_t height = 0; @@ -98,7 +99,10 @@ static int with_vector; r = pow(r / b, ep);\ r = (r - v) / (2 * (TYPE)M_PI);\ }\ - r = mod(r, 1 / (TYPE)spirals) * (TYPE)spirals + r - mod(r, (TYPE)1);\ + if (angle)\ + r = (int)(r + 1) + v / (2 * (TYPE)M_PI);\ + else\ + r = mod(r, 1 / (TYPE)spirals) * (TYPE)spirals + r - mod(r, (TYPE)1);\ buf[ptr][0] = buf[ptr][1] = buf[ptr][2] = buf[ptr][3] = r;\ if (++ptr == ELEMENTSOF(buf)) {\ ewriteall(STDOUT_FILENO, buf, sizeof(buf), "");\ @@ -131,6 +135,9 @@ main(int argc, char *argv[]) if (!spirals) eprintf("the value of -s must not be 0"); break; + case 't': + angle = 1; + break; case 'w': width = etozu_flag('w', UARGF(), 1, SIZE_MAX); break; @@ -141,7 +148,7 @@ main(int argc, char *argv[]) usage(); } ARGEND; - if (!width || !height || argc) + if (!width || !height || argc || (spirals != 1 && angle)) usage(); eopen_stream(&stream, NULL); -- cgit v1.2.3-70-g09d2