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

Modifiers: Armature DerivedMesh → Mesh

Browse Source 
The mesh parameter of armature_deform_verts() is now const, to indicate
that it's safe to pass ob->data to it directly.
This commit is contained in:
Sybren A. Stüvel
2018-04-25 11:04:40 +02:00
parent 7efc75c709
commit eb6fc05f25
4 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_lattice.h
View File

@@ -38,6 +38,7 @@
struct Lattice; struct Lattice;
struct Main; struct Main;
struct Mesh;
struct Object; struct Object;
struct Scene; struct Scene;
struct DerivedMesh; struct DerivedMesh;
@@ -73,7 +74,7 @@ void lattice_deform_verts(struct Object *laOb, struct Object *target,
struct DerivedMesh *dm, float (*vertexCos)[3], struct DerivedMesh *dm, float (*vertexCos)[3],
int numVerts, const char *vgroup, float influence); int numVerts, const char *vgroup, float influence);
void armature_deform_verts(struct Object *armOb, struct Object *target, 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 (*defMats)[3][3], int numVerts, int deformflag,
float (*prevCos)[3], const char *defgrp_name); float (*prevCos)[3], const char *defgrp_name);

14
source/blender/blenkernel/intern/armature.c
View File

@@ -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 (*defMats)[3][3], int numVerts, int deformflag,
float (*prevCos)[3], const char *defgrp_name) 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 */ /* get a vertex-deform-index to posechannel array */
if (deformflag & ARM_DEF_VGROUP) { if (deformflag & ARM_DEF_VGROUP) {
if (ELEM(target->type, OB_MESH, OB_LATTICE)) { if (ELEM(target->type, OB_MESH, OB_LATTICE)) {
/* if we have a DerivedMesh, only use dverts if it has them */ /* if we have a Mesh, only use dverts if it has them */
if (dm) { if (mesh) {
use_dverts = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL); use_dverts = (mesh->dvert != NULL);
} }
else if (dverts) { else if (dverts) {
use_dverts = true; 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 (use_dverts || armature_def_nr != -1) {
if (dm) if (mesh) {
dvert = dm->getVertData(dm, i, CD_MDEFORMVERT); BLI_assert(i < mesh->totvert);
dvert = mesh->dvert + i;
}
else if (dverts && i < target_totvert) else if (dverts && i < target_totvert)
dvert = dverts + i; dvert = dverts + i;
else else

66
source/blender/blenkernel/intern/modifier.c
View File

@@ -1033,14 +1033,20 @@ void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsg
mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos, defMats, numVerts); mti->deformMatrices_DM(md, depsgraph, ob, dm, vertexCos, defMats, numVerts);
} }
else { else {
struct Mesh mesh; /* TODO(sybren): deduplicate all the copies of this code in this file. */
BKE_mesh_init(&mesh); 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);
}
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); if (mesh != NULL) {
BKE_mesh_free(mesh);
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); mti->deformVertsEM_DM(md, depsgraph, ob, editData, dm, vertexCos, numVerts);
} }
else { else {
/* TODO(sybren): deduplicate all the copies of this code in this file. */
Mesh *mesh = NULL; Mesh *mesh = NULL;
if (dm != NULL) { if (dm != NULL) {
mesh = BKE_libblock_alloc_notest(ID_ME); 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); mti->deformMatricesEM_DM(md, depsgraph, ob, editData, dm, vertexCos, defMats, numVerts);
} }
else { else {
struct Mesh mesh; /* TODO(sybren): deduplicate all the copies of this code in this file. */
BKE_mesh_init(&mesh); 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);
}
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); if (mesh != NULL) {
BKE_mesh_free(mesh);
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); return mti->applyModifierEM_DM(md, depsgraph, ob, editData, dm, flag);
} }
else { else {
struct Mesh mesh; /* TODO(sybren): deduplicate all the copies of this code in this file. */
BKE_mesh_init(&mesh); 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);
}
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); 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(new_mesh);
BKE_mesh_free(&mesh); MEM_freeN(new_mesh);
}
/* XXX free new_mesh? */ if (mesh != NULL) {
BKE_mesh_free(mesh);
MEM_freeN(mesh);
} }
return ndm; return ndm;

