diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-18 05:52:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-18 05:52:18 +0400 |
commit | e72239c6a45173c0d23868c8e66b0926dcf2fd9c (patch) | |
tree | ce5c7bd822c1d86d76f5f1a53f9f1b26aa95ccf0 /source/blender/blenkernel | |
parent | 899ba3fdb619034653ad59dfae6c8eec9f443933 (diff) |
style cleanup
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 26 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 9 |
2 files changed, 23 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 26bdc751582..090082b333d 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2400,7 +2400,8 @@ typedef struct SPHRangeData { int use_size; } SPHRangeData; -static void sph_evaluate_func(BVHTree *tree, ParticleSystem **psys, float co[3], SPHRangeData *pfr, float interaction_radius, BVHTree_RangeQuery callback) { +static void sph_evaluate_func(BVHTree *tree, ParticleSystem **psys, float co[3], SPHRangeData *pfr, float interaction_radius, BVHTree_RangeQuery callback) +{ int i; pfr->tot_neighbors = 0; @@ -2604,16 +2605,20 @@ static void sph_force_cb(void *sphdata_v, ParticleKey *state, float *force, floa } /* powf is really slow for raising to integer powers. */ -MINLINE float pow2(float x) { +MINLINE float pow2(float x) +{ return x * x; } -MINLINE float pow3(float x) { +MINLINE float pow3(float x) +{ return pow2(x) * x; } -MINLINE float pow4(float x) { +MINLINE float pow4(float x) +{ return pow2(pow2(x)); } -MINLINE float pow7(float x) { +MINLINE float pow7(float x) +{ return pow2(pow3(x)) * x; } @@ -2773,7 +2778,8 @@ static void sphclassical_force_cb(void *sphdata_v, ParticleKey *state, float *fo sphdata->pass++; } -static void sphclassical_calc_dens(ParticleData *pa, float UNUSED(dfra), SPHData *sphdata){ +static void sphclassical_calc_dens(ParticleData *pa, float UNUSED(dfra), SPHData *sphdata) +{ ParticleSystem **psys = sphdata->psys; SPHFluidSettings *fluid = psys[0]->part->fluid; /* 4.0 seems to be a pretty good value */ @@ -2834,7 +2840,8 @@ void psys_sph_finalise(SPHData *sphdata) } } /* Sample the density field at a point in space. */ -void psys_sph_density(BVHTree *tree, SPHData *sphdata, float co[3], float vars[2]) { +void psys_sph_density(BVHTree *tree, SPHData *sphdata, float co[3], float vars[2]) +{ ParticleSystem **psys = sphdata->psys; SPHFluidSettings *fluid = psys[0]->part->fluid; /* 4.0 seems to be a pretty good value */ @@ -4012,7 +4019,7 @@ static const float TIMESTEP_EXPANSION_TOLERANCE = 1.5f; * step, after the velocity has been updated. element_size defines the scale of * the simulation, and is typically the distance to neighboring particles. */ static void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, - float dtime, SPHData *sphdata) + float dtime, SPHData *sphdata) { float relative_vel[3]; float speed; @@ -4022,7 +4029,8 @@ static void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, if (sim->courant_num < speed * dtime / sphdata->element_size) sim->courant_num = speed * dtime / sphdata->element_size; } -static float get_base_time_step(ParticleSettings *part) { +static float get_base_time_step(ParticleSettings *part) +{ return 1.0f / (float) (part->subframes + 1); } /* Update time step size to suit current conditions. */ diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 53dfbdcfb85..c9cf5d561e5 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -924,7 +924,8 @@ static void clampBoundsInDomain(SmokeDomainSettings *sds, int min[3], int max[3] } } -static void em_allocateData(EmissionMap *em, int use_velocity) { +static void em_allocateData(EmissionMap *em, int use_velocity) +{ int i, res[3]; for (i = 0; i < 3; i++) { @@ -941,7 +942,8 @@ static void em_allocateData(EmissionMap *em, int use_velocity) { em->velocity = MEM_callocN(sizeof(float) * em->total_cells * 3, "smoke_flow_velocity"); } -static void em_freeData(EmissionMap *em) { +static void em_freeData(EmissionMap *em) +{ if (em->influence) MEM_freeN(em->influence); if (em->velocity) @@ -2509,7 +2511,8 @@ float smoke_get_velocity_at(struct Object *ob, float position[3], float velocity return -1.0f; } -int smoke_get_data_flags(SmokeDomainSettings *sds) { +int smoke_get_data_flags(SmokeDomainSettings *sds) +{ int flags = 0; if (smoke_has_heat(sds->fluid)) flags |= SM_ACTIVE_HEAT; if (smoke_has_fuel(sds->fluid)) flags |= SM_ACTIVE_FIRE; |