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

- replace displistmesh_calc_normals by mesh_calc_normals

Browse Source 
- convert MeshDerivedMesh to calculate new vertex normals and such
   on initialize, means copy free conversion to DispListMesh
 - replace vertex access through function by direct access fo
   MeshDerivedMesh
 - shadeDispList was not getting correct orco's
This commit is contained in:
Daniel Dunbar
2005-07-17 20:12:16 +00:00
parent 75fefdc5a7
commit e6e9b1ea80
5 changed files with 65 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_displist.h
View File

@@ -100,7 +100,6 @@ struct DispListMesh {
};
void displistmesh_free(DispListMesh *dlm);
void displistmesh_calc_normals(DispListMesh *dlm);
void displistmesh_to_mesh(DispListMesh *dlm, struct Mesh *me);

5
source/blender/blenkernel/BKE_mesh.h
View File

@@ -89,6 +89,11 @@ void make_edges(struct Mesh *me);
*/
void mesh_calculate_vertex_normals (struct Mesh *me);
/* Calculate vertex and face normals, face normals are returned in *faceNors_r if non-NULL
* and vertex normals are stored in actual mverts.
*/
void mesh_calc_normals(struct MVert *mverts, int numVerts, struct MFace *mfaces, int numFaces, float **faceNors_r);
#ifdef __cplusplus
}
#endif

