[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21927] branches/bmesh/blender/source/ blender: replaced use of bmesh tesselator with scanfill when leaving edtmode and generating the mface tesselation data .
Joseph Eagar
joeedh at gmail.com
Sun Jul 26 15:12:55 CEST 2009
Revision: 21927
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21927
Author: joeedh
Date: 2009-07-26 15:12:55 +0200 (Sun, 26 Jul 2009)
Log Message:
-----------
replaced use of bmesh tesselator with scanfill when leaving edtmode and generating the mface tesselation data. also fixed a normals problem.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2009-07-26 13:10:29 UTC (rev 21926)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c 2009-07-26 13:12:55 UTC (rev 21927)
@@ -134,84 +134,64 @@
f = BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL);
for ( ; f; f=BMIter_Step(&iter)) {
+ EditVert *v, *lastv=NULL, *firstv=NULL;
+ EditEdge *e;
+ EditFace *efa;
+
/*don't consider two-edged faces*/
if (f->len < 3) continue;
- if (f->len <= 4) {
- /*triangle fan for quads. should be recoded to
- just add one tri for tris, and two for quads,
- but this code works for now too.*/
- l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- for (; l; l=BMIter_Step(&liter)) {
- if (l == f->loopbase) continue;
- if ((BMLoop*)l->head.next == f->loopbase) continue;
+ /*scanfill time*/
+ l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
+ for (j=0; l; l=BMIter_Step(&liter), j++) {
+ /*mark order*/
+ l->head.eflag2 = j;
- V_GROW(looptris);
- V_GROW(looptris);
- V_GROW(looptris);
-
- looptris[i*3] = l;
- looptris[i*3+1] = (BMLoop*)l->head.next;
- looptris[i*3+2] = f->loopbase;
-
- i += 1;
+ v = BLI_addfillvert(l->v->co);
+ v->tmp.p = l;
+
+ if (lastv) {
+ e = BLI_addfilledge(lastv, v);
}
- } else {
- /*scanfill time*/
- EditVert *v, *lastv=NULL, *firstv=NULL;
- EditEdge *e;
- EditFace *efa;
- l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
- for (j=0; l; l=BMIter_Step(&liter), j++) {
- /*mark order*/
- l->head.eflag2 = j;
+ lastv = v;
+ if (firstv==NULL) firstv = v;
+ }
- v = BLI_addfillvert(l->v->co);
- v->tmp.p = l;
-
- if (lastv) {
- e = BLI_addfilledge(lastv, v);
- }
+ /*complete the loop*/
+ BLI_addfilledge(firstv, v);
- lastv = v;
- if (firstv==NULL) firstv = v;
- }
+ BLI_edgefill(0, 0);
+
+ for (efa = fillfacebase.first; efa; efa=efa->next) {
+ BMLoop *l1, *l2, *l3;
- /*complete the loop*/
- BLI_addfilledge(firstv, v);
-
- BLI_edgefill(0, 0);
+ V_GROW(looptris);
+ V_GROW(looptris);
+ V_GROW(looptris);
- for (efa = fillfacebase.first; efa; efa=efa->next) {
- BMLoop *l1, *l2, *l3;
-
- V_GROW(looptris);
- V_GROW(looptris);
- V_GROW(looptris);
-
- looptris[i*3] = l1 = efa->v1->tmp.p;
- looptris[i*3+1] = l2 = efa->v2->tmp.p;
- looptris[i*3+2] = l3 = efa->v3->tmp.p;
-
- if (l1->head.eflag2 > l2->head.eflag2) {
- SWAP(BMLoop*, l1, l2);
- }
- if (l2->head.eflag2 > l3->head.eflag2) {
- SWAP(BMLoop*, l2, l3);
- }
- if (l1->head.eflag2 > l2->head.eflag2) {
- SWAP(BMLoop*, l1, l2);
- }
-
- looptris[i*3] = l1;
- looptris[i*3+1] = l2;
- looptris[i*3+2] = l3;
-
- i += 1;
+ looptris[i*3] = l1 = efa->v1->tmp.p;
+ looptris[i*3+1] = l2 = efa->v2->tmp.p;
+ looptris[i*3+2] = l3 = efa->v3->tmp.p;
+
+ if (l1->head.eflag2 > l2->head.eflag2) {
+ SWAP(BMLoop*, l1, l2);
}
- BLI_end_edgefill();
+ if (l2->head.eflag2 > l3->head.eflag2) {
+ SWAP(BMLoop*, l2, l3);
+ }
+ if (l1->head.eflag2 > l2->head.eflag2) {
+ SWAP(BMLoop*, l1, l2);
+ }
+
+ looptris[i*3] = l1;
+ looptris[i*3+1] = l2;
+ looptris[i*3+2] = l3;
+
+ i += 1;
}
+
+ BLI_end_edgefill();
}
tm->tottri = i;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2009-07-26 13:10:29 UTC (rev 21926)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2009-07-26 13:12:55 UTC (rev 21927)
@@ -196,6 +196,7 @@
f = BM_Make_Ngon(bm, verts[0], verts[1], edges, dfiter->len, 0);
f->head.flag = MEFlags_To_BMFlags(dfiter->flags, BM_FACE);
+ f->mat_nr = dfiter->mat_nr;
if (!f)
continue;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2009-07-26 13:10:29 UTC (rev 21926)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2009-07-26 13:12:55 UTC (rev 21927)
@@ -51,6 +51,7 @@
#include "BKE_multires.h"
#include "BKE_scene.h"
#include "BKE_subsurf.h"
+#include "BKE_tessmesh.h"
#include "BLI_blenlib.h"
#include "BLI_editVert.h"
@@ -508,11 +509,12 @@
}
if (!wtable->weight_table[faceLen].valid) {
- /*ok, need to calculate weights here*/
wtable->weight_table[faceLen].weight =
MEM_callocN(sizeof(FaceVertWeight)*gridFaces*gridFaces,
"vert face weight");
wtable->weight_table[faceLen].valid = 1;
+
+ /*ok, need to calculate weights here*/
}
return wtable->weight_table[faceLen].weight;
@@ -829,9 +831,9 @@
mat_nr = origMFace.mat_nr;
flag = origMFace.flag;
} else {
- EditFace *ef = ccgSubSurf_getFaceFaceHandle(ss, f);
+ BMFace *ef = ccgSubSurf_getFaceFaceHandle(ss, f);
mat_nr = ef->mat_nr;
- flag = ef->flag;
+ flag = BMFlags_To_MEFlags(ef);
}
for(S = 0; S < numVerts; S++) {
@@ -849,7 +851,7 @@
edgeSize, gridSize);
mf->mat_nr = mat_nr;
mf->flag = flag;
-#if 0 //BMESH_TODO
+#if 1 //BMESH_TODO
if(dm) {
int prevS = (S - 1 + numVerts) % numVerts;
int nextS = (S + 1) % numVerts;
@@ -862,7 +864,7 @@
w[j][nextS] = (*weight)[j][2];
w[j][otherS] = (*weight)[j][3];
}
-
+
DM_interp_tessface_data(dm, result, &faceIdx, NULL,
&w, 1, i);
weight++;
@@ -2650,7 +2652,7 @@
for(x = 1; x < gridFaces; x++) {
float w[4];
-#if 0 //BMESH_TODO
+#if 1 //BMESH_TODO
w[prevS] = weight[x][0][0];
w[S] = weight[x][0][1];
w[nextS] = weight[x][0][2];
@@ -2671,7 +2673,7 @@
for(y = 1; y < gridFaces; y++) {
for(x = 1; x < gridFaces; x++) {
float w[4];
-#if 0 //BMESH_TODO
+#if 1 //BMESH_TODO
w[prevS] = weight[y * gridFaces + x][0][0];
w[S] = weight[y * gridFaces + x][0][1];
w[nextS] = weight[y * gridFaces + x][0][2];
@@ -2702,7 +2704,7 @@
FaceVertWeight w;
int j;
-#if 0 //BMESH_TODO
+#if 1 //BMESH_TODO
for(j = 0; j < 4; ++j) {
w[j][prevS] = (*weight)[j][0];
w[j][S] = (*weight)[j][1];
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2009-07-26 13:10:29 UTC (rev 21926)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2009-07-26 13:12:55 UTC (rev 21927)
@@ -1,26 +1,29 @@
+#include <string.h>
#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_customdata.h"
#include "BKE_utildefines.h"
#include "BKE_mesh.h"
#include "BKE_global.h"
#include "BKE_DerivedMesh.h"
#include "BKE_cdderivedmesh.h"
+#include "BLI_blenlib.h"
+#include "BLI_edgehash.h"
#include "BLI_editVert.h"
-#include "mesh_intern.h"
+#include "BLI_scanfill.h"
+
#include "ED_mesh.h"
-#include "BLI_blenlib.h"
-#include "BLI_edgehash.h"
-
+#include "mesh_intern.h"
#include "bmesh.h"
/*
@@ -147,8 +150,52 @@
V_FREE(fedges);
}
+
+static void loops_to_corners(BMesh *bm, Mesh *me, int findex,
+ BMFace *f, BMLoop *ls[3], int numTex, int numCol)
+{
+ BMLoop *l;
+ MTFace *texface;
+ MTexPoly *texpoly;
+ MCol *mcol;
+ MLoopCol *mloopcol;
+ MLoopUV *mloopuv;
+ int i, j;
+
+ for(i=0; i < numTex; i++){
+ texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
+ texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data, CD_MTEXPOLY, i);
+
+ texface->tpage = texpoly->tpage;
+ texface->flag = texpoly->flag;
+ texface->transp = texpoly->transp;
+ texface->mode = texpoly->mode;
+ texface->tile = texpoly->tile;
+ texface->unwrap = texpoly->unwrap;
+
+ for (j=0; j<3; j++) {
+ l = ls[j];
+ mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->head.data, CD_MLOOPUV, i);
+ texface->uv[j][0] = mloopuv->uv[0];
+ texface->uv[j][1] = mloopuv->uv[1];
+ }
+ }
+
+ for(i=0; i < numCol; i++){
+ mcol = CustomData_get_n(&me->fdata, CD_MCOL, findex, i);
+
+ for (j=0; j<3; j++) {
+ l = ls[j];
+ mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->head.data, CD_MLOOPCOL, i);
+ mcol[j].r = mloopcol->r;
+ mcol[j].g = mloopcol->g;
+ mcol[j].b = mloopcol->b;
+ mcol[j].a = mloopcol->a;
+ }
+ }
+}
+
void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) {
- BMesh *bmtess;
Object *ob = BMO_Get_Pnt(op, "object");
Scene *scene = BMO_Get_Pnt(op, "scene");
Mesh *me = ob->data;
@@ -162,14 +209,11 @@
BMLoop *l;
BMFace *f;
BMIter iter, liter;
- int i, j, ototvert, totloop, numTex, numCol;
+ int i, j, ototvert, totloop, totface, numTex, numCol;
numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
- bmtess = BM_Copy_Mesh(bm);
- BMO_CallOpf(bmtess, "makefgon trifan=%i", 0);
-
/* new Vertex block */
if(bm->totvert==0) mvert= NULL;
else mvert= MEM_callocN(bm->totvert*sizeof(MVert), "loadeditbMesh vert");
@@ -178,10 +222,6 @@
if(bm->totedge==0) medge= NULL;
else medge= MEM_callocN(bm->totedge*sizeof(MEdge), "loadeditbMesh edge");
- /* new Face block */
- if(bmtess->totface==0) mface= NULL;
- else mface= MEM_callocN(bmtess->totface*sizeof(MFace), "loadeditbMesh face");
-
/*build ngon data*/
/* new Ngon Face block */
if(bm->totface==0) mpoly = NULL;
@@ -213,7 +253,6 @@
/* add new custom data */
me->totvert= bm->totvert;
me->totedge= bm->totedge;
- me->totface= bmtess->totface;
me->totloop= totloop;
me->totpoly= bm->totface;
@@ -224,22 +263,18 @@
CustomData_add_layer(&me->vdata, CD_MVERT, CD_ASSIGN, mvert, me->totvert);
CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, medge, me->totedge);
- CustomData_add_layer(&me->fdata, CD_MFACE, CD_ASSIGN, mface, me->totface);
CustomData_add_layer(&me->ldata, CD_MLOOP, CD_ASSIGN, mloop, me->totloop);
CustomData_add_layer(&me->pdata, CD_MPOLY, CD_ASSIGN, mpoly, me->totpoly);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list