82
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -42,12 +42,16 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BLI_string.h" #include "BLI_string.h"
#include "BKE_editmesh.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_lattice.h" #include "BKE_lattice.h"
#include "BKE_library.h"
#include "BKE_library_query.h" #include "BKE_library_query.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "bmesh.h"
#include "bmesh_tools.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "MOD_util.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), static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph),
Object *ob, DerivedMesh *derivedData, Object *ob, Mesh *mesh,
float (*vertexCos)[3], float (*vertexCos)[3],
int numVerts, int numVerts,
ModifierApplyFlag UNUSED(flag)) 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 */ 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); numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name);
/* free cache */ /* free cache */
@@ -128,16 +132,22 @@ static void deformVerts(ModifierData *md, struct Depsgraph *UNUSED(depsgraph),
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, struct BMEditMesh *em, 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; ArmatureModifierData *amd = (ArmatureModifierData *) md;
DerivedMesh *dm = derivedData; Mesh *mesh_src = mesh;
if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); /* 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, &params);
}
modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ 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); numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name);
/* free cache */ /* free cache */
@@ -146,37 +156,45 @@ static void deformVertsEM(
amd->prevCos = NULL; amd->prevCos = NULL;
} }
if (!derivedData) dm->release(dm); if (!mesh) {
BKE_mesh_free(mesh_src);
MEM_freeN(mesh_src);
}
} }
static void deformMatricesEM( static void deformMatricesEM(
ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, struct BMEditMesh *em, 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) float (*defMats)[3][3], int numVerts)
{ {
ArmatureModifierData *amd = (ArmatureModifierData *) md; ArmatureModifierData *amd = (ArmatureModifierData *) md;
DerivedMesh *dm = derivedData; Mesh *mesh_src = mesh;
if (!derivedData) dm = CDDM_from_editbmesh(em, false, false); /* TODO(sybren): possibly lift this code to modifier.c and use it for all modifiers */
if (!mesh) {
armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, struct BMeshToMeshParams params = {0};
amd->deformflag, NULL, amd->defgrp_name); mesh_src = BKE_libblock_alloc_notest(ID_ME);
BKE_mesh_init(mesh_src);
if (!derivedData) dm->release(dm); BM_mesh_bm_to_me(em->bm, mesh_src, &params);
} }
static void deformMatrices(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, DerivedMesh *derivedData, armature_deform_verts(amd->object, ob, mesh_src, vertexCos, defMats, numVerts,
amd->deformflag, NULL, amd->defgrp_name);
if (!mesh) {
BKE_mesh_free(mesh_src);
MEM_freeN(mesh_src);
}
}
static void deformMatrices(ModifierData *md, struct Depsgraph *UNUSED(depsgraph), Object *ob, Mesh *mesh,
float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
{ {
ArmatureModifierData *amd = (ArmatureModifierData *) md; 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, mesh_src, vertexCos, defMats, numVerts,
armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts,
amd->deformflag, NULL, amd->defgrp_name); amd->deformflag, NULL, amd->defgrp_name);
if (!derivedData) dm->release(dm);
} }
ModifierTypeInfo modifierType_Armature = { ModifierTypeInfo modifierType_Armature = {
@@ -190,17 +208,17 @@ ModifierTypeInfo modifierType_Armature = {
/* copyData */ copyData, /* copyData */ copyData,
/* deformVerts_DM */ deformVerts, /* deformVerts_DM */ NULL,
/* deformMatrices_DM */ deformMatrices, /* deformMatrices_DM */ NULL,
/* deformVertsEM_DM */ deformVertsEM, /* deformVertsEM_DM */ NULL,
/* deformMatricesEM_DM*/deformMatricesEM, /* deformMatricesEM_DM*/NULL,
/* applyModifier_DM */ NULL, /* applyModifier_DM */ NULL,
/* applyModifierEM_DM */NULL, /* applyModifierEM_DM */NULL,
/* deformVerts */ NULL, /* deformVerts */ deformVerts,
/* deformMatrices */ NULL, /* deformMatrices */ deformMatrices,
/* deformVertsEM */ NULL, /* deformVertsEM */ deformVertsEM,
/* deformMatricesEM */ NULL, /* deformMatricesEM */ deformMatricesEM,
/* applyModifier */ NULL, /* applyModifier */ NULL,
/* applyModifierEM */ NULL, /* applyModifierEM */ NULL,