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>

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

@ -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;
@ -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;

4
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 {