Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Modifiers: ported Laplacian Smooth DerivedMesh → Mesh

Browse Source 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3340
This commit is contained in:
Christian Hubert
2018-05-11 16:40:00 +02:00
committed by Sybren A. Stüvel
parent 625c2c2943
commit 68b736ce24
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source/blender/modifiers/intern/MOD_laplaciansmooth.c
View File

@@ -29,6 +29,7 @@
*/ */
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
@@ -37,8 +38,10 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_deform.h" #include "BKE_deform.h"
#include "BKE_editmesh.h"
#include "BKE_library.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "MOD_util.h" #include "MOD_util.h"
@@ -356,7 +359,7 @@ static void validate_solution(LaplacianSystem *sys, short flag, float lambda, fl
} }
static void laplaciansmoothModifier_do( static void laplaciansmoothModifier_do(
LaplacianSmoothModifierData *smd, Object *ob, DerivedMesh *dm, LaplacianSmoothModifierData *smd, Object *ob, Mesh *mesh,
float (*vertexCos)[3], int numVerts) float (*vertexCos)[3], int numVerts)
{ {
LaplacianSystem *sys; LaplacianSystem *sys;
@@ -366,17 +369,17 @@ static void laplaciansmoothModifier_do(
int i, iter; int i, iter;
int defgrp_index; int defgrp_index;
sys = init_laplacian_system(dm->getNumEdges(dm), dm->getNumPolys(dm), dm->getNumLoops(dm), numVerts); sys = init_laplacian_system(mesh->totedge, mesh->totpoly, mesh->totloop, numVerts);
if (!sys) { if (!sys) {
return; return;
} }
sys->mpoly = dm->getPolyArray(dm); sys->mpoly = mesh->mpoly;
sys->mloop = dm->getLoopArray(dm); sys->mloop = mesh->mloop;
sys->medges = dm->getEdgeArray(dm); sys->medges = mesh->medge;
sys->vertexCos = vertexCos; sys->vertexCos = vertexCos;
sys->min_area = 0.00001f; sys->min_area = 0.00001f;
modifier_get_vgroup(ob, dm, smd->defgrp_name, &dvert, &defgrp_index); modifier_get_vgroup_mesh(ob, mesh, smd->defgrp_name, &dvert, &defgrp_index);
sys->vert_centroid[0] = 0.0f; sys->vert_centroid[0] = 0.0f;
sys->vert_centroid[1] = 0.0f; sys->vert_centroid[1] = 0.0f;
@@ -495,39 +498,39 @@ static CustomDataMask required_data_mask(Object *UNUSED(ob), ModifierData *md)
return dataMask; return dataMask;
} }
static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, DerivedMesh *derivedData, static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh,
float (*vertexCos)[3], int numVerts) float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm; Mesh *mesh_src;
if (numVerts == 0) if (numVerts == 0)
return; return;
dm = get_dm(ctx->object, NULL, derivedData, NULL, false, false); mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false);
laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ctx->object, dm, laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ctx->object, mesh_src,
vertexCos, numVerts); vertexCos, numVerts);
if (dm != derivedData) if (mesh_src != mesh)
dm->release(dm); BKE_id_free(NULL, mesh_src);
} }
static void deformVertsEM( static void deformVertsEM(
ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData, ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData,
DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) Mesh *mesh, float (*vertexCos)[3], int numVerts)
{ {
DerivedMesh *dm; Mesh *mesh_src;
if (numVerts == 0) if (numVerts == 0)
return; return;
dm = get_dm(ctx->object, editData, derivedData, NULL, false, false); mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false);
laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ctx->object, dm, laplaciansmoothModifier_do((LaplacianSmoothModifierData *)md, ctx->object, mesh_src,
vertexCos, numVerts); vertexCos, numVerts);
if (dm != derivedData) if (mesh_src != mesh)
dm->release(dm); BKE_id_free(NULL, mesh_src);
} }
@@ -541,16 +544,16 @@ ModifierTypeInfo modifierType_LaplacianSmooth = {
/* copyData */ modifier_copyData_generic, /* copyData */ modifier_copyData_generic,
/* deformVerts_DM */ deformVerts, /* deformVerts_DM */ NULL,
/* deformMatrices_DM */ NULL, /* deformMatrices_DM */ NULL,
/* deformVertsEM_DM */ deformVertsEM, /* deformVertsEM_DM */ NULL,
/* deformMatricesEM_DM*/NULL, /* deformMatricesEM_DM*/NULL,
/* applyModifier_DM */ NULL, /* applyModifier_DM */ NULL,
/* applyModifierEM_DM */NULL, /* applyModifierEM_DM */NULL,
/* deformVerts */ NULL, /* deformVerts */ deformVerts,
/* deformMatrices */ NULL, /* deformMatrices */ NULL,
/* deformVertsEM */ NULL, /* deformVertsEM */ deformVertsEM,
/* deformMatricesEM */ NULL, /* deformMatricesEM */ NULL,
/* applyModifier */ NULL, /* applyModifier */ NULL,
/* applyModifierEM */ NULL, /* applyModifierEM */ NULL,