diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
| commit | 9892736206676c5b7fabc8d1184f9655511ff2dd (patch) | |
| tree | 83562ac50c93fe3004959d35c1af4a5b380fdd97 /source/blender/blenkernel/BKE_effect.h | |
| parent | cffaa42d3a34c6b310c3c87c98e1f8313881e473 (diff) | |
code cleanup: header cleanup and remove some duplicate defines.
Diffstat (limited to 'source/blender/blenkernel/BKE_effect.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_effect.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index bb17c891020..e9d37fb4407 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -52,7 +52,7 @@ struct PartDeflect *object_add_collision_fields(int type); typedef struct EffectedPoint { float *loc; float *vel; - float *ave; /* angular velocity for particles with dynamic rotation */ + float *ave; /* angular velocity for particles with dynamic rotation */ float *rot; /* rotation quaternion for particles with dynamic rotation */ float vel_to_frame; float vel_to_sec; @@ -63,7 +63,7 @@ typedef struct EffectedPoint { unsigned int flag; int index; - struct ParticleSystem *psys; /* particle system the point belongs to */ + struct ParticleSystem *psys; /* particle system the point belongs to */ } EffectedPoint; typedef struct GuideEffectorData { @@ -86,7 +86,7 @@ typedef struct EffectorData { /* only for vortex effector with surface falloff */ float nor2[3], vec_to_point2[3]; - int *index; /* point index */ + int *index; /* point index */ } EffectorData; /* used for calculating the effector force */ @@ -109,10 +109,10 @@ typedef struct EffectorCache { int flag; } EffectorCache; -void free_partdeflect(struct PartDeflect *pd); +void free_partdeflect(struct PartDeflect *pd); struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct ParticleSystem *psys_src, struct EffectorWeights *weights); -void pdEndEffectors(struct ListBase **effectors); -void pdDoEffectors(struct ListBase *effectors, struct ListBase *colliders, struct EffectorWeights *weights, struct EffectedPoint *point, float *force, float *impulse); +void pdEndEffectors(struct ListBase **effectors); +void pdDoEffectors(struct ListBase *effectors, struct ListBase *colliders, struct EffectorWeights *weights, struct EffectedPoint *point, float *force, float *impulse); void pd_point_from_particle(struct ParticleSimulationData *sim, struct ParticleData *pa, struct ParticleKey *state, struct EffectedPoint *point); void pd_point_from_loc(struct Scene *scene, float *loc, float *vel, int index, struct EffectedPoint *point); @@ -120,7 +120,7 @@ void pd_point_from_soft(struct Scene *scene, float *loc, float *vel, int index, /* needed for boids */ float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights); -int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]); +int closest_point_on_surface(SurfaceModifierData * surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]); int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity); /* required for particle_system.c */ @@ -128,12 +128,12 @@ int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struc //float effector_falloff(struct EffectorData *eff, struct EffectorPoint *point, struct EffectorWeights *weights); /* EffectedPoint->flag */ -#define PE_WIND_AS_SPEED 1 -#define PE_DYNAMIC_ROTATION 2 -#define PE_USE_NORMAL_DATA 4 +#define PE_WIND_AS_SPEED 1 +#define PE_DYNAMIC_ROTATION 2 +#define PE_USE_NORMAL_DATA 4 /* EffectorData->flag */ -#define PE_VELOCITY_TO_IMPULSE 1 +#define PE_VELOCITY_TO_IMPULSE 1 #endif |