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

Include header cleaning and reordering.

This commit is contained in:
Paolo Cignoni 2013-11-25 10:35:39 +00:00
parent cc72b3e3e1
commit 7c0f42c4d7
4 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vcg/complex/algorithms/update/fitmaps.h
View File

@ -27,10 +27,7 @@
#include <vcg/math/histogram.h> #include <vcg/math/histogram.h>
#include <vcg/simplex/face/jumping_pos.h> #include <vcg/simplex/face/jumping_pos.h>
#include <vcg/complex/allocate.h>
#include <vcg/complex/algorithms/update/flag.h> #include <vcg/complex/algorithms/update/flag.h>
#include <vector>
#include <set>
#include <vcg/complex/algorithms/update/normal.h> #include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/curvature.h> #include <vcg/complex/algorithms/update/curvature.h>
#include <vcg/complex/algorithms/update/topology.h> #include <vcg/complex/algorithms/update/topology.h>
@ -42,8 +39,6 @@
#include <eigenlib/Eigen/LU> #include <eigenlib/Eigen/LU>
#include <eigenlib/Eigen/SVD> #include <eigenlib/Eigen/SVD>
#include <algorithm>
#include <vcg/complex/algorithms/nring.h> #include <vcg/complex/algorithms/nring.h>
#include <vcg/complex/algorithms/smooth.h> #include <vcg/complex/algorithms/smooth.h>

27
vcg/complex/algorithms/update/halfedge_indexed.h
View File

