[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43897] branches/bmesh/blender/source/ blender/blenkernel/intern/subsurf_ccg.c: sync with trunk
Campbell Barton
ideasman42 at gmail.com
Sun Feb 5 09:18:48 CET 2012
Revision: 43897
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43897
Author: campbellbarton
Date: 2012-02-05 08:18:34 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
sync with trunk
- renamed vars
- calloc --> malloc
- remove some redundant code
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-05 07:44:40 UTC (rev 43896)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-05 08:18:34 UTC (rev 43897)
@@ -549,7 +549,7 @@
mp = mpoly;
index = DM_get_poly_data_layer(dm, CD_ORIGINDEX);
for (i=0; i<dm->numPolyData; i++, mp++) {
- CCGFace *f=NULL;
+ CCGFace *f;
BLI_array_empty(fVerts);
@@ -598,9 +598,9 @@
return ((int*) ccgSubSurf_getFaceUserData(ss, f))[1];
}
-static void cgdm_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3]) {
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+static void ccgDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3]) {
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
CCGVertIterator *vi = ccgSubSurf_getVertIterator(ss);
CCGEdgeIterator *ei = ccgSubSurf_getEdgeIterator(ss);
CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
@@ -642,38 +642,38 @@
ccgEdgeIterator_free(ei);
ccgVertIterator_free(vi);
}
-static int cgdm_getNumVerts(DerivedMesh *dm) {
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
+static int ccgDM_getNumVerts(DerivedMesh *dm) {
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
- return ccgSubSurf_getNumFinalVerts(cgdm->ss);
+ return ccgSubSurf_getNumFinalVerts(ccgdm->ss);
}
-static int cgdm_getNumEdges(DerivedMesh *dm) {
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
+static int ccgDM_getNumEdges(DerivedMesh *dm) {
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
- return ccgSubSurf_getNumFinalEdges(cgdm->ss);
+ return ccgSubSurf_getNumFinalEdges(ccgdm->ss);
}
-static int cgdm_getNumTessFaces(DerivedMesh *dm) {
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
+static int ccgDM_getNumTessFaces(DerivedMesh *dm) {
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
- return ccgSubSurf_getNumFinalFaces(cgdm->ss);
+ return ccgSubSurf_getNumFinalFaces(ccgdm->ss);
}
-static int cgdm_getNumLoops(DerivedMesh *dm) {
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
+static int ccgDM_getNumLoops(DerivedMesh *dm) {
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
/* All subsurf faces are quads */
- return 4 * ccgSubSurf_getNumFinalFaces(cgdm->ss);
+ return 4 * ccgSubSurf_getNumFinalFaces(ccgdm->ss);
}
static void ccgDM_getFinalVert(DerivedMesh *dm, int vertNum, MVert *mv)
{
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
DMGridData *vd;
int i;
memset(mv, 0, sizeof(*mv));
- if((vertNum < cgdm->edgeMap[0].startVert) && (ccgSubSurf_getNumFaces(ss) > 0)) {
+ if((vertNum < ccgdm->edgeMap[0].startVert) && (ccgSubSurf_getNumFaces(ss) > 0)) {
/* this vert comes from face data */
int lastface = ccgSubSurf_getNumFaces(ss) - 1;
CCGFace *f;
@@ -686,10 +686,10 @@
int gridInternalEnd;
i = 0;
- while(i < lastface && vertNum >= cgdm->faceMap[i + 1].startVert)
+ while(i < lastface && vertNum >= ccgdm->faceMap[i + 1].startVert)
++i;
- f = cgdm->faceMap[i].face;
+ f = ccgdm->faceMap[i].face;
numVerts = ccgSubSurf_getFaceNumVerts(f);
gridSideVerts = gridSize - 2;
@@ -698,7 +698,7 @@
gridSideEnd = 1 + numVerts * gridSideVerts;
gridInternalEnd = gridSideEnd + numVerts * gridInternalVerts;
- offset = vertNum - cgdm->faceMap[i].startVert;
+ offset = vertNum - ccgdm->faceMap[i].startVert;
if(offset < 1) {
vd = ccgSubSurf_getFaceCenterData(f);
copy_v3_v3(mv->co, vd->co);
@@ -720,28 +720,28 @@
copy_v3_v3(mv->co, vd->co);
normal_float_to_short_v3(mv->no, vd->no);
}
- } else if((vertNum < cgdm->vertMap[0].startVert) && (ccgSubSurf_getNumEdges(ss) > 0)) {
+ } else if((vertNum < ccgdm->vertMap[0].startVert) && (ccgSubSurf_getNumEdges(ss) > 0)) {
/* this vert comes from edge data */
CCGEdge *e;
int lastedge = ccgSubSurf_getNumEdges(ss) - 1;
int x;
i = 0;
- while(i < lastedge && vertNum >= cgdm->edgeMap[i + 1].startVert)
+ while(i < lastedge && vertNum >= ccgdm->edgeMap[i + 1].startVert)
++i;
- e = cgdm->edgeMap[i].edge;
+ e = ccgdm->edgeMap[i].edge;
- x = vertNum - cgdm->edgeMap[i].startVert + 1;
+ x = vertNum - ccgdm->edgeMap[i].startVert + 1;
vd = ccgSubSurf_getEdgeData(ss, e, x);
copy_v3_v3(mv->co, vd->co);
normal_float_to_short_v3(mv->no, vd->no);
} else {
/* this vert comes from vert data */
CCGVert *v;
- i = vertNum - cgdm->vertMap[0].startVert;
+ i = vertNum - ccgdm->vertMap[0].startVert;
- v = cgdm->vertMap[i].vert;
+ v = ccgdm->vertMap[i].vert;
vd = ccgSubSurf_getVertData(ss, v);
copy_v3_v3(mv->co, vd->co);
normal_float_to_short_v3(mv->no, vd->no);
@@ -766,13 +766,13 @@
static void ccgDM_getFinalEdge(DerivedMesh *dm, int edgeNum, MEdge *med)
{
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
int i;
memset(med, 0, sizeof(*med));
- if(edgeNum < cgdm->edgeMap[0].startEdge) {
+ if(edgeNum < ccgdm->edgeMap[0].startEdge) {
/* this edge comes from face data */
int lastface = ccgSubSurf_getNumFaces(ss) - 1;
CCGFace *f;
@@ -790,9 +790,9 @@
lasti = 0;
while (1) {
previ = i;
- if (cgdm->faceMap[i].startEdge >= edgeNum) {
+ if (ccgdm->faceMap[i].startEdge >= edgeNum) {
i -= fabsf(i-lasti)/2.0f;
- } else if (cgdm->faceMap[i].startEdge < edgeNum) {
+ } else if (ccgdm->faceMap[i].startEdge < edgeNum) {
i += fabsf(i-lasti)/2.0f;
} else {
break;
@@ -819,16 +819,16 @@
#endif
i = 0;
- while(i < lastface && edgeNum >= cgdm->faceMap[i + 1].startEdge)
+ while(i < lastface && edgeNum >= ccgdm->faceMap[i + 1].startEdge)
++i;
- f = cgdm->faceMap[i].face;
+ f = ccgdm->faceMap[i].face;
/* numVerts = ccgSubSurf_getFaceNumVerts(f); */ /*UNUSED*/
gridSideEdges = gridSize - 1;
gridInternalEdges = (gridSideEdges - 1) * gridSideEdges * 2;
- offset = edgeNum - cgdm->faceMap[i].startEdge;
+ offset = edgeNum - ccgdm->faceMap[i].startEdge;
grid = offset / (gridSideEdges + gridInternalEdges);
offset %= (gridSideEdges + gridInternalEdges);
@@ -856,18 +856,18 @@
short *edgeFlag;
unsigned int flags = 0;
- i = (edgeNum - cgdm->edgeMap[0].startEdge) / (edgeSize - 1);
+ i = (edgeNum - ccgdm->edgeMap[0].startEdge) / (edgeSize - 1);
- e = cgdm->edgeMap[i].edge;
+ e = ccgdm->edgeMap[i].edge;
if(!ccgSubSurf_getEdgeNumFaces(e)) flags |= ME_LOOSEEDGE;
- x = edgeNum - cgdm->edgeMap[i].startEdge;
+ x = edgeNum - ccgdm->edgeMap[i].startEdge;
med->v1 = getEdgeIndex(ss, e, x, edgeSize);
med->v2 = getEdgeIndex(ss, e, x+1, edgeSize);
- edgeFlag = (cgdm->edgeFlags)? &cgdm->edgeFlags[i]: NULL;
+ edgeFlag = (ccgdm->edgeFlags)? &ccgdm->edgeFlags[i]: NULL;
if(edgeFlag)
flags |= (*edgeFlag & (ME_SEAM | ME_SHARP))
| ME_EDGEDRAW | ME_EDGERENDER;
@@ -880,8 +880,8 @@
static void ccgDM_getFinalFace(DerivedMesh *dm, int faceNum, MFace *mf)
{
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
int gridSize = ccgSubSurf_getGridSize(ss);
int edgeSize = ccgSubSurf_getEdgeSize(ss);
int gridSideEdges = gridSize - 1;
@@ -893,18 +893,18 @@
int grid;
int x, y;
/*int lastface = ccgSubSurf_getNumFaces(ss) - 1;*/ /*UNUSED*/
- char *faceFlags = cgdm->faceFlags;
+ char *faceFlags = ccgdm->faceFlags;
memset(mf, 0, sizeof(*mf));
- if (faceNum >= cgdm->dm.numTessFaceData)
+ if (faceNum >= ccgdm->dm.numTessFaceData)
return;
- i = cgdm->reverseFaceMap[faceNum];
+ i = ccgdm->reverseFaceMap[faceNum];
- f = cgdm->faceMap[i].face;
+ f = ccgdm->faceMap[i].face;
/*numVerts = ccgSubSurf_getFaceNumVerts(f);*/ /*UNUSED*/
- offset = faceNum - cgdm->faceMap[i].startFace;
+ offset = faceNum - ccgdm->faceMap[i].startFace;
grid = offset / gridFaces;
offset %= gridFaces;
y = offset / gridSideEdges;
@@ -924,8 +924,8 @@
static void ccgDM_copyFinalVertArray(DerivedMesh *dm, MVert *mvert)
{
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
DMGridData *vd;
int index;
int totvert, totedge, totface;
@@ -935,7 +935,7 @@
totface = ccgSubSurf_getNumFaces(ss);
for(index = 0; index < totface; index++) {
- CCGFace *f = cgdm->faceMap[index].face;
+ CCGFace *f = ccgdm->faceMap[index].face;
int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f);
vd= ccgSubSurf_getFaceCenterData(f);
@@ -964,7 +964,7 @@
totedge = ccgSubSurf_getNumEdges(ss);
for(index = 0; index < totedge; index++) {
- CCGEdge *e = cgdm->edgeMap[index].edge;
+ CCGEdge *e = ccgdm->edgeMap[index].edge;
int x;
for(x = 1; x < edgeSize - 1; x++, i++) {
@@ -981,7 +981,7 @@
totvert = ccgSubSurf_getNumVerts(ss);
for(index = 0; index < totvert; index++) {
- CCGVert *v = cgdm->vertMap[index].vert;
+ CCGVert *v = ccgdm->vertMap[index].vert;
vd= ccgSubSurf_getVertData(ss, v);
copy_v3_v3(mvert[i].co, vd->co);
@@ -992,25 +992,25 @@
static void ccgDM_copyFinalEdgeArray(DerivedMesh *dm, MEdge *medge)
{
- CCGDerivedMesh *cgdm = (CCGDerivedMesh*) dm;
- CCGSubSurf *ss = cgdm->ss;
+ CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+ CCGSubSurf *ss = ccgdm->ss;
int index;
int totedge, totface;
int gridSize = ccgSubSurf_getGridSize(ss);
int edgeSize = ccgSubSurf_getEdgeSize(ss);
int i = 0;
- short *edgeFlags = cgdm->edgeFlags;
+ short *edgeFlags = ccgdm->edgeFlags;
totface = ccgSubSurf_getNumFaces(ss);
for(index = 0; index < totface; index++) {
- CCGFace *f = cgdm->faceMap[index].face;
+ CCGFace *f = ccgdm->faceMap[index].face;
int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f);
for(S = 0; S < numVerts; S++) {
for(x = 0; x < gridSize - 1; x++) {
MEdge *med = &medge[i];
- if(cgdm->drawInteriorEdges)
+ if(ccgdm->drawInteriorEdges)
med->flag = ME_EDGEDRAW | ME_EDGERENDER;
med->v1 = getFaceIndex(ss, f, S, x, 0, edgeSize, gridSize);
med->v2 = getFaceIndex(ss, f, S, x + 1, 0, edgeSize, gridSize);
@@ -1022,7 +1022,7 @@
MEdge *med;
med = &medge[i];
- if(cgdm->drawInteriorEdges)
+ if(ccgdm->drawInteriorEdges)
med->flag = ME_EDGEDRAW | ME_EDGERENDER;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list