diff options
Diffstat (limited to 'source/blender/blenkernel/intern/ocean.c')
| -rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index fcceebc3913..9faa61f986d 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -521,7 +521,7 @@ static void ocean_compute_htilda(void *__restrict userdata, /* Note the <= _N/2 here, see the FFTW documentation * about the mechanics of the complex->real fft storage. */ - for (j = 0; j <= o->_N / 2; ++j) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex exp_param1; fftw_complex exp_param2; fftw_complex conj_param; @@ -560,8 +560,8 @@ static void ocean_compute_displacement_x(TaskPool *__restrict pool, const float chop_amount = osd->chop_amount; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; fftw_complex minus_i; @@ -591,8 +591,8 @@ static void ocean_compute_displacement_z(TaskPool *__restrict pool, const float chop_amount = osd->chop_amount; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; fftw_complex minus_i; @@ -621,8 +621,8 @@ static void ocean_compute_jacobian_jxx(TaskPool *__restrict pool, const float chop_amount = osd->chop_amount; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; /* init_complex(mul_param, -scale, 0); */ @@ -640,8 +640,8 @@ static void ocean_compute_jacobian_jxx(TaskPool *__restrict pool, } fftw_execute(o->_Jxx_plan); - for (i = 0; i < o->_M; ++i) { - for (j = 0; j < o->_N; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j < o->_N; j++) { o->_Jxx[i * o->_N + j] += 1.0; } } @@ -656,8 +656,8 @@ static void ocean_compute_jacobian_jzz(TaskPool *__restrict pool, const float chop_amount = osd->chop_amount; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; /* init_complex(mul_param, -scale, 0); */ @@ -675,8 +675,8 @@ static void ocean_compute_jacobian_jzz(TaskPool *__restrict pool, } fftw_execute(o->_Jzz_plan); - for (i = 0; i < o->_M; ++i) { - for (j = 0; j < o->_N; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j < o->_N; j++) { o->_Jzz[i * o->_N + j] += 1.0; } } @@ -691,8 +691,8 @@ static void ocean_compute_jacobian_jxz(TaskPool *__restrict pool, const float chop_amount = osd->chop_amount; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; /* init_complex(mul_param, -scale, 0); */ @@ -719,8 +719,8 @@ static void ocean_compute_normal_x(TaskPool *__restrict pool, const Ocean *o = osd->o; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; init_complex(mul_param, 0.0, -1.0); @@ -740,8 +740,8 @@ static void ocean_compute_normal_z(TaskPool *__restrict pool, const Ocean *o = osd->o; int i, j; - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { fftw_complex mul_param; init_complex(mul_param, 0.0, -1.0); @@ -829,8 +829,8 @@ static void set_height_normalize_factor(struct Ocean *oc) BLI_rw_mutex_lock(&oc->oceanmutex, THREAD_LOCK_READ); - for (i = 0; i < oc->_M; ++i) { - for (j = 0; j < oc->_N; ++j) { + for (i = 0; i < oc->_M; i++) { + for (j = 0; j < oc->_N; j++) { if (max_h < fabs(oc->_disp_y[i * oc->_N + j])) { max_h = fabs(oc->_disp_y[i * oc->_N + j]); } @@ -959,28 +959,28 @@ void BKE_ocean_init(struct Ocean *o, } /* the +ve components and DC */ - for (i = 0; i <= o->_M / 2; ++i) { + for (i = 0; i <= o->_M / 2; i++) { o->_kx[i] = 2.0f * (float)M_PI * i / o->_Lx; } /* the -ve components */ - for (i = o->_M - 1, ii = 0; i > o->_M / 2; --i, ++ii) { + for (i = o->_M - 1, ii = 0; i > o->_M / 2; i--, ii++) { o->_kx[i] = -2.0f * (float)M_PI * ii / o->_Lx; } /* the +ve components and DC */ - for (i = 0; i <= o->_N / 2; ++i) { + for (i = 0; i <= o->_N / 2; i++) { o->_kz[i] = 2.0f * (float)M_PI * i / o->_Lz; } /* the -ve components */ - for (i = o->_N - 1, ii = 0; i > o->_N / 2; --i, ++ii) { + for (i = o->_N - 1, ii = 0; i > o->_N / 2; i--, ii++) { o->_kz[i] = -2.0f * (float)M_PI * ii / o->_Lz; } /* pre-calculate the k matrix */ - for (i = 0; i < o->_M; ++i) { - for (j = 0; j <= o->_N / 2; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j <= o->_N / 2; j++) { o->_k[i * (1 + o->_N / 2) + j] = sqrt(o->_kx[i] * o->_kx[i] + o->_kz[j] * o->_kz[j]); } } @@ -988,8 +988,8 @@ void BKE_ocean_init(struct Ocean *o, /*srand(seed);*/ rng = BLI_rng_new(seed); - for (i = 0; i < o->_M; ++i) { - for (j = 0; j < o->_N; ++j) { + for (i = 0; i < o->_M; i++) { + for (j = 0; j < o->_N; j++) { float r1 = gaussRand(rng); float r2 = gaussRand(rng); |