132
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -65,7 +65,10 @@ typedef struct {
DerivedMesh dm;
Object *ob;
float *extverts, *nors;
MVert *verts;
float *nors;
int freeNors;
} MeshDerivedMesh;
static DispListMesh *meshDM_convertToDispListMesh(DerivedMesh *dm)
@@ -77,7 +80,7 @@ static DispListMesh *meshDM_convertToDispListMesh(DerivedMesh *dm)
dlm->totvert = me->totvert;
dlm->totedge = me->totedge;
dlm->totface = me->totface;
dlm->mvert = me->mvert;
dlm->mvert = mdm->verts;
dlm->medge = me->medge;
dlm->mface = me->mface;
dlm->tface = me->tface;
@@ -85,34 +88,9 @@ static DispListMesh *meshDM_convertToDispListMesh(DerivedMesh *dm)
dlm->nors = mdm->nors;
dlm->dontFreeVerts = dlm->dontFreeOther = dlm->dontFreeNors = 1;
if (mdm->extverts) {
int i;
dlm->mvert = MEM_dupallocN(dlm->mvert);
for (i=0; i<dlm->totvert; i++) {
dlm->mvert[i].co[0] = mdm->extverts[i*3 + 0];
dlm->mvert[i].co[1] = mdm->extverts[i*3 + 1];
dlm->mvert[i].co[2] = mdm->extverts[i*3 + 2];
}
displistmesh_calc_normals(dlm);
dlm->dontFreeVerts = 0;
}
return dlm;
}
static float *meshDM__getVertCoP(MeshDerivedMesh *mdm, int index)
{
if (mdm->extverts) {
return mdm->extverts+3*index;
} else {
return ((Mesh*) mdm->ob->data)->mvert[index].co;
}
}
static void meshDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3])
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
@@ -120,15 +98,14 @@ static void meshDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3])
int i;
for (i=0; i<me->totvert; i++) {
MVert *mv = &me->mvert[i];
DO_MINMAX(mv->co, min_r, max_r);
DO_MINMAX(mdm->verts[i].co, min_r, max_r);
}
}
static void meshDM_getVertCo(DerivedMesh *dm, int index, float co_r[3])
{
float *co = meshDM__getVertCoP((MeshDerivedMesh*) dm, index);
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
float *co = mdm->verts[index].co;
co_r[0] = co[0];
co_r[1] = co[1];
@@ -138,7 +115,7 @@ static void meshDM_getVertCo(DerivedMesh *dm, int index, float co_r[3])
static void meshDM_getVertNo(DerivedMesh *dm, int index, float no_r[3])
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
short *no = ((Mesh*) mdm->ob->data)->mvert[index].no;
short *no = mdm->verts[index].no;
no_r[0] = no[0]/32767.f;
no_r[1] = no[1]/32767.f;
@@ -155,7 +132,7 @@ static void meshDM_drawVerts(DerivedMesh *dm)
glBegin(GL_POINTS);
for(a= start; a<end; a++) {
glVertex3fv(meshDM__getVertCoP(mdm, a));
glVertex3fv(mdm->verts[ a].co);
}
glEnd();
}
@@ -177,8 +154,8 @@ static void meshDM_drawEdges(DerivedMesh *dm)
glBegin(GL_LINES);
for(a=me->totedge; a>0; a--, medge++) {
if(medge->flag & ME_EDGEDRAW) {
glVertex3fv(meshDM__getVertCoP(mdm, medge->v1));
glVertex3fv(meshDM__getVertCoP(mdm, medge->v2));
glVertex3fv(mdm->verts[ medge->v1].co);
glVertex3fv(mdm->verts[ medge->v2].co);
}
}
glEnd();
@@ -190,29 +167,29 @@ static void meshDM_drawEdges(DerivedMesh *dm)
if(test) {
if(test&ME_V1V2){
glVertex3fv(meshDM__getVertCoP(mdm, mface->v1));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v2));
glVertex3fv(mdm->verts[mface->v1].co);
glVertex3fv(mdm->verts[mface->v2].co);
}
if(mface->v3) {
if(test&ME_V2V3){
glVertex3fv(meshDM__getVertCoP(mdm, mface->v2));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v3));
glVertex3fv(mdm->verts[mface->v2].co);
glVertex3fv(mdm->verts[mface->v3].co);
}
if (mface->v4) {
if(test&ME_V3V4){
glVertex3fv(meshDM__getVertCoP(mdm, mface->v3));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v4));
glVertex3fv(mdm->verts[mface->v3].co);
glVertex3fv(mdm->verts[mface->v4].co);
}
if(test&ME_V4V1){
glVertex3fv(meshDM__getVertCoP(mdm, mface->v4));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v1));
glVertex3fv(mdm->verts[mface->v4].co);
glVertex3fv(mdm->verts[mface->v1].co);
}
} else {
if(test&ME_V3V1){
glVertex3fv(meshDM__getVertCoP(mdm, mface->v3));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v1));
glVertex3fv(mdm->verts[mface->v3].co);
glVertex3fv(mdm->verts[mface->v1].co);
}
}
}
@@ -234,8 +211,8 @@ static void meshDM_drawLooseEdges(DerivedMesh *dm)
glBegin(GL_LINES);
for(a=start; a<end; a++, mface++) {
if(!mface->v3) {
glVertex3fv(meshDM__getVertCoP(mdm, mface->v3));
glVertex3fv(meshDM__getVertCoP(mdm, mface->v4));
glVertex3fv(mdm->verts[mface->v3].co);
glVertex3fv(mdm->verts[mface->v4].co);
}
}
glEnd();
@@ -244,7 +221,7 @@ static void meshDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int))
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
Mesh *me = mdm->ob->data;
MVert *mvert= me->mvert;
MVert *mvert= mdm->verts;
MFace *mface= me->mface;
float *nors = mdm->nors;
int a, start=0, end=me->totface;
@@ -255,14 +232,14 @@ static void meshDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int))
#define PASSVERT(index, punoBit) { \
if (shademodel==GL_SMOOTH) { \
short *no = (mvert+index)->no; \
short *no = mvert[index].no; \
if (mface->puno&punoBit) { \
glNormal3s(-no[0], -no[1], -no[2]); \
} else { \
glNormal3sv(no); \
} \
} \
glVertex3fv(meshDM__getVertCoP(mdm,index)); \
glVertex3fv(mvert[index].co); \
}
glBegin(glmode=GL_QUADS);
@@ -342,26 +319,26 @@ static void meshDM_drawFacesColored(DerivedMesh *dm, int useTwoSide, unsigned ch
}
glColor3ub(cp1[3], cp1[2], cp1[1]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v1) );
glVertex3fv( mdm->verts[mface->v1].co );
glColor3ub(cp1[7], cp1[6], cp1[5]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v2) );
glVertex3fv( mdm->verts[mface->v2].co );
glColor3ub(cp1[11], cp1[10], cp1[9]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v3) );
glVertex3fv( mdm->verts[mface->v3].co );
if(mface->v4) {
glColor3ub(cp1[15], cp1[14], cp1[13]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v4) );
glVertex3fv( mdm->verts[mface->v4].co );
}
if(useTwoSide) {
glColor3ub(cp2[11], cp2[10], cp2[9]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v3) );
glVertex3fv( mdm->verts[mface->v3].co );
glColor3ub(cp2[7], cp2[6], cp2[5]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v2) );
glVertex3fv( mdm->verts[mface->v2].co );
glColor3ub(cp2[3], cp2[2], cp2[1]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v1) );
glVertex3fv( mdm->verts[mface->v1].co );
if(mface->v4) {
glColor3ub(cp2[15], cp2[14], cp2[13]);
glVertex3fv( meshDM__getVertCoP(mdm,mface->v4) );
glVertex3fv( mdm->verts[mface->v4].co );
}
}
}
@@ -377,7 +354,7 @@ static void meshDM_drawFacesTex(DerivedMesh *dm, int (*setDrawParams)(TFace *tf,
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
Mesh *me = mdm->ob->data;
MVert *mvert= me->mvert;
MVert *mvert= mdm->verts;
MFace *mface= me->mface;
TFace *tface = me->tface;
float *nors = mdm->nors;
@@ -409,23 +386,23 @@ static void meshDM_drawFacesTex(DerivedMesh *dm, int (*setDrawParams)(TFace *tf,
if (tf) glTexCoord2fv(tf->uv[0]);
if (cp) glColor3ub(cp[3], cp[2], cp[1]);
if (mf->flag&ME_SMOOTH) glNormal3sv(mvert[mf->v1].no);
glVertex3fv(meshDM__getVertCoP(mdm, mf->v1));
glVertex3fv(mvert[mf->v1].co);
if (tf) glTexCoord2fv(tf->uv[1]);
if (cp) glColor3ub(cp[7], cp[6], cp[5]);
if (mf->flag&ME_SMOOTH) glNormal3sv(mvert[mf->v2].no);
glVertex3fv(meshDM__getVertCoP(mdm, mf->v2));
glVertex3fv(mvert[mf->v2].co);
if (tf) glTexCoord2fv(tf->uv[2]);
if (cp) glColor3ub(cp[11], cp[10], cp[9]);
if (mf->flag&ME_SMOOTH) glNormal3sv(mvert[mf->v3].no);
glVertex3fv(meshDM__getVertCoP(mdm, mf->v3));
glVertex3fv(mvert[mf->v3].co);
if(mf->v4) {
if (tf) glTexCoord2fv(tf->uv[3]);
if (cp) glColor3ub(cp[15], cp[14], cp[13]);
if (mf->flag&ME_SMOOTH) glNormal3sv(mvert[mf->v4].no);
glVertex3fv(meshDM__getVertCoP(mdm, mf->v4));
glVertex3fv(mvert[mf->v4].co);
}
glEnd();
}
@@ -449,13 +426,15 @@ static void meshDM_release(DerivedMesh *dm)
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
if (mdm->extverts) MEM_freeN(mdm->extverts);
if (mdm->freeNors) MEM_freeN(mdm->nors);
if (mdm->verts!=((Mesh*) mdm->ob->data)->mvert) MEM_freeN(mdm->verts);
MEM_freeN(mdm);
}
static DerivedMesh *getMeshDerivedMesh(Object *ob, float *extverts, float *nors)
static DerivedMesh *getMeshDerivedMesh(Object *ob, MVert *deformedVerts, float *nors)
{
MeshDerivedMesh *mdm = MEM_callocN(sizeof(*mdm), "mdm");
Mesh *me = ob->data;
mdm->dm.getMinMax = meshDM_getMinMax;
@@ -479,8 +458,16 @@ static DerivedMesh *getMeshDerivedMesh(Object *ob, float *extverts, float *nors)
mdm->dm.release = meshDM_release;
mdm->ob = ob;
mdm->extverts = extverts;
mdm->nors = nors;
mdm->freeNors = 0;
if (deformedVerts) {
mdm->verts = deformedVerts;
mesh_calc_normals(mdm->verts, me->totvert, me->mface, me->totface, &mdm->nors);
mdm->freeNors = 1;
} else {
mdm->verts = me->mvert;
}
return (DerivedMesh*) mdm;
}
@@ -1052,7 +1039,6 @@ DerivedMesh *mesh_get_base_derived(Object *ob)
build_mesh_data(ob, G.obedit && me==G.obedit->data);
/* Build's extverts, nors */
if (G.obedit && me==G.obedit->data) {
return getEditMeshDerivedMesh(G.editMesh);
} else {
@@ -1083,16 +1069,6 @@ DerivedMesh *mesh_get_cage_derived(struct Object *ob, int *needsFree_r)
DerivedMesh *derivedmesh_from_mesh(Object *ob, MVert *deformedVerts)
{
Mesh *me = ob->data;
float *extverts = NULL;
int i;
if (deformedVerts) {
extverts = MEM_mallocN(sizeof(float)*3*me->totvert, "extverts");
for (i=0; i<me->totvert; i++) {
VECCOPY(&extverts[i*3], deformedVerts[i].co);
}
MEM_freeN(deformedVerts);
}
return getMeshDerivedMesh(ob, extverts, NULL);
return getMeshDerivedMesh(ob, deformedVerts, NULL);
}

52
source/blender/blenkernel/intern/displist.c
View File

@@ -137,51 +137,6 @@ DispListMesh *displistmesh_copy(DispListMesh *odlm)
return ndlm;
}
void displistmesh_calc_normals(DispListMesh *dlm)
{
MVert *mverts= dlm->mvert;
MFace *mfaces= dlm->mface;
float (*tnorms)[3]= MEM_callocN(dlm->totvert*sizeof(*tnorms), "tnorms");
int i;
if (!dlm->dontFreeNors && dlm->nors) {
MEM_freeN(dlm->nors);
}
dlm->nors= MEM_mallocN(sizeof(*dlm->nors)*3*dlm->totface, "meshnormals");
dlm->dontFreeNors= 0;
for (i=0; i<dlm->totface; i++) {
MFace *mf= &mfaces[i];
float *f_no= &dlm->nors[i*3];
if (!mf->v3)
continue;
if (mf->v4)
CalcNormFloat4(mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co, mverts[mf->v4].co, f_no);
else
CalcNormFloat(mverts[mf->v1].co, mverts[mf->v2].co, mverts[mf->v3].co, f_no);
VecAddf(tnorms[mf->v1], tnorms[mf->v1], f_no);
VecAddf(tnorms[mf->v2], tnorms[mf->v2], f_no);
VecAddf(tnorms[mf->v3], tnorms[mf->v3], f_no);
if (mf->v4)
VecAddf(tnorms[mf->v4], tnorms[mf->v4], f_no);
}
for (i=0; i<dlm->totvert; i++) {
MVert *mv= &mverts[i];
float *no= tnorms[i];
Normalise(no);
mv->no[0]= (short)(no[0]*32767.0);
mv->no[1]= (short)(no[1]*32767.0);
mv->no[2]= (short)(no[2]*32767.0);
}
MEM_freeN(tnorms);
}
void displistmesh_to_mesh(DispListMesh *dlm, Mesh *me)
{
MFace *mfaces;
@@ -811,7 +766,10 @@ void shadeDispList(Object *ob)
MVert *mvert;
if (need_orco) {
make_orco_displist_mesh(ob, me->subdiv);
if ((me->flag&ME_SUBSURF) && me->subdiv)
make_orco_displist_mesh(ob, me->subdiv);
else
make_orco_mesh(me);
orco= me->orco;
} else {
orco= NULL;
@@ -1471,7 +1429,7 @@ void makeDispListMesh(Object *ob)
me->bb = NULL;
}
freedisplist(&(ob->disp));
freedisplist(&ob->disp);
freedisplist(&me->disp);
if (me->derived) {

2
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@@ -493,7 +493,7 @@ static DispListMesh *subSurf_createDispListMesh(SubSurf *ssm) {
}
ccgFaceIterator_free(fi);
displistmesh_calc_normals(dlm);
mesh_calc_normals(dlm->mvert, dlm->totvert, dlm->mface, dlm->totface, &dlm->nors);
return dlm;
}