cleanups
This commit is contained in:
parent
8408a1a1d1
commit
d69e3e67cc
|
@ -30,10 +30,6 @@
|
||||||
|
|
||||||
#include "used_types.h"
|
#include "used_types.h"
|
||||||
|
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
namespace tri {
|
namespace tri {
|
||||||
/** \addtogroup trimesh
|
/** \addtogroup trimesh
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_COMPLEX_BASE
|
#ifndef __VCG_COMPLEX_BASE
|
||||||
#define __VCG_COMPLEX_BASE
|
#define __VCG_COMPLEX_BASE
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,6 @@
|
||||||
#ifndef VCG__FOREACH_H
|
#ifndef VCG__FOREACH_H
|
||||||
#define VCG__FOREACH_H
|
#define VCG__FOREACH_H
|
||||||
|
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
#include <vcg/simplex/face/pos.h>
|
#include <vcg/simplex/face/pos.h>
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_EDGE_PLUS
|
#ifndef __VCG_EDGE_PLUS
|
||||||
#define __VCG_EDGE_PLUS
|
#define __VCG_EDGE_PLUS
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_EDGE_PLUS_COMPONENT
|
#ifndef __VCG_EDGE_PLUS_COMPONENT
|
||||||
#define __VCG_EDGE_PLUS_COMPONENT
|
#define __VCG_EDGE_PLUS_COMPONENT
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_FACE_PLUS
|
#ifndef __VCG_FACE_PLUS
|
||||||
#define __VCG_FACE_PLUS
|
#define __VCG_FACE_PLUS
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_FACE_PLUS_COMPONENT
|
#ifndef __VCG_FACE_PLUS_COMPONENT
|
||||||
#define __VCG_FACE_PLUS_COMPONENT
|
#define __VCG_FACE_PLUS_COMPONENT
|
||||||
|
|
||||||
|
|
|
@ -26,9 +26,6 @@ OCC = Optional Component Compact
|
||||||
compare with OCF(Optional Component Fast)
|
compare with OCF(Optional Component Fast)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __VCG_MESH
|
|
||||||
#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
#endif
|
|
||||||
#ifndef __VCG_FACE_PLUS_COMPONENT_OCC
|
#ifndef __VCG_FACE_PLUS_COMPONENT_OCC
|
||||||
#define __VCG_FACE_PLUS_COMPONENT_OCC
|
#define __VCG_FACE_PLUS_COMPONENT_OCC
|
||||||
|
|
||||||
|
|
|
@ -22,9 +22,6 @@
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#ifndef __VCG_FACE_PLUS_COMPONENT_OCF
|
#ifndef __VCG_FACE_PLUS_COMPONENT_OCF
|
||||||
#define __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
|
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
|
@ -30,9 +30,7 @@ added
|
||||||
|
|
||||||
|
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
// #ifndef __VCG_TETRA_MESH
|
|
||||||
// #error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
// #endif
|
|
||||||
#ifndef __VCG_TETRA_PLUS
|
#ifndef __VCG_TETRA_PLUS
|
||||||
#define __VCG_TETRA_PLUS
|
#define __VCG_TETRA_PLUS
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_VERTEX_PLUS
|
#ifndef __VCG_VERTEX_PLUS
|
||||||
#define __VCG_VERTEX_PLUS
|
#define __VCG_VERTEX_PLUS
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* for more details. *
|
* for more details. *
|
||||||
* *
|
* *
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
//#ifndef __VCG_MESH
|
|
||||||
//#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
//#endif
|
|
||||||
#ifndef __VCG_VERTEX_PLUS_COMPONENT
|
#ifndef __VCG_VERTEX_PLUS_COMPONENT
|
||||||
#define __VCG_VERTEX_PLUS_COMPONENT
|
#define __VCG_VERTEX_PLUS_COMPONENT
|
||||||
|
|
||||||
|
|
|
@ -33,12 +33,15 @@ Working release (compilata solo su MSVC), component_occ <20> migrato da component
|
||||||
|
|
||||||
|
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
#ifndef __VCG_MESH
|
|
||||||
#error "This file should not be included alone. It is automatically included by complex.h"
|
|
||||||
#endif
|
|
||||||
#ifndef __VCG_VERTEX_PLUS_COMPONENT_OCC
|
#ifndef __VCG_VERTEX_PLUS_COMPONENT_OCC
|
||||||
#define __VCG_VERTEX_PLUS_COMPONENT_OCC
|
#define __VCG_VERTEX_PLUS_COMPONENT_OCC
|
||||||
|
|
||||||
|
#include <vcg/container/vector_occ.h>
|
||||||
|
|
||||||
|
#include <vcg/space/color4.h>
|
||||||
|
#include <vcg/space/texcoord2.h>
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
namespace vertex {
|
namespace vertex {
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -25,9 +25,7 @@
|
||||||
OCF = Optional Component Fast (hopefully)
|
OCF = Optional Component Fast (hopefully)
|
||||||
compare with OCC(Optional Component Compact)
|
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_VERTEX_PLUS_COMPONENT_OCF
|
#ifndef __VCG_VERTEX_PLUS_COMPONENT_OCF
|
||||||
#define __VCG_VERTEX_PLUS_COMPONENT_OCF
|
#define __VCG_VERTEX_PLUS_COMPONENT_OCF
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue