From 0d847838c533c4ba96ced4fec7d7b12697de9685 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 17 Jul 2016 12:07:26 +0200 Subject: Import bcollide from jwildfire --- flam3.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'flam3.h') diff --git a/flam3.h b/flam3.h index 8415974..b26c57a 100644 --- a/flam3.h +++ b/flam3.h @@ -30,8 +30,6 @@ extern char *flam3_variation_names[]; -#define flam3_nvariations 100 - #define flam3_interpolation_linear 0 #define flam3_interpolation_smooth 1 @@ -145,6 +143,8 @@ typedef enum { #define VAR_FLUX 97 #define VAR_MOBIUS 98 #define VAR_ASTERIA 99 +#define VAR_BCOLLIDE 100 +#define flam3_nvariations 101 #include "vector.h" #include "random.h" @@ -372,6 +372,11 @@ typedef struct xform { /* precalc */ double asteria_sina, asteria_cosa; + /* bcollide */ + double bcollide_num, bcollide_a; + /* precalc */ + double bcollide_bCa, bcollide_bCn_pi, bcollide_bCa_bCn, bcollide_pi_bCn; + int num_active_vars; double active_var_weights[flam3_nvariations]; int varFunc[flam3_nvariations]; -- cgit v1.2.3