Sergey Sharybin
bac7353801
This commit integrates the work done so far on the new dependency graph system, where goal was to replace legacy depsgraph with the new one, supporting loads of neat features like: - More granular dependency relation nature, which solves issues with fake cycles in the dependencies. - Move towards all-animatable, by better integration of drivers into the system. - Lay down some basis for upcoming copy-on-write, overrides and so on. The new system is living side-by-side with the previous one and disabled by default, so nothing will become suddenly broken. The way to enable new depsgraph is to pass `--new-depsgraph` command line argument. It's a bit early to consider the system production-ready, there are some TODOs and issues were discovered during the merge period, they'll be addressed ASAP. But it's important to merge, because it's the only way to attract artists to really start testing this system. There are number of assorted documents related on the design of the new system: * http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents * http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph There are also some user-related information online: * http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/ * http://code.blender.org/2015/03/more-dependency-graph-tricks/ Kudos to everyone who was involved into the project: - Joshua "Aligorith" Leung -- design specification, initial code - Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes - Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the project and so - Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the issues and recording/writing documentation. - Everyone else who i forgot to mention here :)
128 lines
3.7 KiB
C
128 lines
3.7 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"
|
|
|
|
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);
|
|
|
|
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,
|
|
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 */ NULL,
|
|
/* deformMatrices */ NULL,
|
|
/* deformVertsEM */ NULL,
|
|
/* deformMatricesEM */ NULL,
|
|
/* applyModifier */ applyModifier,
|
|
/* applyModifierEM */ NULL,
|
|
/* initData */ initData,
|
|
/* requiredDataMask */ NULL, //requiredDataMask,
|
|
/* freeData */ NULL,
|
|
/* isDisabled */ NULL,
|
|
/* updateDepgraph */ NULL,
|
|
/* updateDepsgraph */ NULL,
|
|
/* dependsOnTime */ NULL,
|
|
/* dependsOnNormals */ NULL,
|
|
/* foreachObjectLink */ NULL,
|
|
/* foreachIDLink */ NULL,
|
|
};
|