mirrors/lavat
1
Fork 0
mirror of https://github.com/AngelJumbo/lavat.git synced 2024-12-22 22:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from kavulox/main

Browse Source 
Updated with new features
This commit is contained in:
AngelJumbo 2022-10-17 10:10:25 -05:00 committed by GitHub
commit d572eec788
1 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lavat.c
View File

@ -6,20 +6,20 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h>
typedef struct ball { typedef struct {
int x; int x;
int y; int y;
int dx; int dx;
int dy; int dy;
} Ball; } Ball;
static char *custom = NULL;
static short color = TB_DEFAULT; static short color = TB_DEFAULT;
static int nballs = 10; static int nballs = 10;
static short speedMult = 1; static short speedMult = 1;
static short rim = 0; static short rim = 0;
static float radius = 100; static float radius = 100;
static bool ova = false;
int parse_options(int argc, char *argv[]); int parse_options(int argc, char *argv[]);
void print_help(); void print_help();
@ -32,7 +32,7 @@ int main(int argc, char *argv[]) {
rim = 0; rim = 0;
time_t t; time_t t;
Ball *balls = (Ball *)malloc(sizeof(Ball) * nballs); Ball *balls = malloc(sizeof(Ball) * nballs);
struct tb_event event = {0}; struct tb_event event = {0};
@ -85,7 +85,29 @@ int main(int argc, char *argv[]) {
(y - balls[k].y) * (y - balls[k].y))); (y - balls[k].y) * (y - balls[k].y)));
} }
} }
if (ova) {
if (sum[0] > radius) {
if (sum[1] > radius) {
tb_printf(i, j, color | TB_BOLD, 0, "%e");
} else {
tb_printf(i, j, color | TB_BOLD, 0, "%e");
}
} else if (sum[1] > radius) {
tb_printf(i, j, color | TB_BOLD, 0, "%e");
}
if (rim) {
if (sum[0] > innerRadius) {
if (sum[1] > innerRadius) {
tb_printf(i, j, color, 0, "%e");
} else {
tb_printf(i, j, color | TB_BOLD, color, "%e");
}
} else if (sum[1] > innerRadius) {
tb_printf(i, j, color | TB_BOLD, color, "%e");
}
}
} else if (!custom) {
if (sum[0] > radius) { if (sum[0] > radius) {
if (sum[1] > radius) { if (sum[1] > radius) {
tb_printf(i, j, color | TB_BOLD, 0, "█"); tb_printf(i, j, color | TB_BOLD, 0, "█");
@ -107,6 +129,29 @@ int main(int argc, char *argv[]) {
tb_printf(i, j, color | TB_BOLD, color, "▀"); tb_printf(i, j, color | TB_BOLD, color, "▀");
} }
} }
} else {
if (sum[0] > radius) {
if (sum[1] > radius) {
tb_printf(i, j, color | TB_BOLD, 0, custom);
} else {
tb_printf(i, j, color | TB_BOLD, 0, custom);
}
} else if (sum[1] > radius) {
tb_printf(i, j, color | TB_BOLD, 0, custom);
}
if (rim) {
if (sum[0] > innerRadius) {
if (sum[1] > innerRadius) {
tb_printf(i, j, color, 0, custom);
} else {
tb_printf(i, j, color | TB_BOLD, color, custom);
}
} else if (sum[1] > innerRadius) {
tb_printf(i, j, color | TB_BOLD, color, custom);
}
}
}
} }
} }
tb_present(); tb_present();
@ -128,7 +173,7 @@ int parse_options(int argc, char *argv[]) {
if (argc == 1) if (argc == 1)
return 1; return 1;
int c; int c;
while ((c = getopt(argc, argv, ":c:s:r:R:b:h")) != -1) { while ((c = getopt(argc, argv, ":c:s:r:R:b:F:th")) != -1) {
switch (c) { switch (c) {
case 'c': case 'c':
if (strcmp(optarg, "red") == 0) { if (strcmp(optarg, "red") == 0) {
@ -179,6 +224,12 @@ int parse_options(int argc, char *argv[]) {
return 0; return 0;
} }
break; break;
case 'F':
custom = optarg;
break;
case 't':
ova = true;
break;
case 'h': case 'h':
print_help(); print_help();
return 0; return 0;
@ -211,6 +262,8 @@ void print_help() {
" This option does not work with the default color\n" " This option does not work with the default color\n"
" -b NBALLS Set the number of metaballs in the simulation, from " " -b NBALLS Set the number of metaballs in the simulation, from "
"2 to 20. (default: 10)\n" "2 to 20. (default: 10)\n"
" -F CHARS Allows for a custom set of chars to be used\n"
" -t Toggles a 3d appearance\n"
" -h Print help.\n" " -h Print help.\n"
"From a tty the rim will not work well.\n"); "From a tty the rim will not work well.\n");
} }