cleanups

vcg/complex/allocate.h

@@ -30,10 +30,6 @@
 
 #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 tri {
 /** \addtogroup trimesh

vcg/complex/base.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_COMPLEX_BASE
 

vcg/complex/foreach.h

@@ -24,10 +24,6 @@
 #ifndef 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>
 
 namespace vcg {

vcg/simplex/edge/base.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_EDGE_PLUS
 

vcg/simplex/edge/component.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_EDGE_PLUS_COMPONENT
 

vcg/simplex/face/base.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_FACE_PLUS
 

vcg/simplex/face/component.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_FACE_PLUS_COMPONENT
 

vcg/simplex/face/component_occ.h

@@ -26,9 +26,6 @@ OCC = Optional Component Compact
 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
 #define __VCG_FACE_PLUS_COMPONENT_OCC
 

vcg/simplex/face/component_ocf.h

@@ -22,9 +22,6 @@
 ****************************************************************************/
 #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
 
 #include <vector>
 #include <string>

vcg/simplex/tetrahedron/base.h

@@ -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
 #define __VCG_TETRA_PLUS
 

vcg/simplex/vertex/base.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_VERTEX_PLUS
 

vcg/simplex/vertex/component.h

@@ -20,9 +20,7 @@
 * 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
 #define __VCG_VERTEX_PLUS_COMPONENT
 

vcg/simplex/vertex/component_occ.h

@@ -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
 #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 vertex {
 /*

vcg/simplex/vertex/component_ocf.h

@@ -25,9 +25,7 @@
 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_VERTEX_PLUS_COMPONENT_OCF
 #define __VCG_VERTEX_PLUS_COMPONENT_OCF