diff options
| author | June McEnroe <june@causal.agency> | 2018-08-26 23:14:48 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2018-08-26 23:14:48 -0400 |
| commit | c5ee7405e650fd184deaf55794b4843f733c3986 (patch) | |
| tree | ba1d6f17248815297cc5ae9ffe209738e05673a8 | |
| parent | Update help page (diff) | |
| download | torus-c5ee7405e650fd184deaf55794b4843f733c3986.tar.gz torus-c5ee7405e650fd184deaf55794b4843f733c3986.zip | |
Map modifyCount on log scale
| -rw-r--r-- | client.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/client.c b/client.c index 29e1cce..1478ebe 100644 --- a/client.c +++ b/client.c @@ -16,6 +16,7 @@ #define _XOPEN_SOURCE_EXTENDED +#include <assert.h> #include <curses.h> #include <err.h> #include <errno.h> @@ -45,6 +46,11 @@ enum { DEL = 0x7F, }; +static uint32_t log2(uint32_t n) { + assert(n > 0); + return 32 - __builtin_clz(n) - 1; +} + static void curse(void) { setlocale(LC_CTYPE, ""); @@ -190,15 +196,21 @@ static void serverMap(void) { for (uint8_t x = 0; x < MAP_COLS; ++x) { struct Meta meta = map.meta[y][x]; - uint32_t count = DIV_ROUND( - (ARRAY_LEN(MAP_CELLS) - 1) * meta.modifyCount, - map.max.modifyCount - ); - uint32_t time = DIV_ROUND( - (ARRAY_LEN(MAP_COLORS) - 1) * (meta.modifyTime - map.min.createTime), - map.now - map.min.createTime - ); - if (!meta.modifyTime) time = 0; + uint32_t count = 0; + if (meta.modifyCount && log2(map.max.modifyCount)) { + count = DIV_ROUND( + (ARRAY_LEN(MAP_CELLS) - 1) * log2(meta.modifyCount), + log2(map.max.modifyCount) + ); + } + uint32_t time = 0; + if (meta.modifyTime) { + uint32_t modify = meta.modifyTime - map.min.createTime; + time = DIV_ROUND( + (ARRAY_LEN(MAP_COLORS) - 1) * modify, + map.now - map.min.createTime + ); + } wchar_t cell = MAP_CELLS[count]; uint8_t color = MAP_COLORS[time]; |