Ajout de CGoGN_ASSERT (static_assert.h)

assert execute uniquement si cmake -DASSERTON=true

Ajout du define TOPO_MAP dans EmbededMap
Petite modif dans importTet

Apps/Tuto/stage_shader.cpp

@@ -23,6 +23,7 @@
 *******************************************************************************/
 
 #include "stage_shader.h"
+#include "Utils/static_assert.h"
 
 /*******************************************************************************
  *														SLOTS
@@ -292,7 +293,7 @@ void StageShader::cb_mousePress(int button, int x, int y)
 }
 
 /**********************************************************************************************
- *							                                      MAIN FUNCTION                         								                *
+ *                  MAIN FUNCTION                         								      *
  **********************************************************************************************/
 
 int main(int argc, char** argv)

build/CMakeLists.txt

@@ -13,6 +13,14 @@ find_package(OpenGL REQUIRED)
 find_package(Qt4 REQUIRED)
 find_package(GLUT)
 
+IF (DEFINED ASSERTON)
+	add_definitions(-DCGOGN_ASSERT_BOOL=${ASSERTON})
+ELSE (DEFINED ASSERTON)
+	add_definitions(-DCGOGN_ASSERT_BOOL=false)
+ENDIF (DEFINED ASSERTON)
+
+add_definitions(-DSHADERPATH="${CGoGN_ROOT_DIR}/lib/Shaders/")
+
 # qq definition specifiques pour mac
 IF(APPLE)
 # attention a changer pour chercher la bonne version automatiquement

build/Debug/CMakeLists.txt

@@ -78,8 +78,6 @@ add_library(
 #	${files_geometry}
 #)
 
-add_definitions(-DSHADERPATH="${CGoGN_ROOT_DIR}/lib/Shaders/")
-add_definitions(-DDBG_MAX_LEVEL=5)
 
 file(
 	GLOB_RECURSE

build/Release/CMakeLists.txt

@@ -80,8 +80,6 @@ add_library(
 #	${files_geometry}
 #)
 
-add_definitions(-DSHADERPATH="${CGoGN_ROOT_DIR}/lib/Shaders/")
-add_definitions(-DDBG_MAX_LEVEL=0)
 
 file(
 	GLOB_RECURSE

include/Algo/Import/importTet.hpp

@@ -32,6 +32,7 @@ namespace Algo
 namespace Import 
 {
 
+
 template <typename PFP>
 bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<std::string>& attrNames, float scaleFactor)
 {
@@ -177,19 +178,18 @@ bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<
 	//Association des phi3
 	for (Dart d = map.begin(); d != map.end(); map.next(d))
 	{
-		std::vector<Dart>& vec = vecDartsPerVertex[d];
-
-		for(typename std::vector<Dart>::iterator it = vec.begin(); it!=vec.end(); ++it)
+		const std::vector<Dart>& vec = vecDartsPerVertex[d];
+		for(typename std::vector<Dart>::const_iterator it = vec.begin(); it!=vec.end(); ++it)
 		{
 			if(map.phi3(*it) == *it)
 			{
 				bool sewn = false;
-				for(typename std::vector<Dart>::iterator itnext = it+1; itnext != vec.end() && !sewn; ++itnext)
+				for(typename std::vector<Dart>::const_iterator itnext = it+1; itnext != vec.end() && !sewn; ++itnext)
 				{
 					if(map.getEmbedding(VERTEX,map.phi1(*it))==map.getEmbedding(VERTEX,map.phi_1(*itnext))
 					&& map.getEmbedding(VERTEX,map.phi_1(*it))==map.getEmbedding(VERTEX,map.phi1(*itnext)))
 					{
-						map.sewVolumes(*it, map.phi_1(*itnext));
+						map.PFP::MAP::TOPO_MAP::sewVolumes(*it, map.phi_1(*itnext));
 						sewn = true;
 					}
 				}

include/Topology/generic/cellmarker.h

@@ -29,6 +29,7 @@
 #include "Topology/generic/attribmap.h"
 
 #include "Topology/generic/functor.h"
+#include "Utils/static_assert.h"
 
 namespace CGoGN
 {
@@ -196,10 +197,12 @@ public:
 	CellMarkerStore(AttribMap& map, unsigned int cell, unsigned int thread = 0) : CellMarkerGen(map, cell, thread)
 	{}
 
+
 	virtual ~CellMarkerStore()
 	{
 		unmarkAll() ;
-		assert(isAllUnmarked()) ;
+//		assert(isAllUnmarked);
+		CGoGN_ASSERT(isAllUnmarked())
 	}
 
 protected:
@@ -239,7 +242,8 @@ public:
 
 	virtual ~CellMarkerNoUnmark()
 	{
-		assert(isAllUnmarked()) ;
+//		assert(isAllUnmarked()) ;
+		CGoGN_ASSERT(isAllUnmarked())
 	}
 
 protected:

include/Topology/generic/embeddedMap2.h

@@ -38,6 +38,7 @@ template <typename MAP2>
 class EmbeddedMap2 : public MAP2
 {
 public:
+	typedef MAP2 TOPO_MAP;
 	/**
 	 * The attributes attached to the old vertex are duplicated on both resulting vertices
 	 * No attribute is attached to the new edge

include/Topology/generic/embeddedMap3.h

@@ -38,7 +38,7 @@ template <typename MAP3>
 class EmbeddedMap3 : public MAP3
 {
 public:
-
+	typedef MAP3 TOPO_MAP;
 
 	//!
 	/*!

include/Utils/cgognStream.h

@@ -25,10 +25,6 @@
 #ifndef _CGOGNSTREAM_H_
 #define _CGOGNSTREAM_H_
 
-// pb of compilation ??
-#ifndef DBG_MAX_LEVEL
-#define DBG_MAX_LEVEL 5
-#endif
 
 #include <string>
 #include <iostream>

include/Utils/static_assert.h

@@ -34,5 +34,8 @@ namespace CGoGN
 #define CGoGN_STATIC_ASSERT(expr, msg) \
 	{ CGoGN::CompileTimeError<((expr) != 0)> STATIC_ASSERT_ERROR_##msg; (void)STATIC_ASSERT_ERROR_##msg; }
 
+
+#define CGoGN_ASSERT(expr) if (CGOGN_ASSERT_BOOL) assert(expr);
+
 #endif
 

src/Topology/map/map3.cpp

@@ -764,7 +764,6 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread)
 	bool found = false;					// Last functor return value
 
 	std::list<Dart> darts_list;			//Darts that are traversed
-
 	darts_list.push_back(d);			//Start with the dart d
 	mv.mark(d);
 

src/Utils/vbo.cpp

@@ -60,7 +60,6 @@ VBO::VBO(const VBO& vbo) :
 
 VBO::~VBO()
 {
-	std::cout << "VBO delete"<< std::endl;
 	if (m_lock)
 		releasePtr();
 	glDeleteBuffers(1, &m_id);