From 1a92eddf4c686ea2846bdabe6fd681d5c537b234 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 11 May 2011 10:00:15 +0000 Subject: [PATCH] removed three no more useful files of the old edgemesh. Ported useful sutff in the right places (topology.h and clean.h) --- vcg/complex/edgemesh/unify.h | 191 ------------------------ vcg/complex/edgemesh/update/bounding.h | 70 --------- vcg/complex/edgemesh/update/topology.h | 199 ------------------------- 3 files changed, 460 deletions(-) delete mode 100644 vcg/complex/edgemesh/unify.h delete mode 100644 vcg/complex/edgemesh/update/bounding.h delete mode 100644 vcg/complex/edgemesh/update/topology.h diff --git a/vcg/complex/edgemesh/unify.h b/vcg/complex/edgemesh/unify.h deleted file mode 100644 index 3a11f6a2..00000000 --- a/vcg/complex/edgemesh/unify.h +++ /dev/null @@ -1,191 +0,0 @@ -/**************************************************************************** -* VCGLib o o * -* Visual and Computer Graphics Library o o * -* _ O _ * -* Copyright(C) 2004 \/)\/ * -* Visual Computing Lab /\/| * -* ISTI - Italian National Research Council | * -* \ * -* All rights reserved. * -* * -* 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 * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * -* for more details. * -* * -****************************************************************************/ -/**************************************************************************** - History - -$Log: not supported by cvs2svn $ -Revision 1.8 2005/10/03 16:16:54 spinelli -used new version of grid query - -Revision 1.7 2005/09/19 13:10:12 spinelli -fixed bugs - -Revision 1.6 2005/09/14 14:34:41 spinelli -used new version of Grid_ptr - -Revision 1.5 2005/05/30 09:42:05 spinelli -std::std::vector sostituito con std::vector - -Revision 1.4 2005/05/30 09:13:08 ganovelli -error in include - -Revision 1.3 2005/05/17 21:19:37 ganovelli -some std::and typename missing (CRS4) - -Revision 1.2 2005/03/08 14:42:22 ganovelli -added vcg header - - -****************************************************************************/ - -#ifndef __VCGLIB__UNIFY -#define __VCGLIB__UNIFY - -#include -#include -#include -#include - -namespace vcg - { -/** \addtogroup edgemesh */ -/*@{*/ -/** - Class for computing unification of the vertices or of the edges -*/ - template - struct Unify{ - - template - class Tmark - { - MESH_TYPE m; - public: - Tmark(MESH_TYPE &_m):m(_m){} - void UnMarkAll(){m.UnMarkAll();} - bool IsMarked(OBJ_TYPE* obj){return (m.IsMarked(obj->v));} - void Mark(OBJ_TYPE* obj){m.Mark(obj->v);} - }; - - - typedef typename EdgeMeshType::VertexPointer VertexPointer; - typedef typename EdgeMeshType::EdgePointer EdgePointer; - typedef typename EdgeMeshType::ScalarType ScalarType; - typedef typename EdgeMeshType::CoordType CoordType; - - struct PVertex:EdgeMeshType::VertexType - { - typedef typename EdgeMeshType::ScalarType ScalarType; - VertexPointer v; // the two Vertex pointer are ordered! - EdgePointer e; // the edge where this vertex belong - int z; // index in [0..2] of the edge of the face - PVertex(EdgePointer pe, const int nz ):e(pe),z(nz),v(pe->V(nz)){} - /*bool Dist(Point3 p,ScalarType & d,Point3& res) - { - res = p; - ScalarType _d =vcg::Distance(p,v->P()); - if(d > _d) - { - d = _d; - return true; - } - return false; - }*/ - - void GetBBox(vcg::Box3 & bb){ - bb.Add(v->P()); - } - bool IsD(){ - return v->IsD(); - } - }; - typedef GridStaticPtr< PVertex > GridType; - - static void Join(PVertex pv0,PVertex & pv1){ - pv1.e->V(pv1.z) = pv0.v; - pv1.e = NULL; - } - - class BackCompDist { - public: - inline bool operator () (const PVertex & obj, const CoordType & pt, ScalarType & mindist, CoordType & result) { - result = pt; - ScalarType _d =vcg::Distance(result,obj.v->P()); - if(mindist < _d) - { - mindist = _d; - return true; - } - return false; - } - }; - - static GridType & Grid(){static GridType grid; return grid; } - - static void Vertices(EdgeMeshType & em, ScalarType epsilon){ - typename EdgeMeshType::EdgeIterator ei; - - typedef Tmark Marker; - Marker tm=Marker(em); - - bool lastRound ; - if(em.vn){ - vcg::edg::UpdateBounding::Box(em); - //Grid().SetBBox(em.bbox); - - std::vector pv; - for(ei = em.edges.begin(); ei != em.edges.end();++ei){ - pv.push_back(PVertex(&*ei,0)); - pv.push_back(PVertex(&*ei,1)); - } - Grid().Set(pv.begin(), pv.end() ); - typename std::vector::iterator pvi; - Point3 p; - PVertex * closest; - do{ - lastRound = true; - for(pvi = pv.begin(); pvi != pv.end(); ++pvi) - if((*pvi).e) - { - float eps = epsilon; - Point3 vpos =(*pvi).v->P() ; - (*pvi).v->SetD(); - ScalarType max_dist=em.bbox.Diag(); - ScalarType min_dist = 0; - p = (vcg::tri::GetClosestVertex( em, Grid(), vpos, - max_dist, min_dist))->P(); - - //closest = Grid().GetClosest(vpos, max_dist, BackCompDist(), eps, p,tm); - //closest = Grid().GetClosest(vpos,eps,p); - (*pvi).v->ClearD(); - - - if(closest){ - - if(closest->e) - { - Join(*pvi,*closest); - lastRound = false; - } - } - - } - }while(!lastRound); - - } - } // end Vertices - }; // end class - - } // end namespace - -#endif diff --git a/vcg/complex/edgemesh/update/bounding.h b/vcg/complex/edgemesh/update/bounding.h deleted file mode 100644 index 223c14b6..00000000 --- a/vcg/complex/edgemesh/update/bounding.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -* VCGLib o o * -* Visual and Computer Graphics Library o o * -* _ O _ * -* Copyright(C) 2004 \/)\/ * -* Visual Computing Lab /\/| * -* ISTI - Italian National Research Council | * -* \ * -* All rights reserved. * -* * -* 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 * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * -* for more details. * -* * -****************************************************************************/ -/**************************************************************************** - History - -$Log: not supported by cvs2svn $ - -****************************************************************************/ -#ifndef __VCG_EDGE_UPDATE_BOUNDING -#define __VCG_EDGE_UPDATE_BOUNDING - -namespace vcg { -namespace edg { - -/** \addtogroup edgemesh */ -/*@{*/ - -/// Management, updating and computation of per-vertex and per-face normals. -/// This class is used to compute or update the normals that can be stored in the vertex or face component of a mesh. -template -class UpdateBounding -{ - -public: -typedef ComputeMeshType MeshType; -typedef typename MeshType::VertexType VertexType; -typedef typename MeshType::VertexPointer VertexPointer; -typedef typename MeshType::VertexIterator VertexIterator; -typedef typename MeshType::EdgeType EdgeType; -typedef typename MeshType::EdgePointer EdgePointer; -typedef typename MeshType::EdgeIterator EdgeIterator; - -/// Calculates the vertex normal (if stored in the current face type) -static void Box(ComputeMeshType &m) -{ - m.bbox.SetNull(); - VertexIterator vi; - for(vi=m.vert.begin();vi!=m.vert.end();++vi) - if( !(*vi).IsD() ) m.bbox.Add((*vi).P()); - -} - - -}; // end class - -} // End namespace -} // End namespace - - -#endif diff --git a/vcg/complex/edgemesh/update/topology.h b/vcg/complex/edgemesh/update/topology.h deleted file mode 100644 index 33892487..00000000 --- a/vcg/complex/edgemesh/update/topology.h +++ /dev/null @@ -1,199 +0,0 @@ -/**************************************************************************** -* VCGLib o o * -* Visual and Computer Graphics Library o o * -* _ O _ * -* Copyright(C) 2004 \/)\/ * -* Visual Computing Lab /\/| * -* ISTI - Italian National Research Council | * -* \ * -* All rights reserved. * -* * -* 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 * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * -* for more details. * -* * -****************************************************************************/ -/**************************************************************************** - History - -$Log: not supported by cvs2svn $ -Revision 1.3 2004/10/28 00:47:51 cignoni -Better Doxygen documentation - -Revision 1.2 2004/05/10 14:42:17 ganovelli -nimor changes - - -****************************************************************************/ -#ifndef __VCG_EDGE_UPDATE_TOPOLOGY -#define __VCG_EDGE_UPDATE_TOPOLOGY -#include -namespace vcg { -namespace edge { -/** \addtogroup edgemesh */ -/*@{*/ - -template -class UpdateTopology -{ - -public: -typedef UpdateMeshType MeshType; -typedef typename MeshType::VertexType VertexType; -typedef typename MeshType::VertexPointer VertexPointer; -typedef typename MeshType::VertexIterator VertexIterator; -typedef typename MeshType::EdgeType EdgeType; -typedef typename MeshType::EdgePointer EdgePointer; -typedef typename MeshType::EdgeIterator EdgeIterator; - - - -/// Auxiliairy data structure for computing face face adjacency information. -// It identifies and edge storing two vertex pointer and a face pointer where it belong. -class PVertex -{ -public: - - VertexPointer v; // the two Vertex pointer are ordered! - EdgePointer e; // the edge where this vertex belong - int z; // index in [0..2] of the edge of the face - - PVertex() {} - -void Set( EdgePointer pe, const int nz ) -{ - assert(pe!=0); - assert(nz>=0); - assert(nz<2); - - v= pe->V(nz); - e = pe; - z = nz; -} - -inline bool operator < ( const PVertex & pe ) const -{ - return ( v ( const PVertex & pe ) const -{ - return ( v>pe.v ); -} - -inline bool operator >= ( const PVertex & pe ) const -{ - return( v>pe.v ); -} - -inline bool operator == ( const PVertex & pe ) const -{ - return (v==pe.v); -} - -inline bool operator != ( const PVertex & pe ) const -{ - return (v!=pe.v || v!=pe.v); -} -}; - - - -static void EdgeEdge(MeshType &m) -{ - if(!HasEEAdjacency(m)) return; - - std::vector v; - EdgeIterator pf; - typename vector::iterator p; - - if( m.en == 0 ) return; - - v.resize(m.en*2); // Alloco il vettore ausiliario - p = v.begin(); - for(pf=m.edge.begin();pf!=m.edge.end();++pf) // Lo riempio con i dati delle facce - if( ! (*pf).IsD() ) - for(int j=0;j<2;++j) - { - (*p).Set(&(*pf),j); - ++p; - } - assert(p==v.end()); - sort(v.begin(), v.end()); // Lo ordino per vertici - - int ne = 0; // Numero di edge reali - - typename vector::iterator pe,ps; - for(ps = v.begin(),pe=v.begin();pe<=v.end();++pe) // Scansione vettore ausiliario - { - if( pe==v.end() || *pe != *ps ) // Trovo blocco di edge uguali - { - typename vector::iterator q,q_next; - for (q=ps;q=0); - assert((*q).z< 2); - q_next = q; - ++q_next; - assert((*q_next).z>=0); - assert((*q_next).z< 2); - (*q).e->EEp(q->z) = (*q_next).e; // Collegamento in lista delle facce - (*q).e->EEi(q->z) = (*q_next).z; - } - assert((*q).z>=0); - assert((*q).z< 3); - (*q).e->EEp((*q).z) = ps->e; - (*q).e->EEi((*q).z) = ps->z; - ps = pe; - ++ne; // Aggiorno il numero di edge - } - } -} - -static void VertexEdge(MeshType &m) -{ - if(!m.HasVETopology()) return; - - VertexIterator vi; - EdgeIterator ei; - - for(vi=m.vert.begin();vi!=m.vert.end();++vi) - { - (*vi).Ep() = 0; - (*vi).Ei() = 0; - } - - for(ei=m.edges.begin();ei!=m.edges.end();++ei) - if( ! (*ei).IsD() ) - { - for(int j=0;j<2;++j) - { - (*ei).Ev(j) = (*ei).V(j)->Ep(); - (*ei).Zv(j) = (*ei).V(j)->Ei(); - (*ei).V(j)->Ep() = &(*ei); - (*ei).V(j)->Ei() = j; - } - } -} - - -}; // end class - -/*@}*/ -} // End namespace -} // End namespace - - -#endif