diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-25 12:04:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 19:02:17 +0300 |
commit | eb6fc05f25d669eab8f0f8c0d19bb92addd1033d (patch) | |
tree | a15cedfe4b85e96b90d07a69c93610b0c55b0a9c /source/blender | |
parent | 7efc75c7092b085fe3f5ef2dcab3669d466dfadc (diff) |
Modifiers: Armature DerivedMesh → Mesh
The mesh parameter of armature_deform_verts() is now const, to indicate
that it's safe to pass ob->data to it directly.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_lattice.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 66 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 80 |
4 files changed, 104 insertions, 59 deletions
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index 1e3921747a5..37f838a543c 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -38,6 +38,7 @@ struct Lattice; struct Main; +struct Mesh; struct Object; struct Scene; struct DerivedMesh; @@ -73,7 +74,7 @@ void lattice_deform_verts(struct Object *laOb, struct Object *target, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts, const char *vgroup, float influence); void armature_deform_verts(struct Object *armOb, struct Object *target, - struct DerivedMesh *dm, float (*vertexCos)[3], + const struct Mesh *mesh, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts, int deformflag, float (*prevCos)[3], const char *defgrp_name); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index d1b02695c35..2ded32b3ec9 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -963,7 +963,7 @@ static void armature_bbone_defmats_cb(void *userdata, Link *iter, int index) } } -void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3], +void armature_deform_verts(Object *armOb, Object *target, const Mesh * mesh, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts, int deformflag, float (*prevCos)[3], const char *defgrp_name) { @@ -1039,9 +1039,9 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float /* get a vertex-deform-index to posechannel array */ if (deformflag & ARM_DEF_VGROUP) { if (ELEM(target->type, OB_MESH, OB_LATTICE)) { - /* if we have a DerivedMesh, only use dverts if it has them */ - if (dm) { - use_dverts = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL); + /* if we have a Mesh, only use dverts if it has them */ + if (mesh) { + use_dverts = (mesh->dvert != NULL); } else if (dverts) { use_dverts = true; @@ -1103,8 +1103,10 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float } if (use_dverts || armature_def_nr != -1) { - if (dm) - dvert = dm->getVertData(dm, i, CD_MDEFORMVERT); + if (mesh) { + BLI_assert(i < mesh->totvert); + dvert = mesh->dvert + i; + } else if (dverts && i < target_totvert) dvert = dverts + i; else diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index f7892e2f08b..3caa3a032ff 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -1033,14 +1033,20 @@ void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsg mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos, defMats, numVerts); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - mti->deformMatrices(md, depsgraph, ob, &mesh, vertexCos, defMats, numVerts); + mti->deformMatrices(md, depsgraph, ob, mesh, vertexCos, defMats, numVerts); - BKE_mesh_free(&mesh); + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); + } } } @@ -1054,6 +1060,7 @@ void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgr mti->deformVertsEM_DM(md, depsgraph, ob, editData, dm, vertexCos, numVerts); } else { + /* TODO(sybren): deduplicate all the copies of this code in this file. */ Mesh *mesh = NULL; if (dm != NULL) { mesh = BKE_libblock_alloc_notest(ID_ME); @@ -1080,14 +1087,20 @@ void modifier_deformMatricesEM_DM_deprecated(struct ModifierData *md, struct Dep mti->deformMatricesEM_DM(md, depsgraph, ob, editData, dm, vertexCos, defMats, numVerts); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - mti->deformMatricesEM(md, depsgraph, ob, editData, &mesh, vertexCos, defMats, numVerts); + mti->deformMatricesEM(md, depsgraph, ob, editData, mesh, vertexCos, defMats, numVerts); - BKE_mesh_free(&mesh); + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); + } } } @@ -1140,19 +1153,30 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData * return mti->applyModifierEM_DM(md, depsgraph, ob, editData, dm, flag); } else { - struct Mesh mesh; - BKE_mesh_init(&mesh); - - DM_to_mesh(dm, &mesh, ob, CD_MASK_EVERYTHING, false); + /* TODO(sybren): deduplicate all the copies of this code in this file. */ + Mesh *mesh = NULL; + if (dm != NULL) { + mesh = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh); + DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false); + } - struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, &mesh, flag); + struct Mesh *new_mesh = mti->applyModifierEM(md, depsgraph, ob, editData, mesh, flag); DerivedMesh *ndm = CDDM_from_mesh(new_mesh); + if(new_mesh != mesh) { + /* Make a DM that doesn't reference new_mesh so we can free the latter. */ + /* TODO(sybren): create CDDM_from_mesh_ex() that creates a copy directly. */ + DerivedMesh *nonref_dm = CDDM_copy(ndm); + ndm->release(ndm); + ndm = nonref_dm; - if(new_mesh != &mesh) { - BKE_mesh_free(&mesh); - - /* XXX free new_mesh? */ + BKE_mesh_free(new_mesh); + MEM_freeN(new_mesh); + } + if (mesh != NULL) { + BKE_mesh_free(mesh); + MEM_freeN(mesh); } return ndm; diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index c448ebdf11f..abbd7ba0fc8 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -42,12 +42,16 @@ #include "BLI_utildefines.h" #include "BLI_string.h" - -#include "BKE_cdderivedmesh.h" +#include "BKE_editmesh.h" #include "BKE_lattice.h" +#include "BKE_library.h" #include "BKE_library_query.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" +#include "bmesh.h" +#include "bmesh_tools.h" + #include "MEM_guardedalloc.h" #include "MOD_util.h" @@ -107,7 +111,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), - Object *ob, DerivedMesh *derivedData, + Object *ob, Mesh *mesh, float (*vertexCos)[3], int numVerts, ModifierApplyFlag UNUSED(flag)) @@ -116,7 +120,7 @@ static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ - armature_deform_verts(amd->object, ob, derivedData, vertexCos, NULL, + armature_deform_verts(amd->object, ob, mesh, vertexCos, NULL, numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name); /* free cache */ @@ -128,16 +132,22 @@ static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), static void deformVertsEM( ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, struct BMEditMesh *em, - DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) + Mesh *mesh, float (*vertexCos)[3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - DerivedMesh *dm = derivedData; - - if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); + Mesh *mesh_src = mesh; + + /* TODO(sybren): possibly lift this code to modifier.c and use it for all modifiers */ + if (!mesh) { + struct BMeshToMeshParams params = {0}; + mesh_src = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh_src); + BM_mesh_bm_to_me(em->bm, mesh_src, ¶ms); + } modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ - armature_deform_verts(amd->object, ob, dm, vertexCos, NULL, + armature_deform_verts(amd->object, ob, mesh_src, vertexCos, NULL, numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name); /* free cache */ @@ -146,37 +156,45 @@ static void deformVertsEM( amd->prevCos = NULL; } - if (!derivedData) dm->release(dm); + if (!mesh) { + BKE_mesh_free(mesh_src); + MEM_freeN(mesh_src); + } } static void deformMatricesEM( ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, struct BMEditMesh *em, - DerivedMesh *derivedData, float (*vertexCos)[3], + Mesh *mesh, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - DerivedMesh *dm = derivedData; - - if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); + Mesh *mesh_src = mesh; + + /* TODO(sybren): possibly lift this code to modifier.c and use it for all modifiers */ + if (!mesh) { + struct BMeshToMeshParams params = {0}; + mesh_src = BKE_libblock_alloc_notest(ID_ME); + BKE_mesh_init(mesh_src); + BM_mesh_bm_to_me(em->bm, mesh_src, ¶ms); + } - armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, + armature_deform_verts(amd->object, ob, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); - if (!derivedData) dm->release(dm); + if (!mesh) { + BKE_mesh_free(mesh_src); + MEM_freeN(mesh_src); + } } -static void deformMatrices(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, DerivedMesh *derivedData, +static void deformMatrices(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, Mesh *mesh, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - DerivedMesh *dm = derivedData; + Mesh *mesh_src = mesh ? mesh : ob->data; - if (!derivedData) dm = CDDM_from_mesh((Mesh *)ob->data); - - armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, + armature_deform_verts(amd->object, ob, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); - - if (!derivedData) dm->release(dm); } ModifierTypeInfo modifierType_Armature = { @@ -190,17 +208,17 @@ ModifierTypeInfo modifierType_Armature = { /* copyData */ copyData, - /* deformVerts_DM */ deformVerts, - /* deformMatrices_DM */ deformMatrices, - /* deformVertsEM_DM */ deformVertsEM, - /* deformMatricesEM_DM*/deformMatricesEM, + /* deformVerts_DM */ NULL, + /* deformMatrices_DM */ NULL, + /* deformVertsEM_DM */ NULL, + /* deformMatricesEM_DM*/NULL, /* applyModifier_DM */ NULL, /* applyModifierEM_DM */NULL, - /* deformVerts */ NULL, - /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, - /* deformMatricesEM */ NULL, + /* deformVerts */ deformVerts, + /* deformMatrices */ deformMatrices, + /* deformVertsEM */ deformVertsEM, + /* deformMatricesEM */ deformMatricesEM, /* applyModifier */ NULL, /* applyModifierEM */ NULL, |