griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

made editmesh use mempools, though editmesh customdata does not. this was a major slowdown in bmesh<-> editmesh conversion (even more so then the mf euler, which may not be that bad after all).

Browse Source
This commit is contained in:
Joseph Eagar
2009-03-16 14:52:30 +00:00
parent b1de007e50
commit eb39abdecb
3 changed files with 32 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_editVert.h
View File

@@ -42,6 +42,7 @@
struct DerivedMesh;
struct RetopoPaintData;
struct BLI_mempool;
/* note; changing this also might affect the undo copy in editmesh.c */
typedef struct EditVert
@@ -153,6 +154,8 @@ typedef struct EditMesh
HashEdge *hashedgetab;
/* this is for the editmesh_fastmalloc */
struct BLI_mempool *vertpool, *edgepool, *facepool;
EditVert *allverts, *curvert;
EditEdge *alledges, *curedge;
EditFace *allfaces, *curface;

6
source/blender/bmesh/intern/editmesh_to_bmesh.c
View File

@@ -382,11 +382,15 @@ BMesh *editmesh_to_bmesh_intern(EditMesh *em, BMesh *bm, BMOperator *op) {
/*copy face corner data*/
CustomData_to_bmeshpoly(&em->fdata, &bm->pdata, &bm->ldata);
/*initialize memory pools*/
/*EVIL HACK WARNING: this uses a fixed size for the customdata
blocks, when it should be more smart about it.
initialize customdata memory pools*/
CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
/*needed later*/
numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);

102
source/blender/editors/mesh/editmesh.c
View File

