Commit 3e4dba23 authored by Sylvain Thery's avatar Sylvain Thery

restore oldi-school embnull testing algos

parent f0c76ffa
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "Topology/generic/dartmarker.h" #include "Topology/generic/dartmarker.h"
#include <vector> #include <vector>
#include "Algo/Modelisation/boundEmb.h"
namespace CGoGN namespace CGoGN
{ {
...@@ -119,9 +117,7 @@ void MarchingCube<DataType, Windowing, PFP>::deleteMesh() ...@@ -119,9 +117,7 @@ void MarchingCube<DataType, Windowing, PFP>::deleteMesh()
template< typename DataType, template < typename D2 > class Windowing, typename PFP > template< typename DataType, template < typename D2 > class Windowing, typename PFP >
Dart MarchingCube<DataType, Windowing, PFP>::createTriEmb(unsigned int e1, unsigned int e2, unsigned int e3) Dart MarchingCube<DataType, Windowing, PFP>::createTriEmb(unsigned int e1, unsigned int e2, unsigned int e3)
{ {
// L_DART d = m_map->newFace(3,false); L_DART d = m_map->newFace(3,false);
L_DART d = Modelisation::newFaceEmb<PFP>(*m_map,3);
FunctorSetEmb<GenericMap, VERTEX> fsetemb(*m_map, e1); FunctorSetEmb<GenericMap, VERTEX> fsetemb(*m_map, e1);
m_map->template foreach_dart_of_orbit<PFP::MAP::VERTEX_OF_PARENT>(d, fsetemb); m_map->template foreach_dart_of_orbit<PFP::MAP::VERTEX_OF_PARENT>(d, fsetemb);
...@@ -926,9 +922,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbourSimple(L_DART d1, L_DAR ...@@ -926,9 +922,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbourSimple(L_DART d1, L_DAR
{ {
if (m_map->phi2(d1) != d2) if (m_map->phi2(d1) != d2)
{ {
// m_map->sewFaces(d1,d2,false); m_map->sewFaces(d1,d2,false);
Modelisation::sewFaceEmb<PFP>(*m_map,d1,d2);
#ifdef MC_WIDTH_EDGE_Z_EMBEDED #ifdef MC_WIDTH_EDGE_Z_EMBEDED
if (m_zslice!=NULL) if (m_zslice!=NULL)
{ {
...@@ -945,9 +939,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2) ...@@ -945,9 +939,7 @@ void MarchingCube<DataType, Windowing, PFP>::setNeighbour(L_DART d1, L_DART d2)
{ {
if (m_map->phi2(d1) != d2) if (m_map->phi2(d1) != d2)
{ {
// m_map->sewFaces(d1,d2,false); m_map->sewFaces(d1,d2,false);
Modelisation::sewFaceEmb<PFP>(*m_map,d1,d2);
#ifdef MC_WIDTH_EDGE_Z_EMBEDED #ifdef MC_WIDTH_EDGE_Z_EMBEDED
if (m_zslice!=NULL) if (m_zslice!=NULL)
{ {
......
...@@ -200,7 +200,8 @@ protected: ...@@ -200,7 +200,8 @@ protected:
void computeCenter(); void computeCenter();
Dart grid_topo_open(unsigned int x, unsigned int y);
Dart cylinder_topo_open(unsigned int n, unsigned int z);
public: public:
/** /**
* Constructor * Constructor
...@@ -239,6 +240,8 @@ public: ...@@ -239,6 +240,8 @@ public:
*/ */
std::vector<Dart>& getVertexDarts() { return m_tableVertDarts; } std::vector<Dart>& getVertexDarts() { return m_tableVertDarts; }
/** /**
* Create a 2D grid * Create a 2D grid
* quads are oriented counter-clockwise and the returned dart * quads are oriented counter-clockwise and the returned dart
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment