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

all included from used_types.h have been made self sufficient

This commit is contained in:
alemuntoni 2021-03-24 15:48:57 +01:00
parent 0b99eaa7b2
commit 4f3162ece5
14 changed files with 108 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vcg/complex/used_types.h
View File

@ -23,7 +23,6 @@
#ifndef VCG_USED_TYPES_H
#define VCG_USED_TYPES_H
#include <vcg/space/point3.h>
#include <vcg/space/box3.h>
#include <vcg/space/color4.h>
#include <vcg/math/shot.h>

9
vcg/connectors/hedge.h
View File

@ -20,11 +20,18 @@
* for more details. *
* *
****************************************************************************/
#include <vcg/complex/complex.h>
#ifndef __VCG_HEDGE_
#define __VCG_HEDGE_
#include <vector>
#include <string>
#include <vcg/complex/all_types.h>
#include <vcg/container/derivation_chain.h>
#include "hedge_component.h"
namespace vcg {
/*------------------------------------------------------------------*/

5
vcg/connectors/hedge_component.h
View File

@ -20,11 +20,14 @@
* for more details. *
* *
****************************************************************************/
#include <vcg/complex/complex.h>
#ifndef __VCG_HEDGE_COMPONENT
#define __VCG_HEDGE_COMPONENT
#include <cassert>
#include <vector>
#include <string>
namespace vcg {
namespace hedge {
/*

16
vcg/simplex/edge/base.h
View File

@ -20,11 +20,21 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_EDGE_PLUS
#define __VCG_EDGE_PLUS
#include <cassert>
#include <string>
#include <vector>
#include <vcg/complex/all_types.h>
#include <vcg/container/derivation_chain.h>
#include "component.h"
namespace vcg {
/*------------------------------------------------------------------*/
/*

13
vcg/simplex/edge/component.h
View File

@ -20,12 +20,19 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_EDGE_PLUS_COMPONENT
#define __VCG_EDGE_PLUS_COMPONENT
#include <cassert>
#include <vector>
#include <string>
#include <vcg/space/color4.h>
namespace vcg {
namespace edge {

14
vcg/simplex/face/base.h
View File

@ -20,12 +20,20 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_FACE_PLUS
#define __VCG_FACE_PLUS
#include <vector>
#include <string>
#include <vcg/complex/all_types.h>
#include <vcg/container/derivation_chain.h>
#include "component.h"
namespace vcg {
/*------------------------------------------------------------------*/

12
vcg/simplex/face/component.h
View File

@ -20,12 +20,18 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_FACE_PLUS_COMPONENT
#define __VCG_FACE_PLUS_COMPONENT
#include <cassert>
#include <vector>
#include <string>
#include <vcg/space/color4.h>
#include <vcg/space/texcoord2.h>
namespace vcg {
namespace face {

12
vcg/simplex/face/component_ocf.h
View File

@ -22,9 +22,15 @@
****************************************************************************/
#ifndef __VCG_FACE_PLUS_COMPONENT_OCF
#define __VCG_FACE_PLUS_COMPONENT_OCF
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#include <vector>
#include <string>
#include <vcg/space/color4.h>
#include <vcg/space/texcoord2.h>
namespace vcg {
namespace face {

6
vcg/simplex/face/component_polygon.h
View File

@ -24,6 +24,10 @@
#ifndef __VCG_POLYGON_COMPONENT
#define __VCG_POLYGON_COMPONENT
#include <cassert>
#include <vector>
#include <string>
namespace vcg {
namespace face {
@ -60,7 +64,7 @@ public:
typedef typename T::VertexType::ScalarType ScalarType;
typedef typename T::VertexType VertexType;
PFVAdj(){ _vpoly = NULL; }
PFVAdj(){ _vpoly = nullptr; }
/* Note: the destructor will not be called in general because there are no virtual destructors.
* Instead, the job of deallocating the memory will be done by the face allocator.
* This destructor is only done for those who istance a face alone (outside a mesh)

11
vcg/simplex/tetrahedron/base.h
View File

@ -36,10 +36,13 @@ added
#ifndef __VCG_TETRA_PLUS
#define __VCG_TETRA_PLUS
//#include <vcg/space/point3.h>
//#include <vcg/space/texcoord2.h>
//#include <vcg/space/color4.h>
//#include <vcg/simplex/tetrahedron/component.h>
#include <vector>
#include <string>
#include <vcg/complex/all_types.h>
#include <vcg/container/derivation_chain.h>
#include "component.h"
namespace vcg {

2
vcg/simplex/tetrahedron/component.h
View File

@ -34,6 +34,8 @@ added
#define __VCG_TETRAHEDRON_PLUS_COMPONENT
#include <vector>
#include <vcg/space/color4.h>
#include <vcg/space/tetra3.h>
namespace vcg {

11
vcg/simplex/vertex/base.h
View File

@ -20,12 +20,17 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_VERTEX_PLUS
#define __VCG_VERTEX_PLUS
#include <vcg/complex/all_types.h>
#include <vcg/container/derivation_chain.h>
#include "component.h"
namespace vcg {

12
vcg/simplex/vertex/component.h
View File

@ -20,12 +20,18 @@
* for more details. *
* *
****************************************************************************/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_VERTEX_PLUS_COMPONENT
#define __VCG_VERTEX_PLUS_COMPONENT
#include <vector>
#include <string>
#include <vcg/space/color4.h>
#include <vcg/space/texcoord2.h>
namespace vcg {
namespace vertex {
/** \addtogroup VertexComponentGroup

16
vcg/simplex/vertex/component_ocf.h
View File

@ -25,14 +25,18 @@
OCF = Optional Component Fast (hopefully)
compare with OCC(Optional Component Compact)
*/
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
//#ifndef __VCG_MESH
//#error "This file should not be included alone. It is automatically included by complex.h"
//#endif
#ifndef __VCG_VERTEX_PLUS_COMPONENT_OCF
#define __VCG_VERTEX_PLUS_COMPONENT_OCF
#ifndef __VCG_MESH
#error "This file should not be included alone. It is automatically included by complex.h"
#endif
#include <vector>
#include <string>
#include <vcg/space/color4.h>
#include <vcg/space/texcoord2.h>
namespace vcg {
namespace vertex {