kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #29846, Dynamic rotation of particles not affected by forcefields 2.61 64 bit. Patch by Arno Mayrhofer (azrael3000).

Browse Source 
Minor fix by me to initialize the effector point angular velocity vector correctly.
This commit is contained in:
Lukas Toenne 2012-05-28 16:58:12 +00:00
parent 9ffb1c1dd8
commit 666667bd83
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/effect.c
View File

@ -929,6 +929,7 @@ static void do_physical_effector(EffectorCache *eff, EffectorData *efd, Effected
} }
} }
zero_v3(point->ave);
if (pd->flag & PFIELD_DO_ROTATION && point->ave && point->rot) { if (pd->flag & PFIELD_DO_ROTATION && point->ave && point->rot) {
float xvec[3] = {1.0f, 0.0f, 0.0f}; float xvec[3] = {1.0f, 0.0f, 0.0f};
float dave[3]; float dave[3];

11
source/blender/blenkernel/intern/particle_system.c
View File

@ -2673,6 +2673,9 @@ static void basic_force_cb(void *efdata_v, ParticleKey *state, float *force, flo
force[1] += (BLI_frand()-0.5f) * part->brownfac; force[1] += (BLI_frand()-0.5f) * part->brownfac;
force[2] += (BLI_frand()-0.5f) * part->brownfac; force[2] += (BLI_frand()-0.5f) * part->brownfac;
} }
if(part->flag & PART_ROT_DYN && epoint.ave)
copy_v3_v3(pa->state.ave, epoint.ave);
} }
/* gathers all forces that effect particles and calculates a new state for the particle */ /* gathers all forces that effect particles and calculates a new state for the particle */
static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, float cfra) static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, float cfra)
@ -2730,7 +2733,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa
} }
static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, float timestep) static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, float timestep)
{ {
float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep; float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep, extrotfac;
if ((part->flag & PART_ROTATIONS)==0) { if ((part->flag & PART_ROTATIONS)==0) {
pa->state.rot[0]=1.0f; pa->state.rot[0]=1.0f;
@ -2738,7 +2741,9 @@ static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, f
return; return;
} }
if ((part->flag & PART_ROT_DYN)==0 && ELEM3(part->avemode, PART_AVE_VELOCITY, PART_AVE_HORIZONTAL, PART_AVE_VERTICAL)) { extrotfac = len_v3(pa->state.ave);
if ((part->flag & PART_ROT_DYN) && ELEM3(part->avemode, PART_AVE_VELOCITY, PART_AVE_HORIZONTAL, PART_AVE_VERTICAL)) {
float angle; float angle;
float len1 = len_v3(pa->prev_state.vel); float len1 = len_v3(pa->prev_state.vel);
float len2 = len_v3(pa->state.vel); float len2 = len_v3(pa->state.vel);
@ -2758,7 +2763,7 @@ static void basic_rotate(ParticleSettings *part, ParticleData *pa, float dfra, f
} }
rotfac = len_v3(pa->state.ave); rotfac = len_v3(pa->state.ave);
if (rotfac == 0.0f) { /* unit_qt(in VecRotToQuat) doesn't give unit quat [1,0,0,0]?? */ if (rotfac == 0.0f || (part->flag & PART_ROT_DYN)==0 || extrotfac == 0.0f) { /* unit_qt(in VecRotToQuat) doesn't give unit quat [1,0,0,0]?? */
rot1[0]=1.0f; rot1[0]=1.0f;
rot1[1]=rot1[2]=rot1[3]=0; rot1[1]=rot1[2]=rot1[3]=0;
} }