archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: convert smoke modifier from DerivedMesh to Mesh.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-20 12:33:45 +02:00
parent 91a5b665b0
commit cfb7565cd5
10 changed files with 118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_mesh.h
View File

@@ -117,8 +117,8 @@ struct Mesh *BKE_mesh_new_nomain_from_template(
int verts_len, int edges_len, int tessface_len, int verts_len, int edges_len, int tessface_len,
int loops_len, int polys_len); int loops_len, int polys_len);
/* Performs copy for use during evaluation. */ /* Performs copy for use during evaluation, optional referencing original arrays to reduce memory. */
struct Mesh *BKE_mesh_copy_for_eval(struct Mesh *source); struct Mesh *BKE_mesh_copy_for_eval(struct Mesh *source, bool reference);
/* These functions construct a new Mesh, contrary to BKE_mesh_from_nurbs which modifies ob itself. */ /* These functions construct a new Mesh, contrary to BKE_mesh_from_nurbs which modifies ob itself. */
struct Mesh *BKE_mesh_new_nomain_from_curve(struct Object *ob); struct Mesh *BKE_mesh_new_nomain_from_curve(struct Object *ob);

4
source/blender/blenkernel/BKE_smoke.h
View File

@@ -35,9 +35,9 @@
typedef float (*bresenham_callback)(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); typedef float (*bresenham_callback)(float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
struct DerivedMesh *smokeModifier_do(struct SmokeModifierData *smd, struct Depsgraph *depsgraph, struct Mesh *smokeModifier_do(struct SmokeModifierData *smd, struct Depsgraph *depsgraph,
struct Scene *scene, struct Scene *scene,
struct Object *ob, struct DerivedMesh *dm); struct Object *ob, struct Mesh *dm);
void smoke_reallocate_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old); void smoke_reallocate_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old);
void smoke_reallocate_highres_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old); void smoke_reallocate_highres_fluid(struct SmokeDomainSettings *sds, float dx, int res[3], int free_old);

8
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -1287,7 +1287,7 @@ static Mesh *create_orco_mesh(Object *ob, Mesh *me, BMEditMesh *em, int layer)
mesh = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0}); mesh = BKE_bmesh_to_mesh_nomain(em->bm, &(struct BMeshToMeshParams){0});
} }
else { else {
mesh = BKE_mesh_copy_for_eval(me); mesh = BKE_mesh_copy_for_eval(me, true);
} }
orco = get_orco_coords_dm(ob, em, layer, &free); orco = get_orco_coords_dm(ob, em, layer, &free);
@@ -2079,7 +2079,7 @@ static void mesh_calc_modifiers(
* coordinates (vpaint, etc.) * coordinates (vpaint, etc.)
*/ */
if (r_deform_mesh) { if (r_deform_mesh) {
*r_deform_mesh = BKE_mesh_copy_for_eval(me); *r_deform_mesh = BKE_mesh_copy_for_eval(me, true);
/* XXX: Is build_shapekey_layers ever even true? This should have crashed long ago... */ /* XXX: Is build_shapekey_layers ever even true? This should have crashed long ago... */
BLI_assert(!build_shapekey_layers); BLI_assert(!build_shapekey_layers);
@@ -2219,7 +2219,7 @@ static void mesh_calc_modifiers(
} }
} }
else { else {
mesh = BKE_mesh_copy_for_eval(me); mesh = BKE_mesh_copy_for_eval(me, true);
ASSERT_IS_VALID_MESH(mesh); ASSERT_IS_VALID_MESH(mesh);
// XXX: port to Mesh if build_shapekey_layers can ever be true // XXX: port to Mesh if build_shapekey_layers can ever be true
@@ -2388,7 +2388,7 @@ static void mesh_calc_modifiers(
#endif #endif
} }
else { else {
final_mesh = BKE_mesh_copy_for_eval(me); final_mesh = BKE_mesh_copy_for_eval(me, true);
//if (build_shapekey_layers) { //if (build_shapekey_layers) {
// add_shapekey_layers(final_mesh, me, ob); // add_shapekey_layers(final_mesh, me, ob);

17
source/blender/blenkernel/intern/mesh.c
View File

@@ -695,16 +695,19 @@ Mesh * BKE_mesh_new_nomain_from_template(
CD_MASK_EVERYTHING); CD_MASK_EVERYTHING);
} }
Mesh *BKE_mesh_copy_for_eval(struct Mesh *source) Mesh *BKE_mesh_copy_for_eval(struct Mesh *source, bool reference)
{ {
Mesh *result; int flags = (LIB_ID_CREATE_NO_MAIN |
BKE_id_copy_ex(
NULL, &source->id, (ID **)&result,
(LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG | LIB_ID_CREATE_NO_DEG_TAG |
LIB_ID_COPY_CD_REFERENCE), LIB_ID_COPY_NO_PREVIEW);
false);
if (reference) {
flags |= LIB_ID_COPY_CD_REFERENCE;
}
Mesh *result;
BKE_id_copy_ex( NULL, &source->id, (ID **)&result, flags, false);
return result; return result;
} }

