Revision: 21642
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21642
Author: joeedh
Date: 2009-07-17 02:32:19 +0200 (Fri, 17 Jul 2009)
Log Message:
-----------
mirror modifier is now feature-complete, though not all features can be tested
at the moment. also cleaned up some of the memory leaks.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
Added Paths:
-----------
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
2009-07-17 00:17:37 UTC (rev 21641)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -2629,18 +2629,17 @@
for(; source; source = source->next) {
if(node) {
node->next = MEM_mallocN(sizeof(*node->next),
"nlink_copy");
-
node = node->next;
-} else {
-
node = *target = MEM_mallocN(sizeof(**target), "nlink_copy");
+ node = node->next;
+ } else {
+ node = *target = MEM_mallocN(sizeof(**target),
"nlink_copy");
+ } node->link = source->link;
+ node->next = NULL;
+ }
}
-
node->link = source->link;
-
node->next = NULL;
-}
-}
#endif
-
/* appends source to target if it's not already in target */
-
static void linklist_append_unique(LinkNode **target, void *source)
+/* appends source to target if it's not already in target */
+static void linklist_append_unique(LinkNode **target, void *source)
{
LinkNode *node;
LinkNode *prev = NULL;
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2009-07-17 00:17:37 UTC (rev 21641)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -113,8 +113,8 @@
int allocsize[4] = {512, 512, 2048, 512};
BMesh *bm, bmold; /*bmold is for storing old customdata layout*/
BMEditMesh *em = existing;
- MVert *mv;
- MEdge *me;
+ MVert *mv, *mvert;
+ MEdge *me, *medge;
DMFaceIter *dfiter;
DMLoopIter *dliter;
BMVert *v, **vtable, **verts=NULL;
@@ -150,7 +150,7 @@
etable = MEM_callocN(sizeof(void**)*totedge, "edge table in BMDM_Copy");
/*do verts*/
- mv = dm->dupVertArray(dm);
+ mv = mvert = dm->dupVertArray(dm);
for (i=0; i<totvert; i++, mv++) {
v = BM_Make_Vert(bm, mv->co, NULL);
@@ -161,9 +161,10 @@
CustomData_to_bmesh_block(&dm->vertData, &bm->vdata, i,
&v->head.data);
vtable[i] = v;
}
+ MEM_freeN(mvert);
/*do edges*/
- me = dm->dupEdgeArray(dm);
+ me = medge = dm->dupEdgeArray(dm);
for (i=0; i<totedge; i++, me++) {
e = BM_Make_Edge(bm, vtable[me->v1], vtable[me->v2], NULL, 0);
@@ -174,6 +175,7 @@
CustomData_to_bmesh_block(&dm->edgeData, &bm->edata, i,
&e->head.data);
etable[i] = e;
}
+ MEM_freeN(medge);
k = 0;
dfiter = dm->newFaceIter(dm);
@@ -208,10 +210,15 @@
CustomData_to_bmesh_block(&dm->polyData, &bm->pdata,
dfiter->index, &f->head.data);
}
+
+ dfiter->free(dfiter);
MEM_freeN(vtable);
MEM_freeN(etable);
+ V_FREE(verts);
+ V_FREE(edges);
+
if (!em) em = BMEdit_Create(bm);
else BMEdit_RecalcTesselation(em);
@@ -500,6 +507,7 @@
}
/* Mirror */
+#define VERT_NEW 1
DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
Object *ob,
@@ -507,20 +515,18 @@
int initFlags,
int axis)
{
- int i;
float tolerance = mmd->tolerance;
DerivedMesh *result, *cddm;
BMEditMesh *em;
BMesh *bm;
- int numVerts, numEdges, numFaces;
- int maxVerts = dm->getNumVerts(dm);
- int maxEdges = dm->getNumEdges(dm);
- int maxFaces = dm->getNumTessFaces(dm);
- int vector_size=0, j, a, b;
+ BMOIter siter1, siter2;
+ BMOperator op;
+ BMVert *v1, *v2;
+ int vector_size=0, a, b;
bDeformGroup *def, *defb;
bDeformGroup **vector_def = NULL;
- int (*indexMap)[2];
float mtx[4][4], imtx[4][4];
+ int i, j;
cddm = CDDM_copy(dm);
em = CDDM_To_BMesh(dm, NULL);
@@ -531,10 +537,6 @@
/*convienence variable*/
bm = em->bm;
- numVerts = numEdges = numFaces = 0;
- indexMap = MEM_mallocN(sizeof(*indexMap) * maxVerts, "indexmap");
- result = CDDM_from_template(dm, maxVerts * 2, maxEdges * 2, maxFaces *
2, 0, 0);
-
if (mmd->flag & MOD_MIR_VGROUP) {
/* calculate the number of deformedGroups */
for(vector_size = 0, def = ob->defbase.first; def;
@@ -555,14 +557,57 @@
Mat4Invert(obinv, mmd->mirror_ob->obmat);
Mat4MulMat4(mtx, ob->obmat, obinv);
Mat4Invert(imtx, mtx);
+ } else {
+ Mat4One(mtx);
+ mtx[axis][axis] = -1;
+ Mat4Invert(imtx, mtx);
}
+ BMO_InitOpf(bm, &op, "mirror geom=%avef mat=%m4 mergedist=%f axis=%d",
+ mtx, mmd->tolerance, axis);
+
+ BMO_Exec_Op(bm, &op);
+
+ /*handle vgroup stuff*/
+ if (mmd->flag & MOD_MIR_VGROUP) {
+ BMO_ITER(v1, &siter1, bm, &op, "newout", BM_VERT) {
+ MDeformVert *dvert = CustomData_bmesh_get(&bm->vdata,
v1->head.data, CD_MDEFORMVERT);
+
+ if (dvert) {
+ for(j = 0; j < dvert[0].totweight; ++j) {
+ char tmpname[32];
+
+ if(dvert->dw[j].def_nr < 0 ||
+ dvert->dw[j].def_nr >= vector_size)
+ continue;
+
+ def = vector_def[dvert->dw[j].def_nr];
+ strcpy(tmpname, def->name);
+ vertgroup_flip_name(tmpname,0);
+
+ for(b = 0, defb = ob->defbase.first;
defb;
+ defb = defb->next, b++)
+ {
+ if(!strcmp(defb->name, tmpname))
+ {
+ dvert->dw[j].def_nr = b;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ BMO_Finish_Op(bm, &op);
-
BMEdit_RecalcTesselation(em);
result = CDDM_from_BMEditMesh(em, NULL);
BMEdit_Free(em);
+ MEM_freeN(em);
+ if (vector_def) MEM_freeN(vector_def);
+
return result;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2009-07-17 00:17:37 UTC (rev 21641)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -160,6 +160,10 @@
/*destroy flag pool*/
BLI_mempool_destroy(bm->flagpool);
+ if (bm->edar) MEM_freeN(bm->edar);
+ if (bm->vtar) MEM_freeN(bm->vtar);
+ if (bm->plar) MEM_freeN(bm->plar);
+
BMO_ClearStack(bm);
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
2009-07-17 00:17:37 UTC (rev 21641)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -1,11 +1,27 @@
#include "bmesh.h"
#include "bmesh_private.h"
-
#include <stdio.h>
/*do not rename any operator or slot names! otherwise you must go
through the code and find all references to them!*/
+
+BMOpDefine def_mirror = {
+ "mirror",
+ /*maps welded vertices to verts they should weld to.*/
+ {{BMOP_OPSLOT_ELEMENT_BUF, "geom"},
+ //list of verts to keep
+ {BMOP_OPSLOT_MAT, "mat"}, //matrix defining the mirror transformation
+ {BMOP_OPSLOT_FLT, "mergedist"}, //does no merging if mergedist is 0
+ {BMOP_OPSLOT_ELEMENT_BUF, "newout"},
+ {BMOP_OPSLOT_INT, "axis"},
+ {BMOP_OPSLOT_INT, "mirror_u"},
+ {BMOP_OPSLOT_INT, "mirror_v"},
+ {0, /*null-terminating sentinel*/}},
+ bmesh_mirror_exec,
+ 0,
+};
+
BMOpDefine def_finddoubles = {
"finddoubles",
/*maps welded vertices to verts they should weld to.*/
@@ -319,6 +335,7 @@
&def_weldverts,
&def_removedoubles,
&def_finddoubles,
+ &def_mirror,
};
int bmesh_total_ops = (sizeof(opdefines) / sizeof(void*));
Modified:
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
===================================================================
---
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
2009-07-17 00:17:37 UTC (rev 21641)
+++
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
2009-07-17 00:32:19 UTC (rev 21642)
@@ -34,5 +34,6 @@
void bmesh_weldverts_exec(BMesh *bm, BMOperator *op);
void bmesh_removedoubles_exec(BMesh *bm, BMOperator *op);
void bmesh_finddoubles_exec(BMesh *bm, BMOperator *op);
+void bmesh_mirror_exec(BMesh *bm, BMOperator *op);
#endif
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2009-07-17 00:17:37 UTC (rev 21641)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -142,6 +142,8 @@
/*Copy Custom Data*/
CustomData_to_bmesh_block(&me->pdata, &bm->pdata, i,
&f->head.data);
}
+
+ V_FREE(fedges);
}
void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) {
Added: branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
(rev 0)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
2009-07-17 00:32:19 UTC (rev 21642)
@@ -0,0 +1,118 @@
+#include "MEM_guardedalloc.h"
+#include "BKE_customdata.h"
+#include "DNA_listBase.h"
+#include "DNA_customdata_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include <string.h>
+#include "BKE_utildefines.h"
+#include "BKE_mesh.h"
+#include "BKE_global.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_cdderivedmesh.h"
+
+#include "BLI_editVert.h"
+#include "mesh_intern.h"
+#include "ED_mesh.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_edgehash.h"
+
+#include "bmesh.h"
+
+/*
+ * MIRROR.C
+ *
+ * mirror bmop.
+ *
+*/
+
+#define ELE_NEW 1
+
+void bmesh_mirror_exec(BMesh *bm, BMOperator *op) {
+ BMOperator dupeop, weldop;
+ BMOIter siter;
+ BMIter iter;
+ BMVert *v, *v2, **vmap = NULL;
+ V_DECLARE(vmap);
+ BMEdge *e, **emap = NULL;
+ V_DECLARE(emap);
+ float mtx[4][4];
+ float imtx[4][4];
+ float dist = BMO_Get_Float(op, "mergedist");
+ int i, ototvert, ototedge, axis = BMO_Get_Int(op, "axis");
+ int mirroru = BMO_Get_Int(op, "mirror_u");
+ int mirrorv = BMO_Get_Int(op, "mirror_v");
+
+ ototvert = bm->totvert;
+ ototedge = bm->totedge;
+
+ BMO_Get_Mat4(op, "mat", mtx);
+ Mat4Invert(imtx, mtx);
+
+ BMO_InitOpf(bm, &dupeop, "dupe geom=%s", op, "geom");
+ BMO_Exec_Op(bm, &dupeop);
+
+ BMO_Flag_Buffer(bm, &dupeop, "newout", ELE_NEW);
+
+ /*create old -> new mapping*/
+ i = 0;
+ v2 = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL);
+ BMO_ITER(v, &siter, bm, &dupeop, "newout", BM_VERT) {
+ V_GROW(vmap);
+ vmap[i] = v;
+
+ BMINDEX_SET(v2, i);
+ v2 = BMIter_Step(&iter);
+
+ i += 1;
+ }
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
