aboutsummaryrefslogtreecommitdiff
path: root/src/early_reflections_2d.c
diff options
context:
space:
mode:
authormusil <tmusil@users.sourceforge.net>2009-05-14 18:14:29 +0000
committermusil <tmusil@users.sourceforge.net>2009-05-14 18:14:29 +0000
commite06b9d64d403465375aa3e12d200e6178951d003 (patch)
treeded1b66fac89fd6e9cf4e4ea9b1d840435f682e0 /src/early_reflections_2d.c
parent08adf37bd95ae76167f11513ca9530d794cfa4d4 (diff)
warning: declaration of variable shadows a global declaration, changed variable name
svn path=/trunk/externals/iem/iem_roomsim/; revision=11362
Diffstat (limited to 'src/early_reflections_2d.c')
-rw-r--r--src/early_reflections_2d.c24
1 files changed, 12 insertions, 12 deletions
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);