Commit 12f0fb62 authored by Thomas Pitiot 's avatar Thomas Pitiot

update

parent 012c4270
......@@ -51,10 +51,10 @@ template <typename PFP>
void planeCut(
typename PFP::MAP& map,
VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position,
const Geom::Plane3D<typename PFP::REAL>& plane,
CellMarker<typename PFP::MAP, FACE>& cmf_over,
bool keepTriangles = false,
bool with_unsew = true
const Geom::Plane3D<typename PFP::REAL>& plane
// CellMarker<typename PFP::MAP, FACE>& cmf_over,
// bool keepTriangles = false,
// bool with_unsew = true
);
template <typename PFP>
......
......@@ -405,10 +405,11 @@ template <typename PFP>
void planeCut(
typename PFP::MAP& map,
VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position,
const Geom::Plane3D<typename PFP::REAL>& plane,
CellMarker<typename PFP::MAP, FACE>& cmf_over,
bool keepTetrahedra,
bool with_unsew)
const Geom::Plane3D<typename PFP::REAL>& plane
// CellMarker<typename PFP::MAP, FACE>& cmf_over,
// bool keepTetrahedra,
// bool with_unsew
)
{
typedef typename PFP::MAP MAP;
typedef typename PFP::MAP MAP;
......
......@@ -75,7 +75,7 @@ namespace Modelisation
* @param d a dart from the vertex
*/
template <typename PFP>
void explodPolyhedron(typename PFP::MAP& map, Dart d, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position);
void explodPolyhedron(typename PFP::MAP& map, Dart d);
......@@ -137,7 +137,7 @@ template <typename PFP>
bool isPrism(typename PFP::MAP& map, Dart d);
template <typename PFP>
bool isHexahedron(typename PFP::MAP& the_map, Dart d, unsigned int thread=0);
bool isHexahedron(typename PFP::MAP& the_map, Dart d);
template <typename PFP>
Dart embedPrism(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position, unsigned int n, bool withBoundary, float bottom_radius, float top_radius, float height);
......
......@@ -416,7 +416,7 @@ bool isPrism(typename PFP::MAP& map, Dart d)
}
template <typename PFP>
bool isHexahedron(typename PFP::MAP& the_map, Dart d, unsigned int thread)
bool isHexahedron(typename PFP::MAP& the_map, Dart d)
{
unsigned int nbFaces = 0;
......@@ -438,7 +438,7 @@ bool isHexahedron(typename PFP::MAP& the_map, Dart d, unsigned int thread)
}
template <typename PFP>
void explodPolyhedron(typename PFP::MAP& map, Dart d, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& position)
void explodPolyhedron(typename PFP::MAP& map, Dart d)
{
map.unsewVertexUmbrella(d);
unsigned int newFaceDegree = map.closeHole(map.phi1(d));
......
......@@ -602,7 +602,7 @@ void ParticleCell3D<PFP>::edgeState(const VEC3& current)
d = m.phi_1(d);
if(dd==d) {
std::cout << "sortie ?(1)" << std::endl;
// std::cout << "sortie ?(1)" << std::endl;
do {
switch (whichSideOfEdge(current,d)) {
case Geom::OVER : d=m.phi_1(d);
......
......@@ -324,7 +324,7 @@ void ParticleCell3DMemo<PFP>::edgeState(const VEC3& current, CellMarkerMemo<MAP,
this->d = this->m.phi_1(this->d);
if(dd==this->d) {
std::cout << "sortie ?(1)" << std::endl;
// std::cout << "sortie ?(1)" << std::endl;
do {
switch (this->whichSideOfEdge(current,this->d)) {
case Geom::OVER : this->d=this->m.phi_1(this->d);
......
......@@ -320,7 +320,14 @@ void IHM2<PFP>::subdivideEdge(Dart d)
unsigned int eId = m_map.getEdgeId(d) ;
m_map.setEdgeId(m_map.phi1(d), eId) ;
m_map.setEdgeId(m_map.phi1(dd), eId) ;
(*edgeVertexFunctor)(m_map.phi1(d)) ;
if(edgeVertexFunctor!=NULL)
{
(*edgeVertexFunctor)(m_map.phi1(d)) ;
}
else
{
std::cout<<"edgefunctor not initialized"<<std::endl;
}
m_map.setCurrentLevel(cur) ;
}
......
......@@ -56,11 +56,11 @@ public:
bool operator() (Dart d)
{
std::cout << "dartIndex(d) = " << m_map.dartIndex(d) << std::endl;
// std::cout << "dartIndex(d) = " << m_map.dartIndex(d) << std::endl;
m_map.decCurrentLevel() ;
std::cout << "dartIndex(d) = " << m_map.dartIndex(d) << std::endl;
// std::cout << "dartIndex(d) = " << m_map.dartIndex(d) << std::endl;
typename PFP::VEC3 p = m_position[d] ;
std::cout << "p = " << p << std::endl;
// std::cout << "p = " << p << std::endl;
m_map.incCurrentLevel() ;
m_position[d] = p ;
......
......@@ -146,7 +146,7 @@ typename PFP::VEC3 doTwist(typename PFP::VEC3 pos, float t )
}
template <typename PFP>
void frequencyDeformation(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& attIn, unsigned int cutoffLevel)
void frequencyDeformation(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& attIn)
{
float time = 1.0;
//float angle_deg_max = 0.4;
......
......@@ -148,7 +148,7 @@ public:
*/
unsigned int closeHole(Dart d, bool forboundary = true);
bool check() ;
bool check() ;
} ;
} // namespace CGoGN
......
......@@ -167,7 +167,7 @@ public:
/**
*
*/
bool check() ;
bool check() ;
} ;
} // namespace CGoGN
......
......@@ -144,7 +144,7 @@ public:
//!
/*!
*/
virtual bool check();
virtual bool check() ;
} ;
} // namespace CGoGN
......
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