complex and simplex self-sufficient headers

This commit is contained in:
alemuntoni 2021-03-24 16:08:53 +01:00
parent 4f3162ece5
commit e36aa76fbd
7 changed files with 25 additions and 5 deletions

View File

@ -23,6 +23,10 @@
#ifndef __VCG_TRI_UPDATE_FLAGS #ifndef __VCG_TRI_UPDATE_FLAGS
#define __VCG_TRI_UPDATE_FLAGS #define __VCG_TRI_UPDATE_FLAGS
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/tetrahedron/pos.h>
#include <vcg/simplex/edge/pos.h>
namespace vcg { namespace vcg {
namespace tri { namespace tri {
/// \ingroup trimesh /// \ingroup trimesh

View File

@ -26,6 +26,8 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include <vcg/container/simple_temporary_data.h>
#include "used_types.h" #include "used_types.h"
//#ifndef __VCG_MESH //#ifndef __VCG_MESH

View File

@ -24,9 +24,11 @@
#ifndef VCG__FOREACH_H #ifndef VCG__FOREACH_H
#define VCG__FOREACH_H #define VCG__FOREACH_H
#ifndef __VCG_MESH //#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h" //#error "This file should not be included alone. It is automatically included by complex.h"
#endif //#endif
#include <vcg/simplex/face/pos.h>
namespace vcg { namespace vcg {
namespace tri { namespace tri {

View File

@ -27,6 +27,9 @@
#include <vector> #include <vector>
#include <vcg/complex/allocate.h> #include <vcg/complex/allocate.h>
#include "pos.h"
#include "component.h"
namespace vcg { namespace vcg {
namespace edge { namespace edge {
/** \addtogroup edge */ /** \addtogroup edge */

View File

@ -24,6 +24,8 @@
#ifndef _VCG_FACE_TOPOLOGY #ifndef _VCG_FACE_TOPOLOGY
#define _VCG_FACE_TOPOLOGY #define _VCG_FACE_TOPOLOGY
#include "pos.h"
#include <vcg/complex/allocate.h> #include <vcg/complex/allocate.h>
namespace vcg { namespace vcg {

View File

@ -30,6 +30,11 @@
#ifndef __VCG_TETRA_POS #ifndef __VCG_TETRA_POS
#define __VCG_TETRA_POS #define __VCG_TETRA_POS
#include <vector>
#include <algorithm>
#include "component.h"
namespace vcg { namespace vcg {
namespace tetra { namespace tetra {
@ -87,7 +92,7 @@ public:
return _vi; return _vi;
} }
inline bool End(){return (Vt()==NULL);} inline bool End(){return (Vt()==nullptr);}
/// move on the next tetrahedron that share the vertex /// move on the next tetrahedron that share the vertex
void operator++() void operator++()
@ -97,7 +102,7 @@ public:
Vt() = tw->VTp(vi); Vt() = tw->VTp(vi);
Vi() = tw->VTi(vi); Vi() = tw->VTi(vi);
assert((Vt()==NULL)||((tw->V(vi))==(Vt()->V(Vi())))); assert((Vt()==nullptr)||((tw->V(vi))==(Vt()->V(Vi()))));
} }
}; };

View File

@ -24,6 +24,8 @@
#ifndef _VCG_TETRA_TOPOLOGY #ifndef _VCG_TETRA_TOPOLOGY
#define _VCG_TETRA_TOPOLOGY #define _VCG_TETRA_TOPOLOGY
#include <cassert>
namespace vcg { namespace vcg {
namespace tetrahedron { namespace tetrahedron {
/** \addtogroup tetrahedron */ /** \addtogroup tetrahedron */