manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ImportLocal to ImportData. Adjacencies are no more handle by ImportData, but 

by speficic functions in append.h (ImportPerxxxAdj(..))
This commit is contained in:
ganovelli 2010-06-16 16:31:17 +00:00
parent 4750b7c666
commit 7c35161210
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/complex/trimesh/autoalign_4pcs.h
View File

@ -59,11 +59,9 @@ class FourPCS {
public:
/* mesh only for using spatial indexing functions (to remove) */
class PVertex; // dummy prototype never used
class PEdge; // dummy prototype never used
class PFace;
class PUsedTypes: public vcg::UsedTypes < vcg::Use<PVertex>::template AsVertexType,
vcg::Use<PEdge >::template AsEdgeType,
vcg::Use<PFace >::template AsFaceType >{};

4
vcg/complex/trimesh/crease_cut.h
View File

@ -134,7 +134,7 @@ void CreaseCut(MESH_TYPE &m, float angleRad)
if(curVertexInd < startVn) assert(size_t(curVertexInd) == vertInd);
if(curVertexInd >= startVn)
{
m.vert[curVertexInd].ImportLocal(*((*fi).V(j)));
m.vert[curVertexInd].ImportData(*((*fi).V(j)));
(*fi).V(j) = & m.vert[curVertexInd];
}
}
@ -192,7 +192,7 @@ void CreaseCut(MESH_TYPE &m, float angleRad)
if(curVertexInd < startVn) assert(curVertexInd == vertInd);
if(curVertexInd >= startVn)
{
//m.vert[curVertexInd].ImportLocal(*((*fi).V(j)));
//m.vert[curVertexInd].ImportData(*((*fi).V(j)));
tri::Append<CMeshO,CMeshO>::ImportVertex(m.vert[curVertexInd],*((*fi).V(j)));
(*fi).V(j) = & m.vert[curVertexInd];
}

10
vcg/complex/trimesh/subset.h
View File

@ -81,17 +81,17 @@ struct InsertedV
FacePointer f;
int z;
const bool operator < (const InsertedV & o) const
bool operator < (const InsertedV & o) const
{
return (v<o.v);
}
const bool operator ==(const InsertedV & o)
bool operator ==(const InsertedV & o)
{
return (v==o.v);
}
const bool operator !=(const InsertedV & o)
bool operator !=(const InsertedV & o)
{
return (v!=o.v);
}
@ -118,7 +118,7 @@ void SubSet(S_MESH_TYPE & m, STL_CONT & subSet)
for(pfi=subSet.begin(); pfi!=subSet.end(); ++pfi)
{
assert(!(*pfi)->IsD());
(*fi).ImportLocal(**pfi);
(*fi).ImportData(**pfi);
for(int ii = 0 ; ii < (*fi).VN(); ++ii)
(*fi).V(ii) = (S_VertexType*)(void*)(*pfi)->V(ii);
++fi;
@ -147,7 +147,7 @@ void SubSet(S_MESH_TYPE & m, STL_CONT & subSet)
vi = vcg::tri::Allocator<S_MESH_TYPE>::AddVertices(m,newE-newVertices.begin());
for(curr=newVertices.begin(); curr!=newE; ++curr,++vi)
(*vi).ImportLocal(*((*curr).v));
(*vi).ImportData(*((*curr).v));
for(vi=m.vert.begin(); vi!=m.vert.end(); ++vi)
redirect.push_back(&(*vi));