Mai Lavelle
be4df85919
Makes the follow changes: - Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers. - Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary - Update the rest of Blender to be aware and make use of these new functions The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed. Reviewers: campbellbarton, sergey, mont29 Subscribers: sybren Tags: #bf_blender_2.8 Differential Revision: https://developer.blender.org/D3155
139 lines
4.0 KiB
C
139 lines
4.0 KiB
C
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor(s): Antony Riakiotakis
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*
|
|
*/
|
|
|
|
/** \file blender/modifiers/intern/MOD_triangulate.c
|
|
* \ingroup modifiers
|
|
*/
|
|
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BKE_cdderivedmesh.h"
|
|
#include "BKE_modifier.h"
|
|
|
|
#include "bmesh.h"
|
|
#include "bmesh_tools.h"
|
|
|
|
#include "MOD_modifiertypes.h"
|
|
|
|
static DerivedMesh *triangulate_dm(DerivedMesh *dm, const int quad_method, const int ngon_method)
|
|
{
|
|
DerivedMesh *result;
|
|
BMesh *bm;
|
|
int total_edges, i;
|
|
MEdge *me;
|
|
|
|
bm = DM_to_bmesh(dm, true);
|
|
|
|
BM_mesh_triangulate(bm, quad_method, ngon_method, false, NULL, NULL, NULL);
|
|
|
|
result = CDDM_from_bmesh(bm, false);
|
|
BM_mesh_free(bm);
|
|
|
|
total_edges = result->getNumEdges(result);
|
|
me = CDDM_get_edges(result);
|
|
|
|
/* force drawing of all edges (seems to be omitted in CDDM_from_bmesh) */
|
|
for (i = 0; i < total_edges; i++, me++)
|
|
me->flag |= ME_EDGEDRAW | ME_EDGERENDER;
|
|
|
|
result->dirty |= DM_DIRTY_NORMALS;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static void initData(ModifierData *md)
|
|
{
|
|
TriangulateModifierData *tmd = (TriangulateModifierData *)md;
|
|
|
|
/* Enable in editmode by default */
|
|
md->mode |= eModifierMode_Editmode;
|
|
tmd->quad_method = MOD_TRIANGULATE_QUAD_SHORTEDGE;
|
|
tmd->ngon_method = MOD_TRIANGULATE_NGON_BEAUTY;
|
|
}
|
|
|
|
|
|
static void copyData(ModifierData *md, ModifierData *target)
|
|
{
|
|
#if 0
|
|
TriangulateModifierData *smd = (TriangulateModifierData *) md;
|
|
TriangulateModifierData *tsmd = (TriangulateModifierData *) target;
|
|
#endif
|
|
modifier_copyData_generic(md, target);
|
|
}
|
|
|
|
static DerivedMesh *applyModifier(ModifierData *md,
|
|
struct Depsgraph *UNUSED(depsgraph),
|
|
Object *UNUSED(ob),
|
|
DerivedMesh *dm,
|
|
ModifierApplyFlag UNUSED(flag))
|
|
{
|
|
TriangulateModifierData *tmd = (TriangulateModifierData *)md;
|
|
DerivedMesh *result;
|
|
if (!(result = triangulate_dm(dm, tmd->quad_method, tmd->ngon_method))) {
|
|
return dm;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
ModifierTypeInfo modifierType_Triangulate = {
|
|
/* name */ "Triangulate",
|
|
/* structName */ "TriangulateModifierData",
|
|
/* structSize */ sizeof(TriangulateModifierData),
|
|
/* type */ eModifierTypeType_Constructive,
|
|
/* flags */ eModifierTypeFlag_AcceptsMesh |
|
|
eModifierTypeFlag_SupportsEditmode |
|
|
eModifierTypeFlag_SupportsMapping |
|
|
eModifierTypeFlag_EnableInEditmode |
|
|
eModifierTypeFlag_AcceptsCVs,
|
|
|
|
/* copyData */ copyData,
|
|
|
|
/* deformVerts_DM */ NULL,
|
|
/* deformMatrices_DM */ NULL,
|
|
/* deformVertsEM_DM */ NULL,
|
|
/* deformMatricesEM_DM*/NULL,
|
|
/* applyModifier_DM */ applyModifier,
|
|
/* applyModifierEM_DM */NULL,
|
|
|
|
/* deformVerts */ NULL,
|
|
/* deformMatrices */ NULL,
|
|
/* deformVertsEM */ NULL,
|
|
/* deformMatricesEM */ NULL,
|
|
/* applyModifier */ NULL,
|
|
/* applyModifierEM */ NULL,
|
|
|
|
/* initData */ initData,
|
|
/* requiredDataMask */ NULL, //requiredDataMask,
|
|
/* freeData */ NULL,
|
|
/* isDisabled */ NULL,
|
|
/* updateDepsgraph */ NULL,
|
|
/* dependsOnTime */ NULL,
|
|
/* dependsOnNormals */ NULL,
|
|
/* foreachObjectLink */ NULL,
|
|
/* foreachIDLink */ NULL,
|
|
};
|