@ -8,7 +8,7 @@
* \ * * \ *
* All rights reserved. * * All rights reserved. *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
@ -24,11 +24,8 @@
#ifndef __VCGLIB_HALFEDGE_ #ifndef __VCGLIB_HALFEDGE_
#define __VCGLIB_HALFEDGE_ #define __VCGLIB_HALFEDGE_
#include <vector>
#include <vcg/complex/allocate.h>
#include <vcg/complex/algorithms/clean.h> #include <vcg/complex/algorithms/clean.h>
#include <vcg/complex/algorithms/update/topology.h> #include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/update/halfedge_topology.h> #include <vcg/complex/algorithms/update/halfedge_topology.h>
namespace vcg namespace vcg
@ -56,8 +53,8 @@ namespace vcg
struct VertexPairEdgePtr{ struct VertexPairEdgePtr{
VertexPairEdgePtr(VertexPointer _v0,VertexPointer _v1,HEdgePointer _ep):v0(_v0),v1(_v1),ep(_ep){if(v0>v1) std::swap(v0,v1);} VertexPairEdgePtr(VertexPointer _v0,VertexPointer _v1,HEdgePointer _ep):v0(_v0),v1(_v1),ep(_ep){if(v0>v1) std::swap(v0,v1);}
const bool operator <(const VertexPairEdgePtr &o) const {return (v0 == o.v0)? (v1<o.v1):(v0<o.v0);} bool operator <(const VertexPairEdgePtr &o) const {return (v0 == o.v0)? (v1<o.v1):(v0<o.v0);}
const bool operator ==(const VertexPairEdgePtr &o) const {return (v0 == o.v0)&& (v1==o.v1);} bool operator ==(const VertexPairEdgePtr &o) const {return (v0 == o.v0)&& (v1==o.v1);}
VertexPointer v0,v1; VertexPointer v0,v1;
HEdgePointer ep; HEdgePointer ep;
@ -342,7 +339,7 @@ namespace vcg
} }
} }
if( HasHEAdjacency(m) && (m.en!=0)) if( HasHEAdjacency(m) && (m.en!=0))
{ {
if( ! ep->HEp()) if( ! ep->HEp())
return false; //halfedge must point to an edge return false; //halfedge must point to an edge
@ -368,7 +365,7 @@ namespace vcg
if( ep->HNp()->IsD()) if( ep->HNp()->IsD())
return false; // return false; //
if(hasHP) if(hasHP)
if( ep->HNp()->HPp() != ep) if( ep->HNp()->HPp() != ep)
return false; // return false; //
@ -467,9 +464,9 @@ namespace vcg
/** Adds an edge between the sources of e0 and e1 and set all the topology relations. /** Adds an edge between the sources of e0 and e1 and set all the topology relations.
If the edges store the pointers to the faces then a new face is created. If the edges store the pointers to the faces then a new face is created.
<--- e1 ---- X <------e1_HEPp--- <--- e1 ---- X <------e1_HEPp---
^ ^
|| ||
ei0 || ei1 ei0 || ei1
|| ||
v v
----e0_HEPp-> X ----- e0 ------> ----e0_HEPp-> X ----- e0 ------>
@ -526,9 +523,9 @@ namespace vcg
/** Detach the topology relations of a given edge /** Detach the topology relations of a given edge
<--- e->HENPp -X --- <---------eO_HEPp--- <--- e->HENPp -X --- <---------eO_HEPp---
^ ^
|| ||
e || e->HEOp() e || e->HEOp()
|| ||
v v
----e_HEPp--> X ----- e->HEOp->HENPp() ------> ----e_HEPp--> X ----- e->HEOp->HENPp() ------>
@ -589,8 +586,8 @@ namespace vcg
struct VertexPairEdgePtr{ struct VertexPairEdgePtr{
VertexPairEdgePtr(VertexPointer _v0,VertexPointer _v1,HEdgePointer _ep):v0(_v0),v1(_v1),ep(_ep){if(v0>v1) std::swap(v0,v1);} VertexPairEdgePtr(VertexPointer _v0,VertexPointer _v1,HEdgePointer _ep):v0(_v0),v1(_v1),ep(_ep){if(v0>v1) std::swap(v0,v1);}
const bool operator <(const VertexPairEdgePtr &o) const {return (v0 == o.v0)? (v1<o.v1):(v0<o.v0);} bool operator <(const VertexPairEdgePtr &o) const {return (v0 == o.v0)? (v1<o.v1):(v0<o.v0);}
const bool operator ==(const VertexPairEdgePtr &o) const {return (v0 == o.v0)&& (v1==o.v1);} bool operator ==(const VertexPairEdgePtr &o) const {return (v0 == o.v0)&& (v1==o.v1);}
VertexPointer v0,v1; VertexPointer v0,v1;
HEdgePointer ep; HEdgePointer ep;
@ -642,7 +639,7 @@ namespace vcg
std::vector<VertexPointer> vpts; std::vector<VertexPointer> vpts;
do{vpts.push_back((*ep).HVp()); ep=ep->HNp();}while(ep!=epF); do{vpts.push_back((*ep).HVp()); ep=ep->HNp();}while(ep!=epF);
//int idbg =fp->VN(); //int idbg =fp->VN();
if(fp->VN() != vpts.size()){ if(size_t(fp->VN()) != vpts.size()){
fp->Dealloc(); fp->Dealloc();
fp ->Alloc(vpts.size()); fp ->Alloc(vpts.size());
} }

6
vcg/complex/algorithms/update/halfedge_topology.h
View File

@ -2,12 +2,6 @@
#define VCG_HEDGE_TOPOLOGY #define VCG_HEDGE_TOPOLOGY
#include <vcg/connectors/halfedge_pos.h> #include <vcg/connectors/halfedge_pos.h>
#include <vcg/complex/allocate.h>
#include <vector>
#include <set>
#include <algorithm>
#include <cstring>
using namespace std; using namespace std;
using namespace vcg::hedge; using namespace vcg::hedge;

26
vcg/complex/algorithms/update/quality.h
View File

@ -26,10 +26,6 @@
#include <vcg/simplex/face/topology.h> #include <vcg/simplex/face/topology.h>
#include <vcg/complex/algorithms/update/flag.h> #include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/stat.h> #include <vcg/complex/algorithms/stat.h>
#include <algorithm>
#include <vector>
#include <stack>
#include <assert.h>
namespace vcg { namespace vcg {
namespace tri { namespace tri {
@ -212,14 +208,14 @@ static void VertexFromMeanCurvatureDir(MeshType &m)
static void VertexFromAbsoluteCurvature(MeshType &m) static void VertexFromAbsoluteCurvature(MeshType &m)
{ {
VertexIterator vi; VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD())
{ {
if((*vi).Kg() >= 0) if((*vi).Kg() >= 0)
(*vi).Q() = math::Abs( 2*(*vi).Kh() ); (*vi).Q() = math::Abs( 2*(*vi).Kh() );
else else
(*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg())); (*vi).Q() = 2*math::Sqrt(math::Abs( (*vi).Kh()*(*vi).Kh() - (*vi).Kg()));
} }
} }
/* /*
@ -231,9 +227,9 @@ static void VertexFromAbsoluteCurvature(MeshType &m)
*/ */
static void VertexFromRMSCurvature(MeshType &m) static void VertexFromRMSCurvature(MeshType &m)
{ {
VertexIterator vi; VertexIterator vi;
for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD()) for(vi=m.vert.begin();vi!=m.vert.end();++vi) if(!(*vi).IsD())
(*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg())); (*vi).Q() = math::Sqrt(math::Abs( 4*(*vi).Kh()*(*vi).Kh() - 2*(*vi).Kg()));
} }