diff options
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index e4800ac25a3..ee4f3d1701e 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -332,11 +332,11 @@ static void alloc_child_particles(ParticleSystem *psys, int tot) void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys) { /* use for building derived mesh mapping info: - - node: the allocated links - total derived mesh element count - nodearray: the array of nodes aligned with the base mesh's elements, so - each original elements can reference its derived elements - */ + * + * node: the allocated links - total derived mesh element count + * nodearray: the array of nodes aligned with the base mesh's elements, so + * each original elements can reference its derived elements + */ Mesh *me= (Mesh*)ob->data; PARTICLE_P; @@ -2213,19 +2213,19 @@ static void integrate_particle(ParticleSettings *part, ParticleData *pa, float d } /********************************************************************************************************* - SPH fluid physics - - In theory, there could be unlimited implementation of SPH simulators - - This code uses in some parts adapted algorithms from the pseudo code as outlined in the Research paper: - - Titled: Particle-based Viscoelastic Fluid Simulation. - Authors: Simon Clavet, Philippe Beaudoin and Pierre Poulin - Website: http://www.iro.umontreal.ca/labs/infographie/papers/Clavet-2005-PVFS/ - - Presented at Siggraph, (2005) - -***********************************************************************************************************/ + * SPH fluid physics + * + * In theory, there could be unlimited implementation of SPH simulators + * + * This code uses in some parts adapted algorithms from the pseudo code as outlined in the Research paper: + * + * Titled: Particle-based Viscoelastic Fluid Simulation. + * Authors: Simon Clavet, Philippe Beaudoin and Pierre Poulin + * Website: http://www.iro.umontreal.ca/labs/infographie/papers/Clavet-2005-PVFS/ + * + * Presented at Siggraph, (2005) + * + * ********************************************************************************************************/ #define PSYS_FLUID_SPRINGS_INITIAL_SIZE 256 static ParticleSpring *sph_spring_add(ParticleSystem *psys, ParticleSpring *spring) { @@ -2344,7 +2344,7 @@ typedef struct SPHData { EdgeHash *eh; float *gravity; /* Average distance to neighbours (other particles in the support domain), - for calculating the Courant number (adaptive time step). */ + * for calculating the Courant number (adaptive time step). */ int pass; float element_size; float flow[3]; @@ -3234,9 +3234,9 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR sub_v3_v3v3(v1_tan, v0_tan, vc_tan); /* The resulting velocity is a weighted average of particle cm & surface - * velocity. This weight (related to particle's moment of inertia) could - * be made a parameter for angular <-> linear conversion. - */ + * velocity. This weight (related to particle's moment of inertia) could + * be made a parameter for angular <-> linear conversion. + */ madd_v3_v3fl(v1_tan, vr_tan, -0.4); mul_v3_fl(v1_tan, 1.0f/1.4f); /* 1/(1+0.4) */ @@ -3699,17 +3699,17 @@ static void save_hair(ParticleSimulationData *sim, float UNUSED(cfra)) } /* Code for an adaptive time step based on the Courant-Friedrichs-Lewy - condition. */ + * condition. */ #define MIN_TIMESTEP 1.0f / 101.0f /* Tolerance of 1.5 means the last subframe neither favours growing nor - shrinking (e.g if it were 1.3, the last subframe would tend to be too - small). */ + * shrinking (e.g if it were 1.3, the last subframe would tend to be too + * small). */ #define TIMESTEP_EXPANSION_TOLERANCE 1.5f /* Calculate the speed of the particle relative to the local scale of the - simulation. This should be called once per particle during a simulation - step, after the velocity has been updated. element_size defines the scale of - the simulation, and is typically the distance to neighbourning particles. */ + * simulation. This should be called once per particle during a simulation + * step, after the velocity has been updated. element_size defines the scale of + * the simulation, and is typically the distance to neighbourning particles. */ void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, float dtime, SPHData *sphdata) { |