@@ -53,6 +53,7 @@
#include "BLI_editVert.h"
#include "BLI_dynstr.h"
#include "BLI_rand.h"
#include "BLI_mempool.h"
#include "BKE_cloth.h"
#include "BKE_context.h"
@@ -112,22 +113,21 @@ static void error() {}
/* ************ ADD / REMOVE / FIND ****************** */
static void *calloc_em(EditMesh *em, size_t size, size_t nr)
{
return calloc(size, nr);
static void init_editMesh(EditMesh *em) {
if (!em->vertpool) em->vertpool = BLI_mempool_create(sizeof(EditVert), 1, 512);
if (!em->edgepool) em->edgepool = BLI_mempool_create(sizeof(EditEdge), 1, 512);
if (!em->facepool) em->facepool = BLI_mempool_create(sizeof(EditFace), 1, 512);
}
/* used to bypass normal calloc with fast one */
static void *(*callocvert)(EditMesh *, size_t, size_t) = calloc_em;
static void *(*callocedge)(EditMesh *, size_t, size_t) = calloc_em;
static void *(*callocface)(EditMesh *, size_t, size_t) = calloc_em;
EditVert *addvertlist(EditMesh *em, float *vec, EditVert *example)
{
EditVert *eve;
static int hashnr= 0;
if (!em->vertpool) init_editMesh(em);
eve= BLI_mempool_calloc(em->vertpool);
eve= callocvert(em, sizeof(EditVert), 1);
BLI_addtail(&em->verts, eve);
em->totvert++;
@@ -157,8 +157,7 @@ void free_editvert (EditMesh *em, EditVert *eve)
EM_remove_selection(em, eve, EDITVERT);
CustomData_em_free_block(&em->vdata, &eve->data);
if(eve->fast==0)
free(eve);
BLI_mempool_free(em->vertpool, eve);
em->totvert--;
}
@@ -256,11 +255,12 @@ EditEdge *addedgelist(EditMesh *em, EditVert *v1, EditVert *v2, EditEdge *exampl
}
/* find in hashlist */
if (!em->edgepool) init_editMesh(em);
eed= findedgelist(em, v1, v2);
if(eed==NULL) {
eed= (EditEdge *)callocedge(em, sizeof(EditEdge), 1);
eed= (EditEdge *)BLI_mempool_calloc(em->edgepool);
eed->v1= v1;
eed->v2= v2;
BLI_addtail(&em->edges, eed);
@@ -293,9 +293,8 @@ void remedge(EditMesh *em, EditEdge *eed)
void free_editedge(EditMesh *em, EditEdge *eed)
{
EM_remove_selection(em, eed, EDITEDGE);
if(eed->fast==0){
free(eed);
}
BLI_mempool_free(em->edgepool, eed);
}
void free_editface(EditMesh *em, EditFace *efa)
@@ -307,8 +306,7 @@ void free_editface(EditMesh *em, EditFace *efa)
}
CustomData_em_free_block(&em->fdata, &efa->data);
if(efa->fast==0)
free(efa);
BLI_mempool_free(em->facepool, efa);
em->totface--;
}
@@ -384,7 +382,9 @@ EditFace *addfacelist(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, Ed
if(v1==v2 || v2==v3 || v1==v3) return NULL;
if(e2==0) return NULL;
efa= (EditFace *)callocface(em, sizeof(EditFace), 1);
if (!em->facepool) init_editMesh(em);
efa= (EditFace *)BLI_mempool_calloc(em->facepool);
efa->v1= v1;
efa->v2= v2;
efa->v3= v3;
@@ -467,57 +467,6 @@ int editface_containsEdge(EditFace *efa, EditEdge *eed)
/* ************************ stuct EditMesh manipulation ***************************** */
/* fake callocs for fastmalloc below */
static void *calloc_fastvert(EditMesh *em, size_t size, size_t nr)
{
EditVert *eve= em->curvert++;
eve->fast= 1;
return eve;
}
static void *calloc_fastedge(EditMesh *em, size_t size, size_t nr)
{
EditEdge *eed= em->curedge++;
eed->fast= 1;
return eed;
}
static void *calloc_fastface(EditMesh *em, size_t size, size_t nr)
{
EditFace *efa= em->curface++;
efa->fast= 1;
return efa;
}
/* allocate 1 chunk for all vertices, edges, faces. These get tagged to
prevent it from being freed
*/
static void init_editmesh_fastmalloc(EditMesh *em, int totvert, int totedge, int totface)
{
if(totvert) em->allverts= MEM_callocN(totvert*sizeof(EditVert), "allverts");
else em->allverts= NULL;
em->curvert= em->allverts;
if(totedge==0) totedge= 4*totface; // max possible
if(totedge) em->alledges= MEM_callocN(totedge*sizeof(EditEdge), "alledges");
else em->alledges= NULL;
em->curedge= em->alledges;
if(totface) em->allfaces= MEM_callocN(totface*sizeof(EditFace), "allfaces");
else em->allfaces= NULL;
em->curface= em->allfaces;
callocvert= calloc_fastvert;
callocedge= calloc_fastedge;
callocface= calloc_fastface;
}
static void end_editmesh_fastmalloc(void)
{
callocvert= calloc_em;
callocedge= calloc_em;
callocface= calloc_em;
}
void set_editMesh(EditMesh *dst, EditMesh *src)
{
free_editMesh(dst);
@@ -533,7 +482,12 @@ void free_editMesh(EditMesh *em)
if(em->edges.first) free_edgelist(em, &em->edges);
if(em->faces.first) free_facelist(em, &em->faces);
if(em->selected.first) BLI_freelistN(&(em->selected));
if (em->vertpool) BLI_mempool_destroy(em->vertpool);
if (em->edgepool) BLI_mempool_destroy(em->edgepool);
if (em->facepool) BLI_mempool_destroy(em->facepool);
em->vertpool = em->edgepool = em->facepool = NULL;
CustomData_free(&em->vdata, 0);
CustomData_free(&em->fdata, 0);
@@ -857,9 +811,6 @@ void make_editMesh(Scene *scene, Object *ob)
return;
}
/* initialize fastmalloc for editmesh */
init_editmesh_fastmalloc(em, me->totvert, me->totedge, me->totface);
actkey = ob_get_keyblock(ob);
if(actkey) {
tot= actkey->totelem;
@@ -985,8 +936,6 @@ void make_editMesh(Scene *scene, Object *ob)
error("This Mesh has old style edgecodes, please put it in the bugtracker!");
MEM_freeN(evlist);
end_editmesh_fastmalloc(); // resets global function pointers
if(me->mselect){
//restore editselections
@@ -1822,8 +1771,6 @@ static void undoMesh_to_editMesh(void *umv, void *emv)
memset(em, 0, sizeof(EditMesh));
em->selectmode = um->selectmode;
init_editmesh_fastmalloc(em, um->totvert, um->totedge, um->totface);
CustomData_free(&em->vdata, 0);
CustomData_free(&em->edata, 0);
@@ -1881,7 +1828,6 @@ static void undoMesh_to_editMesh(void *umv, void *emv)
CustomData_to_em_block(&um->fdata, &em->fdata, a, &efa->data);
}
end_editmesh_fastmalloc();
if(evar) MEM_freeN(evar);
em->totvert = um->totvert;