aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cart2del_damp_2d.c24
-rw-r--r--src/cart2del_damp_3d.c82
-rw-r--r--src/early_reflections_2d.c24
-rw-r--r--src/early_reflections_3d.c82
4 files changed, 106 insertions, 106 deletions
diff --git a/src/cart2del_damp_2d.c b/src/cart2del_damp_2d.c
index a711e3f..d547997 100644
--- a/src/cart2del_damp_2d.c
+++ b/src/cart2del_damp_2d.c
@@ -106,7 +106,7 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
t_float diff_x, diff_y;
t_float sum_x, sum_y;
t_float lx, wy;
- t_float x0, y0;
+ t_float x0, y0_;
t_float xp1, yp1;
t_float xn1, yn1;
t_float xp2, yp2;
@@ -126,7 +126,7 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
sum_y = x->x_src_y + x->x_head_y;
x0 = diff_x;
- y0 = diff_y;
+ y0_ = diff_y;
xp1 = lx - sum_x;
yp1 = wy - sum_y;
xn1 = -lx - sum_x;
@@ -136,14 +136,14 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
xn2 = -2.0f*lx + diff_x;
yn2 = -2.0f*wy + diff_y;
- rad[0] = cart2del_damp_2d_calc_radius(r_ambi, x0, y0);
- rad[1] = cart2del_damp_2d_calc_radius(r_ambi, xp1, y0);
+ rad[0] = cart2del_damp_2d_calc_radius(r_ambi, x0, y0_);
+ rad[1] = cart2del_damp_2d_calc_radius(r_ambi, xp1, y0_);
rad[2] = cart2del_damp_2d_calc_radius(r_ambi, x0, yp1);
- rad[3] = cart2del_damp_2d_calc_radius(r_ambi, xn1, y0);
+ rad[3] = cart2del_damp_2d_calc_radius(r_ambi, xn1, y0_);
rad[4] = cart2del_damp_2d_calc_radius(r_ambi, x0, yn1);
- rad[5] = cart2del_damp_2d_calc_radius(r_ambi, xp2, y0);
+ rad[5] = cart2del_damp_2d_calc_radius(r_ambi, xp2, y0_);
rad[6] = cart2del_damp_2d_calc_radius(r_ambi, x0, yp2);
- rad[7] = cart2del_damp_2d_calc_radius(r_ambi, xn2, y0);
+ rad[7] = cart2del_damp_2d_calc_radius(r_ambi, xn2, y0_);
rad[8] = cart2del_damp_2d_calc_radius(r_ambi, x0, yn2);
rad[9] = cart2del_damp_2d_calc_radius(r_ambi, xp1, yp1);
rad[10] = cart2del_damp_2d_calc_radius(r_ambi, xn1, yn1);
@@ -220,12 +220,12 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
SETSYMBOL(at, x->x_s_index_phi);
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, x0, y0));
+ SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, x0, y0_));
outlet_anything(x->x_obj.ob_outlet, x->x_s_direct, 3, at);
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xp1, y0));
+ SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xp1, y0_));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 3, at);
SETFLOAT(at+1, 2.0f);
@@ -233,7 +233,7 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 3, at);
SETFLOAT(at+1, 3.0f);
- SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xn1, y0));
+ SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xn1, y0_));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 3, at);
SETFLOAT(at+1, 4.0f);
@@ -242,7 +242,7 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xp2, y0));
+ SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xp2, y0_));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 3, at);
SETFLOAT(at+1, 2.0f);
@@ -250,7 +250,7 @@ static void cart2del_damp_2d_doit(t_cart2del_damp_2d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 3, at);
SETFLOAT(at+1, 3.0f);
- SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xn2, y0));
+ SETFLOAT(at+2, cart2del_damp_2d_calc_azimuth(x_180_over_pi, xn2, y0_));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 3, at);
SETFLOAT(at+1, 4.0f);
diff --git a/src/cart2del_damp_3d.c b/src/cart2del_damp_3d.c
index a73be18..840dcc7 100644
--- a/src/cart2del_damp_3d.c
+++ b/src/cart2del_damp_3d.c
@@ -160,7 +160,7 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
t_float diff_x, diff_y, diff_z;
t_float sum_x, sum_y, sum_z;
t_float lx, wy, hz;
- t_float x0, y0, z0;
+ t_float x0, y0_, z0;
t_float xp1, yp1, zp1;
t_float xn1, yn1, zn1;
t_float xp2, yp2, zp2;
@@ -183,7 +183,7 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
sum_z = x->x_src_z + x->x_head_z - hz;
x0 = diff_x;
- y0 = diff_y;
+ y0_ = diff_y;
z0 = diff_z;
xp1 = lx - sum_x;
yp1 = wy - sum_y;
@@ -198,30 +198,30 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
yn2 = -2.0f*wy + diff_y;
zn2 = -2.0f*hz + diff_z;
- rad[0] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0, z0);
- rad[1] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0, z0);
+ rad[0] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0_, z0);
+ rad[1] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0_, z0);
rad[2] = cart2del_damp_3d_calc_radius(r_ambi, x0, yp1, z0);
- rad[3] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0, zp1);
- rad[4] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0, z0);
+ rad[3] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0_, zp1);
+ rad[4] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0_, z0);
rad[5] = cart2del_damp_3d_calc_radius(r_ambi, x0, yn1, z0);
- rad[6] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0, zn1);
- rad[7] = cart2del_damp_3d_calc_radius(r_ambi, xp2, y0, z0);
+ rad[6] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0_, zn1);
+ rad[7] = cart2del_damp_3d_calc_radius(r_ambi, xp2, y0_, z0);
rad[8] = cart2del_damp_3d_calc_radius(r_ambi, x0, yp2, z0);
- rad[9] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0, zp2);
- rad[10] = cart2del_damp_3d_calc_radius(r_ambi, xn2, y0, z0);
+ rad[9] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0_, zp2);
+ rad[10] = cart2del_damp_3d_calc_radius(r_ambi, xn2, y0_, z0);
rad[11] = cart2del_damp_3d_calc_radius(r_ambi, x0, yn2, z0);
- rad[12] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0, zn2);
+ rad[12] = cart2del_damp_3d_calc_radius(r_ambi, x0, y0_, zn2);
rad[13] = cart2del_damp_3d_calc_radius(r_ambi, xp1, yp1, z0);
- rad[14] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0, zp1);
+ rad[14] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0_, zp1);
rad[15] = cart2del_damp_3d_calc_radius(r_ambi, x0, yp1, zp1);
rad[16] = cart2del_damp_3d_calc_radius(r_ambi, xn1, yn1, z0);
- rad[17] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0, zn1);
+ rad[17] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0_, zn1);
rad[18] = cart2del_damp_3d_calc_radius(r_ambi, x0, yn1, zn1);
rad[19] = cart2del_damp_3d_calc_radius(r_ambi, xp1, yn1, z0);
- rad[20] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0, zn1);
+ rad[20] = cart2del_damp_3d_calc_radius(r_ambi, xp1, y0_, zn1);
rad[21] = cart2del_damp_3d_calc_radius(r_ambi, x0, yp1, zn1);
rad[22] = cart2del_damp_3d_calc_radius(r_ambi, xn1, yp1, z0);
- rad[23] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0, zp1);
+ rad[23] = cart2del_damp_3d_calc_radius(r_ambi, xn1, y0_, zp1);
rad[24] = cart2del_damp_3d_calc_radius(r_ambi, x0, yn1, zp1);
/* delay-reihenfolge: 0 auslassen,
@@ -325,14 +325,14 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
SETSYMBOL(at, x->x_s_index_theta_phi);
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0, z0));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0, z0));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0_, z0));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0_, z0));
outlet_anything(x->x_obj.ob_outlet, x->x_s_direct, 4, at);
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0, z0));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0, z0));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0_, z0));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0_, z0));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 2.0f);
@@ -341,13 +341,13 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 3.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0, zp1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0, zp1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0_, zp1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0_, zp1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 4.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0, z0));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0, z0));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0_, z0));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0_, z0));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 5.0f);
@@ -356,14 +356,14 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 6.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0, zn1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0, zn1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0_, zn1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0_, zn1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early1, 4, at);
SETFLOAT(at+1, 1.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp2, y0, z0));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp2, y0, z0));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp2, y0_, z0));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp2, y0_, z0));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 2.0f);
@@ -372,13 +372,13 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 3.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0, zp2));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0, zp2));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0_, zp2));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0_, zp2));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 4.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn2, y0, z0));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn2, y0, z0));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn2, y0_, z0));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn2, y0_, z0));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 5.0f);
@@ -387,8 +387,8 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 6.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0, zn2));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0, zn2));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, x0, y0_, zn2));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, x0, y0_, zn2));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 7.0f);
@@ -397,8 +397,8 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 8.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0, zp1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0, zp1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0_, zp1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0_, zp1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 9.0f);
@@ -412,8 +412,8 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 11.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0, zn1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0, zn1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0_, zn1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0_, zn1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 12.0f);
@@ -427,8 +427,8 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 14.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0, zn1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0, zn1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xp1, y0_, zn1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xp1, y0_, zn1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 15.0f);
@@ -442,8 +442,8 @@ static void cart2del_damp_3d_doit(t_cart2del_damp_3d *x)
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 17.0f);
- SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0, zp1));
- SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0, zp1));
+ SETFLOAT(at+2, cart2del_damp_3d_calc_elevation(x_180_over_pi, xn1, y0_, zp1));
+ SETFLOAT(at+3, cart2del_damp_3d_calc_azimuth(x_180_over_pi, xn1, y0_, zp1));
outlet_anything(x->x_obj.ob_outlet, x->x_s_early2, 4, at);
SETFLOAT(at+1, 18.0f);
diff --git a/src/early_reflections_2d.c b/src/early_reflections_2d.c
index 1fd3693..de7a5ea 100644
--- a/src/early_reflections_2d.c
+++ b/src/early_reflections_2d.c
@@ -155,7 +155,7 @@ static void early_reflections_2d_doit(t_early_reflections_2d *x)
t_float diff_x, diff_y;
t_float sum_x, sum_y;
t_float lx, wy;
- t_float x0, y0;
+ t_float x0, y0_;
t_float xp1, yp1;
t_float xn1, yn1;
t_float xp2, yp2;
@@ -182,7 +182,7 @@ static void early_reflections_2d_doit(t_early_reflections_2d *x)
sum_y = x->x_src_y[i] + x->x_head_y;
x0 = diff_x;
- y0 = diff_y;
+ y0_ = diff_y;
xp1 = lx - sum_x;
yp1 = wy - sum_y;
xn1 = -lx - sum_x;
@@ -192,14 +192,14 @@ static void early_reflections_2d_doit(t_early_reflections_2d *x)
xn2 = -2.0f*lx + diff_x;
yn2 = -2.0f*wy + diff_y;
- rad[0] = early_reflections_2d_calc_radius(r_ambi, x0, y0);
- rad[1] = early_reflections_2d_calc_radius(r_ambi, xp1, y0);
+ rad[0] = early_reflections_2d_calc_radius(r_ambi, x0, y0_);
+ rad[1] = early_reflections_2d_calc_radius(r_ambi, xp1, y0_);
rad[2] = early_reflections_2d_calc_radius(r_ambi, x0, yp1);
- rad[3] = early_reflections_2d_calc_radius(r_ambi, xn1, y0);
+ rad[3] = early_reflections_2d_calc_radius(r_ambi, xn1, y0_);
rad[4] = early_reflections_2d_calc_radius(r_ambi, x0, yn1);
- rad[5] = early_reflections_2d_calc_radius(r_ambi, xp2, y0);
+ rad[5] = early_reflections_2d_calc_radius(r_ambi, xp2, y0_);
rad[6] = early_reflections_2d_calc_radius(r_ambi, x0, yp2);
- rad[7] = early_reflections_2d_calc_radius(r_ambi, xn2, y0);
+ rad[7] = early_reflections_2d_calc_radius(r_ambi, xn2, y0_);
rad[8] = early_reflections_2d_calc_radius(r_ambi, x0, yn2);
rad[9] = early_reflections_2d_calc_radius(r_ambi, xp1, yp1);
rad[10] = early_reflections_2d_calc_radius(r_ambi, xn1, yn1);
@@ -297,7 +297,7 @@ static void early_reflections_2d_doit(t_early_reflections_2d *x)
*/
at = x->x_para_at+1;
- SETFLOAT(at, early_reflections_2d_calc_azimuth(x_180_over_pi, x0, y0));
+ SETFLOAT(at, early_reflections_2d_calc_azimuth(x_180_over_pi, x0, y0_));
outlet_anything(x->x_direct_out, x->x_s_index_phi, 2, x->x_para_at);
@@ -309,13 +309,13 @@ static void early_reflections_2d_doit(t_early_reflections_2d *x)
+1x-1y, -1x+1y
*/
- phi[0] = early_reflections_2d_calc_azimuth(x_180_over_pi, xp1, y0);
+ phi[0] = early_reflections_2d_calc_azimuth(x_180_over_pi, xp1, y0_);
phi[1] = early_reflections_2d_calc_azimuth(x_180_over_pi, x0, yp1);
- phi[2] = early_reflections_2d_calc_azimuth(x_180_over_pi, xn1, y0);
+ phi[2] = early_reflections_2d_calc_azimuth(x_180_over_pi, xn1, y0_);
phi[3] = early_reflections_2d_calc_azimuth(x_180_over_pi, x0, yn1);
- phi[4] = early_reflections_2d_calc_azimuth(x_180_over_pi, xp2, y0);
+ phi[4] = early_reflections_2d_calc_azimuth(x_180_over_pi, xp2, y0_);
phi[5] = early_reflections_2d_calc_azimuth(x_180_over_pi, x0, yp2);
- phi[6] = early_reflections_2d_calc_azimuth(x_180_over_pi, xn2, y0);
+ phi[6] = early_reflections_2d_calc_azimuth(x_180_over_pi, xn2, y0_);
phi[7] = early_reflections_2d_calc_azimuth(x_180_over_pi, x0, yn2);
phi[8] = early_reflections_2d_calc_azimuth(x_180_over_pi, xp1, yp1);
phi[9] = early_reflections_2d_calc_azimuth(x_180_over_pi, xn1, yn1);
diff --git a/src/early_reflections_3d.c b/src/early_reflections_3d.c
index c33ec94..f11330b 100644
--- a/src/early_reflections_3d.c
+++ b/src/early_reflections_3d.c
@@ -244,7 +244,7 @@ static void early_reflections_3d_doit(t_early_reflections_3d *x)
t_float diff_x, diff_y, diff_z;
t_float sum_x, sum_y, sum_z;
t_float lx, wy, hz;
- t_float x0, y0, z0;
+ t_float x0, y0_, z0;
t_float xp1, yp1, zp1;
t_float xn1, yn1, zn1;
t_float xp2, yp2, zp2;
@@ -281,7 +281,7 @@ static void early_reflections_3d_doit(t_early_reflections_3d *x)
sum_z = x->x_src_z[i] + x->x_head_z - hz;
x0 = diff_x;
- y0 = diff_y;
+ y0_ = diff_y;
z0 = diff_z;
xp1 = lx - sum_x;
yp1 = wy - sum_y;
@@ -296,30 +296,30 @@ static void early_reflections_3d_doit(t_early_reflections_3d *x)
yn2 = -2.0f*wy + diff_y;
zn2 = -2.0f*hz + diff_z;
- rad[0] = early_reflections_3d_calc_radius(r_ambi, x0, y0, z0);
- rad[1] = early_reflections_3d_calc_radius(r_ambi, xp1, y0, z0);
+ rad[0] = early_reflections_3d_calc_radius(r_ambi, x0, y0_, z0);
+ rad[1] = early_reflections_3d_calc_radius(r_ambi, xp1, y0_, z0);
rad[2] = early_reflections_3d_calc_radius(r_ambi, x0, yp1, z0);
- rad[3] = early_reflections_3d_calc_radius(r_ambi, x0, y0, zp1);
- rad[4] = early_reflections_3d_calc_radius(r_ambi, xn1, y0, z0);
+ rad[3] = early_reflections_3d_calc_radius(r_ambi, x0, y0_, zp1);
+ rad[4] = early_reflections_3d_calc_radius(r_ambi, xn1, y0_, z0);
rad[5] = early_reflections_3d_calc_radius(r_ambi, x0, yn1, z0);
- rad[6] = early_reflections_3d_calc_radius(r_ambi, x0, y0, zn1);
- rad[7] = early_reflections_3d_calc_radius(r_ambi, xp2, y0, z0);
+ rad[6] = early_reflections_3d_calc_radius(r_ambi, x0, y0_, zn1);
+ rad[7] = early_reflections_3d_calc_radius(r_ambi, xp2, y0_, z0);
rad[8] = early_reflections_3d_calc_radius(r_ambi, x0, yp2, z0);
- rad[9] = early_reflections_3d_calc_radius(r_ambi, x0, y0, zp2);
- rad[10] = early_reflections_3d_calc_radius(r_ambi, xn2, y0, z0);
+ rad[9] = early_reflections_3d_calc_radius(r_ambi, x0, y0_, zp2);
+ rad[10] = early_reflections_3d_calc_radius(r_ambi, xn2, y0_, z0);
rad[11] = early_reflections_3d_calc_radius(r_ambi, x0, yn2, z0);
- rad[12] = early_reflections_3d_calc_radius(r_ambi, x0, y0, zn2);
+ rad[12] = early_reflections_3d_calc_radius(r_ambi, x0, y0_, zn2);
rad[13] = early_reflections_3d_calc_radius(r_ambi, xp1, yp1, z0);
- rad[14] = early_reflections_3d_calc_radius(r_ambi, xp1, y0, zp1);
+ rad[14] = early_reflections_3d_calc_radius(r_ambi, xp1, y0_, zp1);
rad[15] = early_reflections_3d_calc_radius(r_ambi, x0, yp1, zp1);
rad[16] = early_reflections_3d_calc_radius(r_ambi, xn1, yn1, z0);
- rad[17] = early_reflections_3d_calc_radius(r_ambi, xn1, y0, zn1);
+ rad[17] = early_reflections_3d_calc_radius(r_ambi, xn1, y0_, zn1);
rad[18] = early_reflections_3d_calc_radius(r_ambi, x0, yn1, zn1);
rad[19] = early_reflections_3d_calc_radius(r_ambi, xp1, yn1, z0);
- rad[20] = early_reflections_3d_calc_radius(r_ambi, xp1, y0, zn1);
+ rad[20] = early_reflections_3d_calc_radius(r_ambi, xp1, y0_, zn1);
rad[21] = early_reflections_3d_calc_radius(r_ambi, x0, yp1, zn1);
rad[22] = early_reflections_3d_calc_radius(r_ambi, xn1, yp1, z0);
- rad[23] = early_reflections_3d_calc_radius(r_ambi, xn1, y0, zp1);
+ rad[23] = early_reflections_3d_calc_radius(r_ambi, xn1, y0_, zp1);
rad[24] = early_reflections_3d_calc_radius(r_ambi, x0, yn1, zp1);
/* delay-reihenfolge: 0 auslassen,
@@ -474,9 +474,9 @@ static void early_reflections_3d_doit(t_early_reflections_3d *x)
*/
at = x->x_para_at+1;
- SETFLOAT(at, early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0, z0));
+ SETFLOAT(at, early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0_, z0));
at++;
- SETFLOAT(at, early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0, z0));
+ SETFLOAT(at, early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0_, z0));
outlet_anything(x->x_direct_out, x->x_s_index_delta_phi, 3, x->x_para_at);
@@ -490,52 +490,52 @@ static void early_reflections_3d_doit(t_early_reflections_3d *x)
-1x+1y, -1x+1z, -1y+1z
*/
- delta[0] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0, z0);
- phi[0] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0, z0);
+ delta[0] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0_, z0);
+ phi[0] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0_, z0);
delta[1] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yp1, z0);
phi[1] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yp1, z0);
- delta[2] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0, zp1);
- phi[2] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0, zp1);
- delta[3] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0, z0);
- phi[3] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0, z0);
+ delta[2] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0_, zp1);
+ phi[2] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0_, zp1);
+ delta[3] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0_, z0);
+ phi[3] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0_, z0);
delta[4] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yn1, z0);
phi[4] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yn1, z0);
- delta[5] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0, zn1);
- phi[5] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0, zn1);
- delta[6] = early_reflections_3d_calc_elevation(x_180_over_pi, xp2, y0, z0);
- phi[6] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp2, y0, z0);
+ delta[5] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0_, zn1);
+ phi[5] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0_, zn1);
+ delta[6] = early_reflections_3d_calc_elevation(x_180_over_pi, xp2, y0_, z0);
+ phi[6] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp2, y0_, z0);
delta[7] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yp2, z0);
phi[7] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yp2, z0);
- delta[8] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0, zp2);
- phi[8] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0, zp2);
- delta[9] = early_reflections_3d_calc_elevation(x_180_over_pi, xn2, y0, z0);
- phi[9] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn2, y0, z0);
+ delta[8] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0_, zp2);
+ phi[8] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0_, zp2);
+ delta[9] = early_reflections_3d_calc_elevation(x_180_over_pi, xn2, y0_, z0);
+ phi[9] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn2, y0_, z0);
delta[10] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yn2, z0);
phi[10] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yn2, z0);
- delta[11] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0, zn2);
- phi[11] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0, zn2);
+ delta[11] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, y0_, zn2);
+ phi[11] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, y0_, zn2);
delta[12] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, yp1, z0);
phi[12] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, yp1, z0);
- delta[13] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0, zp1);
- phi[13] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0, zp1);
+ delta[13] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0_, zp1);
+ phi[13] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0_, zp1);
delta[14] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yp1, zp1);
phi[14] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yp1, zp1);
delta[15] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, yn1, z0);
phi[15] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, yn1, z0);
- delta[16] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0, zn1);
- phi[16] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0, zn1);
+ delta[16] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0_, zn1);
+ phi[16] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0_, zn1);
delta[17] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yn1, zn1);
phi[17] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yn1, zn1);
delta[18] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, yn1, z0);
phi[18] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, yn1, z0);
- delta[19] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0, zn1);
- phi[19] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0, zn1);
+ delta[19] = early_reflections_3d_calc_elevation(x_180_over_pi, xp1, y0_, zn1);
+ phi[19] = early_reflections_3d_calc_azimuth(x_180_over_pi, xp1, y0_, zn1);
delta[20] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yp1, zn1);
phi[20] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yp1, zn1);
delta[21] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, yp1, z0);
phi[21] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, yp1, z0);
- delta[22] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0, zp1);
- phi[22] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0, zp1);
+ delta[22] = early_reflections_3d_calc_elevation(x_180_over_pi, xn1, y0_, zp1);
+ phi[22] = early_reflections_3d_calc_azimuth(x_180_over_pi, xn1, y0_, zp1);
delta[23] = early_reflections_3d_calc_elevation(x_180_over_pi, x0, yn1, zp1);
phi[23] = early_reflections_3d_calc_azimuth(x_180_over_pi, x0, yn1, zp1);