updated -h option

This commit is contained in:
AngelJumbo 2023-01-14 09:39:46 -05:00
parent 988f6bed1e
commit c43c401594
2 changed files with 53 additions and 43 deletions

View File

@ -27,14 +27,25 @@ OPTIONS:
-s <SPEED> Set the speed, from 1 to 10. (default 5) -s <SPEED> Set the speed, from 1 to 10. (default 5)
-r <RADIUS> Set the radius of the metaballs, from 1 to 10. (default: 5) -r <RADIUS> Set the radius of the metaballs, from 1 to 10. (default: 5)
-R <RIM> Set a rim for each metaball, sizes from 1 to 5.(default: none) -R <RIM> Set a rim for each metaball, sizes from 1 to 5.(default: none)
This option does not work with the default color. This option does not work with the default color
If you use Kitty or Alacritty you must use it with the -k option to see the rim.
-k <COLOR> Set the color of the rim if there is one. Available colours: red, blue, yellow, green, cyan and magenta. -k <COLOR> Set the color of the rim if there is one. Available colours: red, blue, yellow, green, cyan and magenta.
-b <NBALLS> Set the number of metaballs in the simulation, from 2 to 20. (default: 10) -b <NBALLS> Set the number of metaballs in the simulation, from 5 to 20. (default: 10)
Increase or decrease the number of balls in runtime with the m and l keys.
-F <CHARS> Allows for a custom set of chars to be used -F <CHARS> Allows for a custom set of chars to be used
Only ascii symbols are supported for now, wide/unicode characters may appear broken. Only ascii symbols are supported for now, wide/unicode chars may appear broken.
-C Retain the entire lava inside the terminal. -C Retain the entire lava inside the terminal.
It may not work well with a lot of balls or with a bigger radius than the default one. It may not work well with a lot of balls or with a bigger radius than the default one.
-h Print help. -h Print help.
RUNTIME CONTROLS:
i Icrease radius of the metaballs.
d Decrease radius of the metaballs.
shift i Icrease rim of the metaballs.
shift d Decrease rim of the metaballs.
m Icrease the number of metaballs.
l Decrease the number metaballs.
+ Icrease speed.
- Decrease speed.
``` ```
## Demo ## Demo

27
lavat.c
View File

@ -51,7 +51,6 @@ int main(int argc, char *argv[]) {
time_t t; time_t t;
// Ball *balls = malloc(sizeof(Ball) * nballs); // Ball *balls = malloc(sizeof(Ball) * nballs);
srand((unsigned)time(&t)); srand((unsigned)time(&t));
tb_init(); tb_init();
@ -135,7 +134,6 @@ int main(int argc, char *argv[]) {
tb_peek_event(&event, 10); tb_peek_event(&event, 10);
event_handler(); event_handler();
} }
tb_shutdown(); tb_shutdown();
@ -204,7 +202,6 @@ void event_handler(){
if (rim + 1 <= 5) { if (rim + 1 <= 5) {
rim++; rim++;
sumConst2 = sumConst * (1 + (float)(0.25 * rim)); sumConst2 = sumConst * (1 + (float)(0.25 * rim));
} }
break; break;
case 'D': case 'D':
@ -213,7 +210,6 @@ void event_handler(){
if (rim - 1 >= 0) { if (rim - 1 >= 0) {
rim--; rim--;
sumConst2 = sumConst * (1 + (float)(0.25 * rim)); sumConst2 = sumConst * (1 + (float)(0.25 * rim));
} }
break; break;
@ -226,7 +222,6 @@ void event_handler(){
} }
} }
void init_params() { void init_params() {
maxX = tb_width(); maxX = tb_width();
@ -319,7 +314,8 @@ int parse_options(int argc, char *argv[]) {
if (nballs > MAX_NBALLS || nballs < MIN_NBALLS) { if (nballs > MAX_NBALLS || nballs < MIN_NBALLS) {
printf("Invalid number of metaballs, only values between %i and %i are" printf("Invalid number of metaballs, only values between %i and %i are"
"allowed\n", MIN_NBALLS,MAX_NBALLS); "allowed\n",
MIN_NBALLS, MAX_NBALLS);
return 0; return 0;
} }
break; break;
@ -354,21 +350,14 @@ void print_help() {
" Besides those colors the default one is the normal" " Besides those colors the default one is the normal"
" foreground of your terminal.\n" " foreground of your terminal.\n"
" -s <SPEED> Set the speed, from 1 to 10. (default 5)\n" " -s <SPEED> Set the speed, from 1 to 10. (default 5)\n"
" Change the speed while the program runs "
"with the - and + keys.\n"
" -r <RADIUS> Set the radius of the metaballs, from 1 to 10. " " -r <RADIUS> Set the radius of the metaballs, from 1 to 10. "
"(default: 5)\n" "(default: 5)\n"
" Increase and decrease the radius in runtime with"
"the i and d keys.\n"
" -R <RIM> Set a rim for each metaball, sizes from 1 to 5." " -R <RIM> Set a rim for each metaball, sizes from 1 to 5."
"(default: none)\n" "(default: none)\n"
" This option does not work with the default " " This option does not work with the default "
"color\n" "color\n"
" If you use Kitty or Alacritty you must use it " " If you use Kitty or Alacritty you must use it "
"with the -k option to see the rim.\n" "with the -k option to see the rim.\n"
" Increase and decrease the rim in runtime with "
"shift+i and shift+d."
" -k <COLOR> Set the color of the rim if there is one." " -k <COLOR> Set the color of the rim if there is one."
" Available colours: red, blue, yellow, green, cyan and magenta. \n" " Available colours: red, blue, yellow, green, cyan and magenta. \n"
" -b <NBALLS> Set the number of metaballs in the simulation, " " -b <NBALLS> Set the number of metaballs in the simulation, "
@ -383,6 +372,16 @@ void print_help() {
" It may not work well with a lot of balls or with" " It may not work well with a lot of balls or with"
" a bigger radius than the default one.\n" " a bigger radius than the default one.\n"
" -h Print help.\n" " -h Print help.\n"
"RUNTIME CONTROLS:\n"
" i Icrease radius of the metaballs.\n"
" d Decrease radius of the metaballs.\n"
" shift i Icrease rim of the metaballs.\n"
" shift d Decrease rim of the metaballs.\n"
" m Icrease the number of metaballs.\n"
" l Decrease the number metaballs.\n"
" + Icrease speed.\n"
" - Decrease speed.\n"
"(Tip: Zoom out in your terminal before running the program to get a " "(Tip: Zoom out in your terminal before running the program to get a "
"better resolution of the lava).\n",MIN_NBALLS,MAX_NBALLS); "better resolution of the lava).\n",
MIN_NBALLS, MAX_NBALLS);
} }