Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New: Fractal / More formulae / Clock #250

Merged
merged 1 commit into from
May 7, 2024
+110 −0
Merged

New: Fractal / More formulae / Clock #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 110 additions & 0 deletions src/engine/formulas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,77 @@ static unsigned int incolor_output(number_t zre, number_t zim, number_t pre,
#define RANGE 2
#include "docalc.h"

#define VARIABLES
#define INIT
#define BTEST (zre * zre + zim * zim < 0.6944444444444445)
#define FORMULA \
const double rd = 0.25; \
zre = 3 * zre; \
zim = 3 * zim; \
if ((zim + 2) * (zim + 2) + zre * zre < rd) { \
zim = zim + 2; \
} \
if ((zim + 1.7320508075688772) * (zim + 1.7320508075688772) + \
(zre + 1) * (zre + 1) < \
rd) { \
zim = zim + 1.7320508075688772; \
zre = zre + 1; \
} \
if ((zim + 1) * (zim + 1) + \
(zre + 1.7320508075688772) * (zre + 1.7320508075688772) < \
rd) { \
zim = zim + 1; \
zre = zre + 1.7320508075688772; \
} \
if ((zre + 2) * (zre + 2) + zim * zim < rd) { \
zre = zre + 2; \
} \
if ((zim - 1) * (zim - 1) + \
(zre + 1.7320508075688772) * (zre + 1.7320508075688772) < \
rd) { \
zim = zim - 1; \
zre = zre + 1.7320508075688772; \
} \
if ((zim - 1.7320508075688772) * (zim - 1.7320508075688772) + \
(zre + 1) * (zre + 1) < \
rd) { \
zim = zim - 1.7320508075688772; \
zre = zre + 1; \
} \
if ((zim - 2) * (zim - 2) + zre * zre < rd) { \
zim = zim - 2; \
} \
if ((zim - 1.7320508075688772) * (zim - 1.7320508075688772) + \
(zre - 1) * (zre - 1) < \
rd) { \
zim = zim - 1.7320508075688772; \
zre = zre - 1; \
} \
if ((zim - 1) * (zim - 1) + \
(zre - 1.7320508075688772) * (zre - 1.7320508075688772) < \
rd) { \
zim = zim - 1; \
zre = zre - 1.7320508075688772; \
} \
if ((zre - 2) * (zre - 2) + zim * zim < rd) { \
zre = zre - 2; \
} \
if ((zim + 1) * (zim + 1) + \
(zre - 1.7320508075688772) * (zre - 1.7320508075688772) < \
rd) { \
zim = zim + 1; \
zre = zre - 1.7320508075688772; \
} \
if ((zim + 1.7320508075688772) * (zim + 1.7320508075688772) + \
(zre - 1) * (zre - 1) < \
rd) { \
zim = zim + 1.7320508075688772; \
zre = zre - 1; \
}
#define CALC clock_calc
#define RANGE 2
#include "docalc.h"

#define VARIABLES
#define INIT
#define BTEST less_than_4((rp + ip) / 4.0)
Expand Down Expand Up @@ -2452,6 +2523,45 @@ const struct formula formulas[] = {
},
MANDEL_BTRACE,
},
{
FORMULAMAGIC,
clock_calc,
NULL,
NULL,
NULL,
NULL,
{"Clock", "Clock"},
"clock",
{0.0, 0.0, 2.5, 2.5},
0, 0, 0.0, 0.0,
{
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
},
{
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
{INT_MAX, INT_MAX, 0, NULL},
},
MANDEL_BTRACE,
},
{ /* formula added by Arpad Fekete *//* 28 */
FORMULAMAGIC,
symbarn_calc,
Expand Down