2
source/blender/blenkernel/intern/multires.c
View File

@@ -314,7 +314,7 @@ Mesh *get_multires_mesh(
Mesh *result = mti->applyModifier(&mmd->modifier, &modifier_ctx, deformed_mesh); Mesh *result = mti->applyModifier(&mmd->modifier, &modifier_ctx, deformed_mesh);
if (result == deformed_mesh) { if (result == deformed_mesh) {
result = BKE_mesh_copy_for_eval(deformed_mesh); result = BKE_mesh_copy_for_eval(deformed_mesh, true);
} }
return result; return result;
} }

178
source/blender/blenkernel/intern/smoke.c
View File

@@ -54,6 +54,7 @@
#include "DNA_constraint_types.h" #include "DNA_constraint_types.h"
#include "DNA_customdata_types.h" #include "DNA_customdata_types.h"
#include "DNA_lamp_types.h" #include "DNA_lamp_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h" #include "DNA_modifier_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
@@ -65,16 +66,16 @@
#include "BKE_animsys.h" #include "BKE_animsys.h"
#include "BKE_armature.h" #include "BKE_armature.h"
#include "BKE_bvhutils.h" #include "BKE_bvhutils.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_collision.h" #include "BKE_collision.h"
#include "BKE_colortools.h" #include "BKE_colortools.h"
#include "BKE_constraint.h" #include "BKE_constraint.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_DerivedMesh.h"
#include "BKE_effect.h" #include "BKE_effect.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_particle.h" #include "BKE_particle.h"
@@ -105,9 +106,9 @@
static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER; static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;
struct Mesh;
struct Object; struct Object;
struct Scene; struct Scene;
struct DerivedMesh;
struct SmokeModifierData; struct SmokeModifierData;
// timestep default value for nice appearance 0.1f // timestep default value for nice appearance 0.1f
@@ -129,7 +130,7 @@ void smoke_initWaveletBlenderRNA(struct WTURBULENCE *UNUSED(wt), float *UNUSED(s
void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity),
int *UNUSED(border_colli), float *UNUSED(burning_rate), float *UNUSED(flame_smoke), float *UNUSED(flame_smoke_color), int *UNUSED(border_colli), float *UNUSED(burning_rate), float *UNUSED(flame_smoke), float *UNUSED(flame_smoke_color),
float *UNUSED(flame_vorticity), float *UNUSED(flame_ignition_temp), float *UNUSED(flame_max_temp)) {} float *UNUSED(flame_vorticity), float *UNUSED(flame_ignition_temp), float *UNUSED(flame_max_temp)) {}
struct DerivedMesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), struct Depsgraph *UNUSED(depsgraph), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) { return NULL; } struct Mesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), struct Depsgraph *UNUSED(depsgraph), Scene *UNUSED(scene), Object *UNUSED(ob), Mesh *UNUSED(me)) { return NULL; }
float smoke_get_velocity_at(struct Object *UNUSED(ob), float UNUSED(position[3]), float UNUSED(velocity[3])) { return 0.0f; } float smoke_get_velocity_at(struct Object *UNUSED(ob), float UNUSED(position[3]), float UNUSED(velocity[3])) { return 0.0f; }
#endif /* WITH_SMOKE */ #endif /* WITH_SMOKE */
@@ -194,20 +195,20 @@ static void smoke_pos_to_cell(SmokeDomainSettings *sds, float pos[3])
pos[2] *= 1.0f / sds->cell_size[2]; pos[2] *= 1.0f / sds->cell_size[2];
} }
/* set domain transformations and base resolution from object derivedmesh */ /* set domain transformations and base resolution from object mesh */
static void smoke_set_domain_from_derivedmesh(SmokeDomainSettings *sds, Object *ob, DerivedMesh *dm, bool init_resolution) static void smoke_set_domain_from_mesh(SmokeDomainSettings *sds, Object *ob, Mesh *me, bool init_resolution)
{ {
size_t i; size_t i;
float min[3] = {FLT_MAX, FLT_MAX, FLT_MAX}, max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX}; float min[3] = {FLT_MAX, FLT_MAX, FLT_MAX}, max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
float size[3]; float size[3];
MVert *verts = dm->getVertArray(dm); MVert *verts = me->mvert;
float scale = 0.0; float scale = 0.0;
int res; int res;
res = sds->maxres; res = sds->maxres;
// get BB of domain // get BB of domain
for (i = 0; i < dm->getNumVerts(dm); i++) for (i = 0; i < me->totvert; i++)
{ {
// min BB // min BB
min[0] = MIN2(min[0], verts[i].co[0]); min[0] = MIN2(min[0], verts[i].co[0]);
@@ -273,14 +274,14 @@ static void smoke_set_domain_from_derivedmesh(SmokeDomainSettings *sds, Object *
sds->cell_size[2] /= (float)sds->base_res[2]; sds->cell_size[2] /= (float)sds->base_res[2];
} }
static int smokeModifier_init(SmokeModifierData *smd, Object *ob, Scene *scene, DerivedMesh *dm) static int smokeModifier_init(SmokeModifierData *smd, Object *ob, Scene *scene, Mesh *me)
{ {
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain && !smd->domain->fluid) if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain && !smd->domain->fluid)
{ {
SmokeDomainSettings *sds = smd->domain; SmokeDomainSettings *sds = smd->domain;
int res[3]; int res[3];
/* set domain dimensions from derivedmesh */ /* set domain dimensions from mesh */
smoke_set_domain_from_derivedmesh(sds, ob, dm, true); smoke_set_domain_from_mesh(sds, ob, me, true);
/* reset domain values */ /* reset domain values */
zero_v3_int(sds->shift); zero_v3_int(sds->shift);
zero_v3(sds->shift_f); zero_v3(sds->shift_f);
@@ -376,7 +377,7 @@ static void smokeModifier_freeFlow(SmokeModifierData *smd)
{ {
if (smd->flow) if (smd->flow)
{ {
if (smd->flow->dm) smd->flow->dm->release(smd->flow->dm); if (smd->flow->mesh) BKE_id_free(NULL, smd->flow->mesh);
if (smd->flow->verts_old) MEM_freeN(smd->flow->verts_old); if (smd->flow->verts_old) MEM_freeN(smd->flow->verts_old);
MEM_freeN(smd->flow); MEM_freeN(smd->flow);
smd->flow = NULL; smd->flow = NULL;
@@ -398,9 +399,9 @@ static void smokeModifier_freeCollision(SmokeModifierData *smd)
} }
} }
if (smd->coll->dm) if (smd->coll->mesh)
smd->coll->dm->release(smd->coll->dm); BKE_id_free(NULL, smd->coll->mesh);
smd->coll->dm = NULL; smd->coll->mesh = NULL;
MEM_freeN(smd->coll); MEM_freeN(smd->coll);
smd->coll = NULL; smd->coll = NULL;
@@ -583,7 +584,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
smd->flow->color[1] = 0.7f; smd->flow->color[1] = 0.7f;
smd->flow->color[2] = 0.7f; smd->flow->color[2] = 0.7f;
smd->flow->dm = NULL; smd->flow->mesh = NULL;
smd->flow->psys = NULL; smd->flow->psys = NULL;
} }
@@ -598,11 +599,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
smd->coll->verts_old = NULL; smd->coll->verts_old = NULL;
smd->coll->numverts = 0; smd->coll->numverts = 0;
smd->coll->type = 0; // static obstacle smd->coll->type = 0; // static obstacle
smd->coll->dm = NULL; smd->coll->mesh = NULL;
#ifdef USE_SMOKE_COLLISION_DM
smd->coll->dm = NULL;
#endif
} }
} }
} }
@@ -743,7 +740,7 @@ typedef struct ObstaclesFromDMData {
int *num_obstacles; int *num_obstacles;
} ObstaclesFromDMData; } ObstaclesFromDMData;
static void obstacles_from_derivedmesh_task_cb( static void obstacles_from_mesh_task_cb(
void *__restrict userdata, void *__restrict userdata,
const int z, const int z,
const ParallelRangeTLS *__restrict UNUSED(tls)) const ParallelRangeTLS *__restrict UNUSED(tls))
@@ -800,13 +797,13 @@ static void obstacles_from_derivedmesh_task_cb(
} }
} }
static void obstacles_from_derivedmesh( static void obstacles_from_mesh(
Object *coll_ob, SmokeDomainSettings *sds, SmokeCollSettings *scs, Object *coll_ob, SmokeDomainSettings *sds, SmokeCollSettings *scs,
unsigned char *obstacle_map, float *velocityX, float *velocityY, float *velocityZ, int *num_obstacles, float dt) unsigned char *obstacle_map, float *velocityX, float *velocityY, float *velocityZ, int *num_obstacles, float dt)
{ {
if (!scs->dm) return; if (!scs->mesh) return;
{ {
DerivedMesh *dm = NULL; Mesh *me = NULL;
MVert *mvert = NULL; MVert *mvert = NULL;
const MLoopTri *looptri; const MLoopTri *looptri;
const MLoop *mloop; const MLoop *mloop;
@@ -816,12 +813,12 @@ static void obstacles_from_derivedmesh(
float *vert_vel = NULL; float *vert_vel = NULL;
bool has_velocity = false; bool has_velocity = false;
dm = CDDM_copy(scs->dm); me = BKE_mesh_copy_for_eval(scs->mesh, true);
CDDM_calc_normals(dm); BKE_mesh_ensure_normals(me);
mvert = dm->getVertArray(dm); mvert = me->mvert;
mloop = dm->getLoopArray(dm); mloop = me->mloop;
looptri = dm->getLoopTriArray(dm); looptri = BKE_mesh_runtime_looptri_ensure(me);
numverts = dm->getNumVerts(dm); numverts = me->totvert;
// DG TODO // DG TODO
// if (scs->type > SM_COLL_STATIC) // if (scs->type > SM_COLL_STATIC)
@@ -868,7 +865,7 @@ static void obstacles_from_derivedmesh(
copy_v3_v3(&scs->verts_old[i * 3], co); copy_v3_v3(&scs->verts_old[i * 3], co);
} }
if (bvhtree_from_mesh_get(&treeData, dm, BVHTREE_FROM_LOOPTRI, 4)) { if (BKE_bvhtree_from_mesh_get(&treeData, me, BVHTREE_FROM_LOOPTRI, 4)) {
ObstaclesFromDMData data = { ObstaclesFromDMData data = {
.sds = sds, .mvert = mvert, .mloop = mloop, .looptri = looptri, .sds = sds, .mvert = mvert, .mloop = mloop, .looptri = looptri,
.tree = &treeData, .obstacle_map = obstacle_map, .tree = &treeData, .obstacle_map = obstacle_map,
@@ -881,12 +878,12 @@ static void obstacles_from_derivedmesh(
settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC; settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC;
BLI_task_parallel_range(sds->res_min[2], sds->res_max[2], BLI_task_parallel_range(sds->res_min[2], sds->res_max[2],
&data, &data,
obstacles_from_derivedmesh_task_cb, obstacles_from_mesh_task_cb,
&settings); &settings);
} }
/* free bvh tree */ /* free bvh tree */
free_bvhtree_from_mesh(&treeData); free_bvhtree_from_mesh(&treeData);
dm->release(dm); BKE_id_free(NULL, me);
if (vert_vel) MEM_freeN(vert_vel); if (vert_vel) MEM_freeN(vert_vel);
} }
@@ -946,7 +943,7 @@ static void update_obstacles(Depsgraph *depsgraph, Object *ob, SmokeDomainSettin
if ((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll) if ((smd2->type & MOD_SMOKE_TYPE_COLL) && smd2->coll)
{ {
SmokeCollSettings *scs = smd2->coll; SmokeCollSettings *scs = smd2->coll;
obstacles_from_derivedmesh(collob, sds, scs, obstacles, velx, vely, velz, num_obstacles, dt); obstacles_from_mesh(collob, sds, scs, obstacles, velx, vely, velz, num_obstacles, dt);
} }
} }
@@ -1437,7 +1434,7 @@ static void emit_from_particles(
} }
} }
static void sample_derivedmesh( static void sample_mesh(
SmokeFlowSettings *sfs, SmokeFlowSettings *sfs,
const MVert *mvert, const MLoop *mloop, const MLoopTri *mlooptri, const MLoopUV *mloopuv, const MVert *mvert, const MLoop *mloop, const MLoopTri *mlooptri, const MLoopUV *mloopuv,
float *influence_map, float *velocity_map, int index, const int base_res[3], float flow_center[3], float *influence_map, float *velocity_map, int index, const int base_res[3], float flow_center[3],
@@ -1594,7 +1591,7 @@ typedef struct EmitFromDMData {
int *min, *max, *res; int *min, *max, *res;
} EmitFromDMData; } EmitFromDMData;
static void emit_from_derivedmesh_task_cb( static void emit_from_mesh_task_cb(
void *__restrict userdata, void *__restrict userdata,
const int z, const int z,
const ParallelRangeTLS *__restrict UNUSED(tls)) const ParallelRangeTLS *__restrict UNUSED(tls))
@@ -1616,7 +1613,7 @@ static void emit_from_derivedmesh_task_cb(
lx - em->min[0], em->res[0], ly - em->min[1], em->res[1], lz - em->min[2]); lx - em->min[0], em->res[0], ly - em->min[1], em->res[1], lz - em->min[2]);
const float ray_start[3] = {((float)lx) + 0.5f, ((float)ly) + 0.5f, ((float)lz) + 0.5f}; const float ray_start[3] = {((float)lx) + 0.5f, ((float)ly) + 0.5f, ((float)lz) + 0.5f};
sample_derivedmesh( sample_mesh(
data->sfs, data->mvert, data->mloop, data->mlooptri, data->mloopuv, data->sfs, data->mvert, data->mloop, data->mlooptri, data->mloopuv,
em->influence, em->velocity, index, data->sds->base_res, data->flow_center, em->influence, em->velocity, index, data->sds->base_res, data->flow_center,
data->tree, ray_start, data->vert_vel, data->has_velocity, data->defgrp_index, data->dvert, data->tree, ray_start, data->vert_vel, data->has_velocity, data->defgrp_index, data->dvert,
@@ -1634,7 +1631,7 @@ static void emit_from_derivedmesh_task_cb(
x - data->min[0], data->res[0], y - data->min[1], data->res[1], z - data->min[2]); x - data->min[0], data->res[0], y - data->min[1], data->res[1], z - data->min[2]);
const float ray_start[3] = {lx + 0.5f * data->hr, ly + 0.5f * data->hr, lz + 0.5f * data->hr}; const float ray_start[3] = {lx + 0.5f * data->hr, ly + 0.5f * data->hr, lz + 0.5f * data->hr};
sample_derivedmesh( sample_mesh(
data->sfs, data->mvert, data->mloop, data->mlooptri, data->mloopuv, data->sfs, data->mvert, data->mloop, data->mlooptri, data->mloopuv,
em->influence_high, NULL, index, data->sds->base_res, data->flow_center, em->influence_high, NULL, index, data->sds->base_res, data->flow_center,
data->tree, ray_start, data->vert_vel, data->has_velocity, data->defgrp_index, data->dvert, data->tree, ray_start, data->vert_vel, data->has_velocity, data->defgrp_index, data->dvert,
@@ -1645,14 +1642,13 @@ static void emit_from_derivedmesh_task_cb(
} }
} }
static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, float dt) static void emit_from_mesh(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, float dt)
{ {
if (sfs->dm) { if (sfs->mesh) {
DerivedMesh *dm; Mesh *me;
int defgrp_index = sfs->vgroup_density - 1; int defgrp_index = sfs->vgroup_density - 1;
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;
MVert *mvert = NULL; MVert *mvert = NULL;
MVert *mvert_orig = NULL;
const MLoopTri *mlooptri = NULL; const MLoopTri *mlooptri = NULL;
const MLoopUV *mloopuv = NULL; const MLoopUV *mloopuv = NULL;
const MLoop *mloop = NULL; const MLoop *mloop = NULL;
@@ -1665,19 +1661,24 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
int min[3], max[3], res[3]; int min[3], max[3], res[3];
int hires_multiplier = 1; int hires_multiplier = 1;
/* copy derivedmesh for thread safety because we modify it, /* copy mesh for thread safety because we modify it,
* main issue is its VertArray being modified, then replaced and freed * main issue is its VertArray being modified, then replaced and freed
*/ */
dm = CDDM_copy(sfs->dm); me = BKE_mesh_copy_for_eval(sfs->mesh, true);
CDDM_calc_normals(dm); /* Duplicate vertices to modify. */
mvert = dm->getVertArray(dm); if (me->mvert) {
mvert_orig = dm->dupVertArray(dm); /* copy original mvert and restore when done */ me->mvert = MEM_dupallocN(me->mvert);
numOfVerts = dm->getNumVerts(dm); CustomData_set_layer(&me->vdata, CD_MVERT, me->mvert);
dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); }
mloopuv = CustomData_get_layer_named(&dm->loopData, CD_MLOOPUV, sfs->uvlayer_name);
mloop = dm->getLoopArray(dm); BKE_mesh_ensure_normals(me);
mlooptri = dm->getLoopTriArray(dm); mvert = me->mvert;
numOfVerts = me->totvert;
dvert = CustomData_get_layer(&me->vdata, CD_MDEFORMVERT);
mloopuv = CustomData_get_layer_named(&me->ldata, CD_MLOOPUV, sfs->uvlayer_name);
mloop = me->mloop;
mlooptri = BKE_mesh_runtime_looptri_ensure(me);
if (sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY) { if (sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY) {
vert_vel = MEM_callocN(sizeof(float) * numOfVerts * 3, "smoke_flow_velocity"); vert_vel = MEM_callocN(sizeof(float) * numOfVerts * 3, "smoke_flow_velocity");
@@ -1692,7 +1693,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
} }
} }
/* Transform dm vertices to /* Transform mesh vertices to
* domain grid space for fast lookups */ * domain grid space for fast lookups */
for (i = 0; i < numOfVerts; i++) { for (i = 0; i < numOfVerts; i++) {
float n[3]; float n[3];
@@ -1738,7 +1739,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
res[i] = em->res[i] * hires_multiplier; res[i] = em->res[i] * hires_multiplier;
} }
if (bvhtree_from_mesh_get(&treeData, dm, BVHTREE_FROM_LOOPTRI, 4)) { if (BKE_bvhtree_from_mesh_get(&treeData, me, BVHTREE_FROM_LOOPTRI, 4)) {
const float hr = 1.0f / ((float)hires_multiplier); const float hr = 1.0f / ((float)hires_multiplier);
EmitFromDMData data = { EmitFromDMData data = {
@@ -1755,23 +1756,20 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC; settings.scheduling_mode = TASK_SCHEDULING_DYNAMIC;
BLI_task_parallel_range(min[2], max[2], BLI_task_parallel_range(min[2], max[2],
&data, &data,
emit_from_derivedmesh_task_cb, emit_from_mesh_task_cb,
&settings); &settings);
} }
/* free bvh tree */ /* free bvh tree */
free_bvhtree_from_mesh(&treeData); free_bvhtree_from_mesh(&treeData);
/* restore original mverts */
CustomData_set_layer(&dm->vertData, CD_MVERT, mvert_orig);
if (mvert) {
MEM_freeN(mvert);
}
if (vert_vel) { if (vert_vel) {
MEM_freeN(vert_vel); MEM_freeN(vert_vel);
} }
dm->needsFree = 1; if (me->mvert) {
dm->release(dm); MEM_freeN(me->mvert);
}
BKE_id_free(NULL, me);
} }
} }
@@ -2175,7 +2173,7 @@ static void update_flowsfluids(
emit_from_particles(collob, sds, sfs, em, scene, dt); emit_from_particles(collob, sds, sfs, em, scene, dt);
} }
else { else {
emit_from_derivedmesh(collob, sds, sfs, em, dt); emit_from_mesh(collob, sds, sfs, em, dt);
} }
} }
/* sample subframes */ /* sample subframes */
@@ -2219,7 +2217,7 @@ static void update_flowsfluids(
BLI_mutex_unlock(&object_update_lock); BLI_mutex_unlock(&object_update_lock);
/* apply flow */ /* apply flow */
emit_from_derivedmesh(collob, sds, sfs, &em_temp, sdt); emit_from_mesh(collob, sds, sfs, &em_temp, sdt);
} }
/* combine emission maps */ /* combine emission maps */
@@ -2563,7 +2561,7 @@ static void update_effectors(struct Depsgraph *depsgraph, Scene *scene, Object *
static void step( static void step(
Depsgraph *depsgraph, Depsgraph *depsgraph,
Scene *scene, Object *ob, SmokeModifierData *smd, DerivedMesh *domain_dm, float fps) Scene *scene, Object *ob, SmokeModifierData *smd, Mesh *domain_me, float fps)
{ {
SmokeDomainSettings *sds = smd->domain; SmokeDomainSettings *sds = smd->domain;
/* stability values copied from wturbulence.cpp */ /* stability values copied from wturbulence.cpp */
@@ -2591,7 +2589,7 @@ static void step(
/* update object state */ /* update object state */
invert_m4_m4(sds->imat, ob->obmat); invert_m4_m4(sds->imat, ob->obmat);
copy_m4_m4(sds->obmat, ob->obmat); copy_m4_m4(sds->obmat, ob->obmat);
smoke_set_domain_from_derivedmesh(sds, ob, domain_dm, (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) != 0); smoke_set_domain_from_mesh(sds, ob, domain_me, (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) != 0);
/* use global gravity if enabled */ /* use global gravity if enabled */
if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) { if (scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
@@ -2643,9 +2641,9 @@ static void step(
} }
} }
static DerivedMesh *createDomainGeometry(SmokeDomainSettings *sds, Object *ob) static Mesh *createDomainGeometry(SmokeDomainSettings *sds, Object *ob)
{ {
DerivedMesh *result; Mesh *result;
MVert *mverts; MVert *mverts;
MPoly *mpolys; MPoly *mpolys;
MLoop *mloops; MLoop *mloops;
@@ -2667,11 +2665,10 @@ static DerivedMesh *createDomainGeometry(SmokeDomainSettings *sds, Object *ob)
num_faces = 0; num_faces = 0;
} }
result = CDDM_new(num_verts, 0, 0, num_faces * 4, num_faces); result = BKE_mesh_new_nomain(num_verts, 0, 0, num_faces * 4, num_faces);
mverts = CDDM_get_verts(result); mverts = result->mvert;
mpolys = CDDM_get_polys(result); mpolys = result->mpoly;
mloops = CDDM_get_loops(result); mloops = result->mloop;
if (num_verts) { if (num_verts) {
/* volume bounds */ /* volume bounds */
@@ -2724,22 +2721,21 @@ static DerivedMesh *createDomainGeometry(SmokeDomainSettings *sds, Object *ob)
} }
} }
BKE_mesh_calc_edges(result, false, false);
CDDM_calc_edges(result); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
result->dirty |= DM_DIRTY_NORMALS;
return result; return result;
} }
static void smokeModifier_process( static void smokeModifier_process(
SmokeModifierData *smd, struct Depsgraph *depsgraph, Scene *scene, Object *ob, DerivedMesh *dm) SmokeModifierData *smd, struct Depsgraph *depsgraph, Scene *scene, Object *ob, Mesh *me)
{ {
if ((smd->type & MOD_SMOKE_TYPE_FLOW)) if ((smd->type & MOD_SMOKE_TYPE_FLOW))
{ {
if (scene->r.cfra >= smd->time) if (scene->r.cfra >= smd->time)
smokeModifier_init(smd, ob, scene, dm); smokeModifier_init(smd, ob, scene, me);
if (smd->flow->dm) smd->flow->dm->release(smd->flow->dm); if (smd->flow->mesh) BKE_id_free(NULL, smd->flow->mesh);
smd->flow->dm = CDDM_copy(dm); smd->flow->mesh = BKE_mesh_copy_for_eval(me, false);
if (scene->r.cfra > smd->time) if (scene->r.cfra > smd->time)
{ {
@@ -2754,14 +2750,14 @@ static void smokeModifier_process(
else if (smd->type & MOD_SMOKE_TYPE_COLL) else if (smd->type & MOD_SMOKE_TYPE_COLL)
{ {
if (scene->r.cfra >= smd->time) if (scene->r.cfra >= smd->time)
smokeModifier_init(smd, ob, scene, dm); smokeModifier_init(smd, ob, scene, me);
if (smd->coll) if (smd->coll)
{ {
if (smd->coll->dm) if (smd->coll->mesh)
smd->coll->dm->release(smd->coll->dm); BKE_id_free(NULL, smd->coll->mesh);
smd->coll->dm = CDDM_copy(dm); smd->coll->mesh = BKE_mesh_copy_for_eval(me, false);
} }
smd->time = scene->r.cfra; smd->time = scene->r.cfra;
@@ -2804,7 +2800,7 @@ static void smokeModifier_process(
if ((smd->time == framenr) && (framenr != scene->r.cfra)) if ((smd->time == framenr) && (framenr != scene->r.cfra))
return; return;
if (smokeModifier_init(smd, ob, scene, dm) == 0) if (smokeModifier_init(smd, ob, scene, me) == 0)
{ {
printf("bad smokeModifier_init\n"); printf("bad smokeModifier_init\n");
return; return;
@@ -2852,7 +2848,7 @@ static void smokeModifier_process(
} }
step(depsgraph, scene, ob, smd, dm, scene->r.frs_sec / scene->r.frs_sec_base); step(depsgraph, scene, ob, smd, me, scene->r.frs_sec / scene->r.frs_sec_base);
} }
// create shadows before writing cache so they get stored // create shadows before writing cache so they get stored
@@ -2873,14 +2869,14 @@ static void smokeModifier_process(
} }
} }
struct DerivedMesh *smokeModifier_do( struct Mesh *smokeModifier_do(
SmokeModifierData *smd, struct Depsgraph *depsgraph, Scene *scene, Object *ob, DerivedMesh *dm) SmokeModifierData *smd, struct Depsgraph *depsgraph, Scene *scene, Object *ob, Mesh *me)
{ {
/* lock so preview render does not read smoke data while it gets modified */ /* lock so preview render does not read smoke data while it gets modified */
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
BLI_rw_mutex_lock(smd->domain->fluid_mutex, THREAD_LOCK_WRITE); BLI_rw_mutex_lock(smd->domain->fluid_mutex, THREAD_LOCK_WRITE);
smokeModifier_process(smd, depsgraph, scene, ob, dm); smokeModifier_process(smd, depsgraph, scene, ob, me);
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
BLI_rw_mutex_unlock(smd->domain->fluid_mutex); BLI_rw_mutex_unlock(smd->domain->fluid_mutex);
@@ -2893,7 +2889,7 @@ struct DerivedMesh *smokeModifier_do(
return createDomainGeometry(smd->domain, ob); return createDomainGeometry(smd->domain, ob);
} }
else { else {
return CDDM_copy(dm); return BKE_mesh_copy_for_eval(me, false);
} }
} }

4
source/blender/blenloader/intern/readfile.c
View File

@@ -5198,7 +5198,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
smd->coll = NULL; smd->coll = NULL;
smd->flow = newdataadr(fd, smd->flow); smd->flow = newdataadr(fd, smd->flow);
smd->flow->smd = smd; smd->flow->smd = smd;
smd->flow->dm = NULL; smd->flow->mesh = NULL;
smd->flow->verts_old = NULL; smd->flow->verts_old = NULL;
smd->flow->numverts = 0; smd->flow->numverts = 0;
smd->flow->psys = newdataadr(fd, smd->flow->psys); smd->flow->psys = newdataadr(fd, smd->flow->psys);
@@ -5211,7 +5211,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
smd->coll->smd = smd; smd->coll->smd = smd;
smd->coll->verts_old = NULL; smd->coll->verts_old = NULL;
smd->coll->numverts = 0; smd->coll->numverts = 0;
smd->coll->dm = NULL; smd->coll->mesh = NULL;
} }
else { else {
smd->type = 0; smd->type = 0;

4
source/blender/makesdna/DNA_smoke_types.h
View File

@@ -250,7 +250,7 @@ typedef struct SmokeDomainSettings {
typedef struct SmokeFlowSettings { typedef struct SmokeFlowSettings {
struct SmokeModifierData *smd; /* for fast RNA access */ struct SmokeModifierData *smd; /* for fast RNA access */
struct DerivedMesh *dm; struct Mesh *mesh;
struct ParticleSystem *psys; struct ParticleSystem *psys;
struct Tex *noise_texture; struct Tex *noise_texture;
@@ -290,7 +290,7 @@ typedef struct SmokeFlowSettings {
/* collision objects (filled with smoke) */ /* collision objects (filled with smoke) */
typedef struct SmokeCollSettings { typedef struct SmokeCollSettings {
struct SmokeModifierData *smd; /* for fast RNA access */ struct SmokeModifierData *smd; /* for fast RNA access */
struct DerivedMesh *dm; struct Mesh *mesh;
float *verts_old; float *verts_old;
int numverts; int numverts;
short type; // static = 0, rigid = 1, dynamic = 2 short type; // static = 0, rigid = 1, dynamic = 2

14
source/blender/modifiers/intern/MOD_particlesystem.c
View File

@@ -145,12 +145,7 @@ static void deformVerts(
} }
/* make new mesh */ /* make new mesh */
BKE_id_copy_ex(NULL, &mesh_src->id, (ID **)&psmd->mesh_final, psmd->mesh_final = BKE_mesh_copy_for_eval(mesh_src, false);
LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG |
LIB_ID_COPY_NO_PREVIEW,
false);
BKE_mesh_apply_vert_coords(psmd->mesh_final, vertexCos); BKE_mesh_apply_vert_coords(psmd->mesh_final, vertexCos);
BKE_mesh_calc_normals(psmd->mesh_final); BKE_mesh_calc_normals(psmd->mesh_final);
@@ -182,12 +177,7 @@ static void deformVerts(
/* Make a persistent copy of the mesh. We don't actually need /* Make a persistent copy of the mesh. We don't actually need
* all this data, just some topology for remapping. Could be * all this data, just some topology for remapping. Could be
* optimized once. */ * optimized once. */
BKE_id_copy_ex(NULL, &mesh_original->id, (ID **)&psmd->mesh_original, psmd->mesh_original = BKE_mesh_copy_for_eval(mesh_original, false);
LIB_ID_CREATE_NO_MAIN |
LIB_ID_CREATE_NO_USER_REFCOUNT |
LIB_ID_CREATE_NO_DEG_TAG |
LIB_ID_COPY_NO_PREVIEW,
false);
} }
BKE_mesh_tessface_ensure(psmd->mesh_original); BKE_mesh_tessface_ensure(psmd->mesh_original);

10
source/blender/modifiers/intern/MOD_smoke.c
View File

@@ -105,22 +105,20 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask; return dataMask;
} }
static DerivedMesh *applyModifier_DM( static Mesh *applyModifier(
ModifierData *md, const ModifierEvalContext *ctx, ModifierData *md, const ModifierEvalContext *ctx,
DerivedMesh *dm) Mesh *me)
{ {
SmokeModifierData *smd = (SmokeModifierData *) md; SmokeModifierData *smd = (SmokeModifierData *) md;
if (ctx->flag & MOD_APPLY_ORCO) { if (ctx->flag & MOD_APPLY_ORCO) {
return dm; return me;
} }
Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
return smokeModifier_do(smd, ctx->depsgraph, scene, ctx->object, dm); return smokeModifier_do(smd, ctx->depsgraph, scene, ctx->object, me);
} }
applyModifier_DM_wrapper(applyModifier, applyModifier_DM)
static bool dependsOnTime(ModifierData *UNUSED(md)) static bool dependsOnTime(ModifierData *UNUSED(md))
{ {
return true; return true;