Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Sep 2018 01:42:44 +0000 (11:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Sep 2018 01:50:47 +0000 (11:50 +1000)
1  2 
source/blender/blenkernel/intern/effect.c

@@@ -57,9 -56,7 +57,9 @@@
  
  #include "PIL_time.h"
  
- #include "BKE_anim.h"         /* needed for where_on_path */
+ #include "BKE_anim.h"       /* needed for where_on_path */
 +#include "BKE_bvhutils.h"
 +#include "BKE_collection.h"
  #include "BKE_collision.h"
  #include "BKE_curve.h"
  #include "BKE_displist.h"
@@@ -136,124 -132,116 +137,126 @@@ PartDeflect *object_add_collision_field
        return pd;
  }
  
 -/* ***************** PARTICLES ***************** */
 +/************************ PARTICLES ***************************/
  
 -/* -------------------------- Effectors ------------------ */
  void free_partdeflect(PartDeflect *pd)
  {
-       if (!pd)
+       if (!pd) {
                return;
-       if (pd->rng)
+       }
+       if (pd->rng) {
                BLI_rng_free(pd->rng);
+       }
        MEM_freeN(pd);
  }
  
 -static EffectorCache *new_effector_cache(Scene *scene, Object *ob, ParticleSystem *psys, PartDeflect *pd)
 -{
 -      EffectorCache *eff = MEM_callocN(sizeof(EffectorCache), "EffectorCache");
 -      eff->scene = scene;
 -      eff->ob = ob;
 -      eff->psys = psys;
 -      eff->pd = pd;
 -      eff->frame = -1;
 -      return eff;
 -}
 -static void add_object_to_effectors(ListBase **effectors, Scene *scene, EffectorWeights *weights, Object *ob, Object *ob_src, bool for_simulation)
 -{
 -      EffectorCache *eff = NULL;
 +/******************** EFFECTOR RELATIONS ***********************/
  
 -      if (ob == ob_src) {
 -              return;
 +static void precalculate_effector(struct Depsgraph *depsgraph, EffectorCache *eff)
 +{
 +      float ctime = DEG_get_ctime(depsgraph);
-       unsigned int cfra = (unsigned int)(ctime >= 0 ? ctime : -ctime);
-       if (!eff->pd->rng)
++      uint cfra = (uint)(ctime >= 0 ? ctime : -ctime);
++      if (!eff->pd->rng) {
 +              eff->pd->rng = BLI_rng_new(eff->pd->seed + cfra);
-       else
++      }
++      else {
 +              BLI_rng_srandom(eff->pd->rng, eff->pd->seed + cfra);
+       }
  
-       if (eff->pd->forcefield == PFIELD_GUIDE && eff->ob->type==OB_CURVE) {
-               Curve *cu= eff->ob->data;
 -      if (for_simulation) {
 -              if (weights->weight[ob->pd->forcefield] == 0.0f) {
 -                      return;
 -              }
++      if (eff->pd->forcefield == PFIELD_GUIDE && eff->ob->type == OB_CURVE) {
++              Curve *cu = eff->ob->data;
 +              if (cu->flag & CU_PATH) {
-                       if (eff->ob->runtime.curve_cache == NULL || eff->ob->runtime.curve_cache->path==NULL || eff->ob->runtime.curve_cache->path->data==NULL)
++                      if (eff->ob->runtime.curve_cache == NULL || eff->ob->runtime.curve_cache->path == NULL || eff->ob->runtime.curve_cache->path->data == NULL)
 +                              BKE_displist_make_curveTypes(depsgraph, eff->scene, eff->ob, 0);
  
 -              if (ob->pd->shape == PFIELD_SHAPE_POINTS && !ob->derivedFinal) {
 -                      return;
 +                      if (eff->ob->runtime.curve_cache->path && eff->ob->runtime.curve_cache->path->data) {
 +                              where_on_path(eff->ob, 0.0, eff->guide_loc, eff->guide_dir, NULL, &eff->guide_radius, NULL);
 +                              mul_m4_v3(eff->ob->obmat, eff->guide_loc);
 +                              mul_mat3_m4_v3(eff->ob->obmat, eff->guide_dir);
 +                      }
                }
        }
-               eff->surmd = (SurfaceModifierData *)modifiers_findByType( eff->ob, eModifierType_Surface );
 +      else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
++              eff->surmd = (SurfaceModifierData *)modifiers_findByType(eff->ob, eModifierType_Surface);
 +              if (eff->ob->type == OB_CURVE)
 +                      eff->flag |= PE_USE_NORMAL_DATA;
 +      }
 +      else if (eff->psys)
 +              psys_update_particle_tree(eff->psys, ctime);
  
 -      if (*effectors == NULL)
 -              *effectors = MEM_callocN(sizeof(ListBase), "effectors list");
 +      /* Store object velocity */
 +      if (eff->ob) {
 +              float old_vel[3];
  
 -      eff = new_effector_cache(scene, ob, NULL, ob->pd);
 +              BKE_object_where_is_calc_time(depsgraph, eff->scene, eff->ob, cfra - 1.0f);
 +              copy_v3_v3(old_vel, eff->ob->obmat[3]);
 +              BKE_object_where_is_calc_time(depsgraph, eff->scene, eff->ob, cfra);
 +              sub_v3_v3v3(eff->velocity, eff->ob->obmat[3], old_vel);
 +      }
 +}
  
 -      /* make sure imat is up to date */
 -      invert_m4_m4(ob->imat, ob->obmat);
 +static void add_effector_relation(ListBase *relations, Object *ob, ParticleSystem *psys, PartDeflect *pd)
 +{
 +      EffectorRelation *relation = MEM_callocN(sizeof(EffectorRelation), "EffectorRelation");
 +      relation->ob = ob;
 +      relation->psys = psys;
 +      relation->pd = pd;
  
 -      BLI_addtail(*effectors, eff);
 +      BLI_addtail(relations, relation);
  }
 -static void add_particles_to_effectors(ListBase **effectors, Scene *scene, EffectorWeights *weights, Object *ob, ParticleSystem *psys, ParticleSystem *psys_src, bool for_simulation)
 -{
 -      ParticleSettings *part = psys->part;
  
 -      if (!psys_check_enabled(ob, psys, G.is_rendering)) {
 -              return;
 -      }
 -      if (psys == psys_src && (part->flag & PART_SELF_EFFECT) == 0) {
 -              return;
 -      }
 -      if (part->pd && part->pd->forcefield && (!for_simulation || weights->weight[part->pd->forcefield] != 0.0f)) {
 -              if (*effectors == NULL) {
 -                      *effectors = MEM_callocN(sizeof(ListBase), "effectors list");
 -              }
 -              BLI_addtail(*effectors, new_effector_cache(scene, ob, psys, part->pd));
 +static void add_effector_evaluation(ListBase **effectors, Depsgraph *depsgraph, Scene *scene, Object *ob, ParticleSystem *psys, PartDeflect *pd)
 +{
 +      if (*effectors == NULL) {
 +              *effectors = MEM_callocN(sizeof(ListBase), "effector effectors");
        }
  
 -      if (part->pd2 && part->pd2->forcefield && (!for_simulation || weights->weight[part->pd2->forcefield] != 0.0f)) {
 -              if (*effectors == NULL) {
 -                      *effectors = MEM_callocN(sizeof(ListBase), "effectors list");
 -              }
 -              BLI_addtail(*effectors, new_effector_cache(scene, ob, psys, part->pd2));
 -      }
 +      EffectorCache *eff = MEM_callocN(sizeof(EffectorCache), "EffectorCache");
 +      eff->depsgraph = depsgraph;
 +      eff->scene = scene;
 +      eff->ob = ob;
 +      eff->psys = psys;
 +      eff->pd = pd;
 +      eff->frame = -1;
 +      BLI_addtail(*effectors, eff);
 +
 +      precalculate_effector(depsgraph, eff);
  }
  
 -/* returns ListBase handle with objects taking part in the effecting */
 -ListBase *pdInitEffectors(
 -        Scene *scene, Object *ob_src, ParticleSystem *psys_src,
 -        EffectorWeights *weights, bool for_simulation)
 +/* Create list of effector relations in the collection or entire scene.
 + * This is used by the depsgraph to build relations, as well as faster
 + * lookup of effectors during evaluation. */
 +ListBase *BKE_effector_relations_create(
-         Depsgraph *depsgraph,
-         ViewLayer *view_layer,
-         Collection *collection)
++      Depsgraph *depsgraph,
++      ViewLayer *view_layer,
++      Collection *collection)
  {
 -      const uint layer = ob_src->lay;
 -      ListBase *effectors = NULL;
 +      Base *base = BKE_collection_or_layer_objects(view_layer, collection);
 +      const bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER);
 +      const int base_flag = (for_render) ? BASE_ENABLED_RENDER : BASE_ENABLED_VIEWPORT;
  
 -      if (weights->group) {
 -              for (GroupObject *go = weights->group->gobject.first; go; go = go->next) {
 -                      if ((go->ob->lay & layer)) {
 -                              if (go->ob->pd && go->ob->pd->forcefield) {
 -                                      add_object_to_effectors(&effectors, scene, weights, go->ob, ob_src, for_simulation);
 -                              }
 +      ListBase *relations = MEM_callocN(sizeof(ListBase), "effector relations");
  
 -                              if (go->ob->particlesystem.first) {
 -                                      for (ParticleSystem *psys = go->ob->particlesystem.first; psys; psys = psys->next) {
 -                                              add_particles_to_effectors(&effectors, scene, weights, go->ob, psys, psys_src, for_simulation);
 -                                      }
 -                              }
 -                      }
 +      for (; base; base = base->next) {
 +              if (!(base->flag & base_flag)) {
 +                      continue;
                }
 -      }
 -      else {
 -              for (Base *base = scene->base.first; base; base = base->next) {
 -                      if ((base->lay & layer)) {
 -                              if (base->object->pd && base->object->pd->forcefield) {
 -                                      add_object_to_effectors(&effectors, scene, weights, base->object, ob_src, for_simulation);
 +
 +              Object *ob = base->object;
 +
 +              if (ob->pd && ob->pd->forcefield) {
 +                      add_effector_relation(relations, ob, NULL, ob->pd);
 +              }
 +
 +              for (ParticleSystem *psys = ob->particlesystem.first; psys; psys = psys->next) {
 +                      ParticleSettings *part = psys->part;
 +
 +                      if (psys_check_enabled(ob, psys, for_render)) {
 +                              if (part->pd && part->pd->forcefield) {
 +                                      add_effector_relation(relations, ob, psys, part->pd);
                                }
 -                              if (base->object->particlesystem.first) {
 -                                      for (ParticleSystem *psys = base->object->particlesystem.first; psys; psys = psys->next) {
 -                                              add_particles_to_effectors(&effectors, scene, weights, base->object, psys, psys_src, for_simulation);
 -                                      }
 +                              if (part->pd2 && part->pd2->forcefield) {
 +                                      add_effector_relation(relations, ob, psys, part->pd2);
                                }
                        }
                }
@@@ -270,72 -269,60 +273,72 @@@ void BKE_effector_relations_free(ListBa
        }
  }
  
 -static void precalculate_effector(EffectorCache *eff)
 +/* Create effective list of effectors from relations built beforehand. */
 +ListBase *BKE_effectors_create(
-         Depsgraph *depsgraph,
-         Object *ob_src,
-         ParticleSystem *psys_src,
-         EffectorWeights *weights)
++      Depsgraph *depsgraph,
++      Object *ob_src,
++      ParticleSystem *psys_src,
++      EffectorWeights *weights)
  {
 -      uint cfra = (uint)(eff->scene->r.cfra >= 0 ? eff->scene->r.cfra : -eff->scene->r.cfra);
 -      if (!eff->pd->rng) {
 -              eff->pd->rng = BLI_rng_new(eff->pd->seed + cfra);
 -      }
 -      else {
 -              BLI_rng_srandom(eff->pd->rng, eff->pd->seed + cfra);
 +      Scene *scene = DEG_get_evaluated_scene(depsgraph);
 +      ListBase *relations = DEG_get_effector_relations(depsgraph, weights->group);
 +      ListBase *effectors = NULL;
 +
 +      if (!relations) {
 +              return NULL;
        }
  
 -      if (eff->pd->forcefield == PFIELD_GUIDE && eff->ob->type == OB_CURVE) {
 -              Curve *cu = eff->ob->data;
 -              if (cu->flag & CU_PATH) {
 -                      if ((eff->ob->curve_cache == NULL) ||
 -                          (eff->ob->curve_cache->path == NULL) ||
 -                          (eff->ob->curve_cache->path->data == NULL))
 -                      {
 -                              BKE_displist_make_curveTypes(eff->scene, eff->ob, 0);
 +      for (EffectorRelation *relation = relations->first; relation; relation = relation->next) {
 +              /* Get evaluated object. */
-               Object *ob = (Object*)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
++              Object *ob = (Object *)DEG_get_evaluated_id(depsgraph, &relation->ob->id);
 +
 +              if (relation->psys) {
 +                      /* Get evaluated particle system. */
 +                      ParticleSystem *psys = BLI_findstring(&ob->particlesystem,
-                               relation->psys->name, offsetof(ParticleSystem, name));
++                                                            relation->psys->name, offsetof(ParticleSystem, name));
 +                      ParticleSettings *part = psys->part;
 +
 +                      if (psys == psys_src && (part->flag & PART_SELF_EFFECT) == 0) {
 +                              continue;
                        }
  
 -                      if (eff->ob->curve_cache->path && eff->ob->curve_cache->path->data) {
 -                              where_on_path(eff->ob, 0.0, eff->guide_loc, eff->guide_dir, NULL, &eff->guide_radius, NULL);
 -                              mul_m4_v3(eff->ob->obmat, eff->guide_loc);
 -                              mul_mat3_m4_v3(eff->ob->obmat, eff->guide_dir);
 +                      PartDeflect *pd = (relation->pd == relation->psys->part->pd) ? part->pd : part->pd2;
 +                      if (weights->weight[pd->forcefield] == 0.0f) {
 +                              continue;
                        }
 +
 +                      add_effector_evaluation(&effectors, depsgraph, scene, ob, psys, pd);
                }
 -      }
 -      else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
 -              eff->surmd = (SurfaceModifierData *)modifiers_findByType(eff->ob, eModifierType_Surface);
 -              if (eff->ob->type == OB_CURVE) {
 -                      eff->flag |= PE_USE_NORMAL_DATA;
 +              else {
 +                      /* Object effector. */
 +                      if (ob == ob_src) {
 +                              continue;
 +                      }
 +                      else if (weights->weight[ob->pd->forcefield] == 0.0f) {
 +                              continue;
 +                      }
 +                      else if (ob->pd->shape == PFIELD_SHAPE_POINTS && ob->runtime.mesh_eval == NULL) {
 +                              continue;
 +                      }
 +
 +                      add_effector_evaluation(&effectors, depsgraph, scene, ob, NULL, ob->pd);
                }
        }
 -      else if (eff->psys) {
 -              psys_update_particle_tree(eff->psys, eff->scene->r.cfra);
 -      }
 -
 -      /* Store object velocity */
 -      if (eff->ob) {
 -              float old_vel[3];
  
 -              BKE_object_where_is_calc_time(eff->scene, eff->ob, cfra - 1.0f);
 -              copy_v3_v3(old_vel, eff->ob->obmat[3]);
 -              BKE_object_where_is_calc_time(eff->scene, eff->ob, cfra);
 -              sub_v3_v3v3(eff->velocity, eff->ob->obmat[3], old_vel);
 -      }
 +      return effectors;
  }
  
 -void pdPrecalculateEffectors(ListBase *effectors)
 +void BKE_effectors_free(ListBase *lb)
  {
 -      if (effectors) {
 -              for (EffectorCache *eff = effectors->first; eff; eff = eff->next) {
 -                      precalculate_effector(eff);
 +      if (lb) {
 +              for (EffectorCache *eff = lb->first; eff; eff = eff->next) {
 +                      if (eff->guide_data) {
 +                              MEM_freeN(eff->guide_data);
 +                      }
                }
 +
 +              BLI_freelistN(lb);
 +              MEM_freeN(lb);
        }
  }
  
@@@ -422,14 -409,15 +425,15 @@@ static float eff_calc_visibility(ListBa
        float norm[3], len = 0.0;
        float visibility = 1.0, absorption = 0.0;
  
-       if (!(eff->pd->flag & PFIELD_VISIBILITY))
+       if (!(eff->pd->flag & PFIELD_VISIBILITY)) {
                return visibility;
-       if (!colls)
+       }
+       if (!colls) {
 -              colls = get_collider_cache(eff->scene, eff->ob, NULL);
 +              colls = BKE_collider_cache_create(eff->depsgraph, eff->ob, NULL);
-       if (!colls)
+       }
+       if (!colls) {
                return visibility;
+       }
  
        negate_v3_v3(norm, efd->vec_to_point);
        len = normalize_v3(norm);
@@@ -544,8 -534,8 +550,8 @@@ float effector_falloff(EffectorCache *e
                                if (falloff == 0.0f)
                                        break;
  
-                               r_fac= RAD2DEGF(saacos(fac/len_v3(efd->vec_to_point2)));
-                               falloff*= falloff_func_rad(eff->pd, r_fac);
 -                              r_fac = RAD2DEGF(saacos(fac / len_v3(efd->vec_to_point)));
++                              r_fac = RAD2DEGF(saacos(fac / len_v3(efd->vec_to_point2)));
+                               falloff *= falloff_func_rad(eff->pd, r_fac);
  
                                break;
                }
@@@ -605,11 -595,13 +611,11 @@@ int get_effector_data(EffectorCache *ef
  
                efd->size = 0.0f;
        }
-       else if (eff->pd && eff->pd->shape==PFIELD_SHAPE_POINTS) {
+       else if (eff->pd && eff->pd->shape == PFIELD_SHAPE_POINTS) {
 -
 -              if (eff->ob->derivedFinal) {
 -                      DerivedMesh *dm = eff->ob->derivedFinal;
 -
 -                      dm->getVertCo(dm, *efd->index, efd->loc);
 -                      dm->getVertNo(dm, *efd->index, efd->nor);
 +              Mesh *me_eval = eff->ob->runtime.mesh_eval;
 +              if (me_eval != NULL) {
 +                      copy_v3_v3(efd->loc, me_eval->mvert[*efd->index].co);
 +                      normal_short_to_float_v3(efd->nor, me_eval->mvert[*efd->index].no);
  
                        mul_m4_v3(eff->ob->obmat, efd->loc);
                        mul_mat3_m4_v3(eff->ob->obmat, efd->nor);
                        /* pass */
                }
                else {
-                       ParticleSimulationData sim= {NULL};
+                       ParticleSimulationData sim = {NULL};
 +                      sim.depsgraph = eff->depsgraph;
-                       sim.scene= eff->scene;
-                       sim.ob= eff->ob;
-                       sim.psys= eff->psys;
+                       sim.scene = eff->scene;
+                       sim.ob = eff->ob;
+                       sim.psys = eff->psys;
  
                        /* TODO: time from actual previous calculated frame (step might not be 1) */
                        state.time = cfra - 1.0f;
                        project_v3_v3v3(translate, temp, efd->nor);
  
                        /* for vortex the shape chooses between old / new force */
-                       if (eff->pd->forcefield == PFIELD_VORTEX || eff->pd->shape == PFIELD_SHAPE_LINE)
 -                      if (eff->pd->forcefield == PFIELD_VORTEX) {
++                      if (eff->pd->forcefield == PFIELD_VORTEX || eff->pd->shape == PFIELD_SHAPE_LINE) {
                                add_v3_v3v3(efd->loc, ob->obmat[3], translate);
-                       else /* normally efd->loc is closest point on effector xy-plane */
+                       }
+                       else { /* normally efd->loc is closest point on effector xy-plane */
                                sub_v3_v3v3(efd->loc, point->loc, translate);
+                       }
                }
                else {
                        copy_v3_v3(efd->loc, ob->obmat[3]);