Skip to content
GitLab
Commit ff85b800 authored by untereiner's avatar untereiner
Browse files

ihm3

parent 2bd9824e
Hide whitespace changes
Inline Side-by-side
include/Algo/ImplicitHierarchicalMesh/subdivision3.h
View file @ ff85b800
......@@ -62,6 +62,15 @@ void coarsenFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
template <typename PFP>
void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
/***********************************************************************************
* Raffinement
***********************************************************************************/
/*
* Un brin de la face oppose aux faces a spliter
*/
template <typename PFP>
void splitVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position);
/*******************************************************
*
*/
......
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @ ff85b800
......@@ -173,12 +173,11 @@ Dart subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& positi
assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
unsigned int vLevel = map.volumeLevel(d) ;
Dart old = map.volumeOldestDart(d) ;
unsigned int cur = map.getCurrentLevel() ;
map.setCurrentLevel(vLevel) ; // go to the level of the face to subdivide its edges
unsigned int vLevel = map.volumeLevel(d);
Dart old = map.volumeOldestDart(d);
unsigned int cur = map.getCurrentLevel();
map.setCurrentLevel(vLevel);
/*
* au niveau du volume courant i
......@@ -740,10 +739,81 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
}
/***********************************************************************************
* Raffinement
***********************************************************************************/
template <typename PFP>
void splitVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
{
assert(map.getDartLevel(d) <= map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
assert(!map.volumeIsSubdivided(d) || !"Trying to subdivide an already subdivided volume") ;
unsigned int cur = map.getCurrentLevel() ;
unsigned int vLevel = map.volumeLevel(d) ;
map.setCurrentLevel(vLevel) ;
// first cut the edges (if they are not already)
Dart t = d;
do
{
if(!map.edgeIsSubdivided(map.phi1(map.phi2(t))))
Algo::IHM::subdivideEdge<PFP>(map, map.phi1(map.phi2(t)), position) ;
t = map.phi1(t);
}
while(t != d);
unsigned int fLevel = map.faceLevel(map.phi1(d));
map.setCurrentLevel(fLevel+1) ; // go to the level of the face to subdivide its edges
Dart neighboordVolume = map.phi1(map.phi1(map.phi2(d)));
//map.setCurrentLevel(cur) ; // go to the next level to perform volume subdivision
//Split the faces and open the midlle
do
{
Dart t2 = map.phi2(t);
unsigned int fLevel = map.faceLevel(t2) ;
map.setCurrentLevel(fLevel+1) ; // go to the level of the face to subdivide its edges
Dart face2 = map.phi1(map.phi1(t2));
map.splitFace(map.phi_1(t2), face2);
map.unsewFaces(map.phi1(map.phi1(t2)));
//id de face pour les 2 nouveaux brins
unsigned int idface = map.getFaceId(t2);
map.setFaceId(map.phi1(map.phi1(t2)), idface, DART);
map.setFaceId(map.phi_1(face2), idface, DART);
t = map.phi1(t);
}
while(t != d);
//close the middle to create volumes & sew them
map.setCurrentLevel(vLevel + 1) ; // go to the next level to perform volume subdivision
map.closeHole(map.phi1(map.phi1(map.phi2(d))));
map.closeHole(map.phi_1(neighboordVolume));
map.sewVolumes(map.phi2(map.phi1(map.phi1(map.phi2(d)))), map.phi2(map.phi_1(neighboordVolume)));
unsigned int idface = map.getNewFaceId();
map.setFaceId(map.phi2(map.phi_1(neighboordVolume)), idface, FACE);
do
{
Dart t211 = map.phi1(map.phi1(map.phi2(t)));
unsigned int idedge = map.getNewEdgeId();
map.setEdgeId(t211, idedge, EDGE);
t = map.phi1(t);
}
while(t != d);
map.setCurrentLevel(cur) ;
}
/*************************************************************************************
*
*/
template <typename PFP>
void subdivideVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position, SubdivideType sType)
{
......
include/Algo/Import/importSvg.h
View file @ ff85b800
......@@ -22,6 +22,19 @@ template <typename PFP>
bool importSVG(typename PFP::MAP& map, const std::string& filename, typename PFP::TVEC3& position, CellMarker& polygons);
/**
*
*/
template <typename PFP>
bool readSVG(const std::string& filename, std::vector<std::vector<typename PFP::VEC3 > > &allPoly);
template <typename PFP>
bool importBB(const std::string& filename, std::vector<Geom::BoundingBox<typename PFP::VEC3> > &bb);
template <typename PFP>
bool importSVG(typename PFP::MAP& map, const std::string& filename, std::vector<std::string>& attrNames);
}
......
include/Algo/Import/importSvg.hpp
View file @ ff85b800
#include <iostream>
#include "Geometry/bounding_box.h"
#include <set>
#include <vector>
#include "Utils/cgognStream.h"
#include "Algo/Modelisation/polyhedron.h"
#include "Algo/Modelisation/primitives3d.h"
namespace CGoGN
{
......@@ -224,9 +230,9 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, typename PFP
typename PFP::VEC3 bmin = bb.min();
typename PFP::VEC3 bmax = bb.max();
position[dBorder] = bmin-0.1f*bmin;
position[map.phi1(dBorder)] = VEC3(bmax[0],bmin[1],0) + 0.1f*VEC3(bmax[0],-bmin[1],0);
position[map.phi1(map.phi1(dBorder))] = VEC3(bmax[0],bmax[1],0) + 0.1f*bmax;
position[map.phi_1(dBorder)] = VEC3(bmin[0],bmax[1],0) + 0.1f*VEC3(-bmin[0],bmax[1],0);;
position[map.phi1(dBorder)] = typename PFP::VEC3 (bmax[0],bmin[1],0) + 0.1f* typename PFP::VEC3 (bmax[0],-bmin[1],0);
position[map.phi1(map.phi1(dBorder))] = typename PFP::VEC3 (bmax[0],bmax[1],0) + 0.1f*bmax;
position[map.phi_1(dBorder)] = typename PFP::VEC3 (bmin[0],bmax[1],0) + 0.1f* typename PFP::VEC3 (-bmin[0],bmax[1],0);;
DartMarker inside(map);
......@@ -274,6 +280,403 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, typename PFP
return true ;
}
template <typename PFP>
bool readSVG(const std::string& filename, std::vector<std::vector<typename PFP::VEC3 > > &allPoly)
{
typedef std::vector<typename PFP::VEC3 > POLYGON;
xmlDocPtr doc = xmlReadFile(filename.c_str(), NULL, 0);
xmlNodePtr map_node = xmlDocGetRootElement(doc);
if (!chechXmlNode(map_node,"svg"))
{
CGoGNerr << "Wrong xml format: Root node != svg"<< CGoGNendl;
return false;
}
//std::vector<POLYGON> allPoly;
for (xmlNode* cur_node = map_node->children; cur_node; cur_node = cur_node->next)
{
// for each layer
if (chechXmlNode(cur_node, "g"))
{
CGoGNout << "----load layer----"<< CGoGNendl;
for (xmlNode* cur_path = cur_node->children; cur_path; cur_path = cur_path->next)
{
if (chechXmlNode(cur_path, "path"))
{
allPoly.push_back(POLYGON());
CGoGNout << "--load a path--"<< CGoGNendl;
xmlChar* prop = xmlGetProp(cur_path, BAD_CAST "d");
// CGoGNout << "path "<< prop << CGoGNendl;
std::string allcoords((reinterpret_cast<const char*>(prop)));
std::stringstream is(allcoords);
bool relative = false;;
bool push_point;
std::string coord;
int mode = -1;
while ( std::getline( is, coord, ' ' ) )
{
float x,y;
push_point=false;
if(coord[0]=='m' || coord[0]=='l' || coord[0]=='t') //start point, line or quadratic bezier curve
{
mode = 0;
// std::cout << "relative coordinates" << std::endl;
relative=true;
}
else if(coord[0]=='M' || coord[0] == 'L' || coord[0]=='T') //same in absolute coordinates
{
// std::cout << "absolute coordinates" << std::endl;
mode = 1;
relative=false;
}
else if(coord[0]=='h' || coord[0] == 'H') //horizontal line
{
mode = 2;
relative=(coord[0]=='h');
}
else if(coord[0]=='v' || coord[0] == 'V') //vertical line
{
// std::cout << "vertical line" << std::endl;
mode = 3;
relative=(coord[0]=='v');
}
else if(coord[0]=='c' || coord[0] == 'C') //bezier curve
{
// std::cout << "bezier line" << std::endl;
mode = 4;
relative=(coord[0]=='c');
}
else if(coord[0]=='s' || coord[0] == 'S' || coord[0]=='q' || coord[0] == 'Q') //bezier curve 2
{
// std::cout << "bezier line 2" << std::endl;
mode = 5;
relative= ((coord[0]=='s') || (coord[0]=='q'));
}
else if(coord[0]=='a' || coord[0] == 'A') //elliptic arc
{
// std::cout << "elliptic arc" << std::endl;
mode =6;
relative= (coord[0]=='a');
}
else if(coord[0]=='z')
{
// std::cout << "the end" << std::endl;
}
else //coordinates
{
switch(mode)
{
case 0 : //relative
break;
case 1 : //absolute
break;
case 2 : //horizontal
{
std::stringstream streamCoord(coord);
std::string xS;
std::getline(streamCoord, xS, ',' );
valueOf(xS,x);
POLYGON curPoly = allPoly[allPoly.size()-1];
typename PFP::VEC3 previous = (curPoly)[(curPoly).size()-1];
y = previous[1];
push_point=true;
}
break;
case 3 : //vertical
{
std::stringstream streamCoord(coord);
std::string yS;
std::getline(streamCoord, yS, ',' );
valueOf(yS,y);
POLYGON curPoly = allPoly[allPoly.size()-1];
typename PFP::VEC3 previous = (curPoly)[(curPoly).size()-1];
x = previous[0];
push_point=true;
}
break;
case 4 : //bezier
{
std::getline( is, coord, ' ' ); //ignore first control point
std::getline( is, coord, ' ' ); //ignore second control point
}
break;
case 5 : //bezier 2
std::getline( is, coord, ' ' ); //ignore control point
break;
case 6 : //elliptic
std::getline( is, coord, ' ' ); //ignore rx
std::getline( is, coord, ' ' ); //ignore ry
std::getline( is, coord, ' ' ); //ignore x-rotation
std::getline( is, coord, ' ' ); //ignore large arc flag
std::getline( is, coord, ' ' ); //ignore sweep flag
break;
}
std::stringstream streamCoord(coord);
std::string xS,yS;
std::getline(streamCoord, xS, ',' );
std::getline(streamCoord, yS, ',' );
valueOf(xS,x);
valueOf(yS,y);
push_point = true;
}
//if there is a point to push
if(push_point)
{
POLYGON& curPoly = allPoly[allPoly.size()-1];
if(relative && curPoly.size()>0)
{
typename PFP::VEC3 previous = (curPoly)[(curPoly).size()-1];
x += previous[0];
y += previous[1];
}
// std::cout << "coord " << x << " " << y << std::endl;
curPoly.push_back(typename PFP::VEC3(x,y,0));
}
}
//check orientation : set in CCW
POLYGON& curPoly = allPoly[allPoly.size()-1];
if(curPoly.size()>2)
{
typename PFP::VEC3 v1(curPoly[1]-curPoly[0]);
typename PFP::VEC3 v2(curPoly[2]-curPoly[1]);
if((v1^v2)[2]<0)
std::reverse(curPoly.begin(), curPoly.end());
}
}
}
}
}
return true;
}
template <typename PFP>
bool importBB(const std::string& filename, std::vector<Geom::BoundingBox<typename PFP::VEC3> > &bb)
{
typedef typename PFP::VEC3 VEC3;
//
// Create a vector of polygons
//
std::vector<std::vector<VEC3> > allPoly;
allPoly.reserve(50);
readSVG<PFP>(filename, allPoly);
//
// Create a bounding box vector with the polygons vector
//
for(typename std::vector<std::vector<VEC3> >::iterator it = allPoly.begin() ; it != allPoly.end() ; ++it)
{
std::vector<VEC3> vecs = *it;
Geom::BoundingBox<typename PFP::VEC3> bblocal(vecs.front());
for(typename std::vector<typename PFP::VEC3>::iterator it = vecs.begin() ; it != vecs.end() ; ++it)
{
bblocal.addPoint(*it);
}
bb.push_back(bblocal);
}
return true;
}
template <typename PFP>
bool importSVG(typename PFP::MAP& map, const std::string& filename, std::vector<std::string>& attrNames)
{
typedef typename PFP::VEC3 VEC3;
//
// Attribut de position
//
AttributeHandler<VEC3> positions = map.template getAttribute<VEC3>(VERTEX, "position") ;
if (!positions.isValid())
positions = map.template addAttribute<VEC3>(VERTEX, "position") ;
attrNames.push_back(positions.name()) ;
//
// Attribut de cellule
//
AttributeHandler<unsigned int > areas = map.template getAttribute<unsigned int>(FACE, "areas");
if(!areas.isValid())
areas = map.template addAttribute<unsigned int>(FACE, "areas");
attrNames.push_back(areas.name());
//
// Create a vector of polygons
//
std::vector<std::vector<VEC3> > allPoly;
allPoly.reserve(50);
readSVG<PFP>(filename, allPoly);
//
// Create a bounding box vector with the polygons vector
//
std::vector<Geom::BoundingBox<VEC3> > bb;
bb.reserve(allPoly.size());
for(typename std::vector<std::vector<VEC3> >::iterator it = allPoly.begin() ; it != allPoly.end() ; ++it)
{
std::vector<VEC3> vecs = *it;
Geom::BoundingBox<typename PFP::VEC3> bblocal(vecs.front());
for(typename std::vector<typename PFP::VEC3>::iterator it = vecs.begin() ; it != vecs.end() ; ++it)
{
bblocal.addPoint(*it);
}
bb.push_back(bblocal);
}
//
// Classements des coords en x et y des boundinds boxes
//
std::set<int> sx;
std::set<int> sy;
for(typename std::vector<Geom::BoundingBox<typename PFP::VEC3> >::iterator it = bb.begin() ; it != bb.end() ; ++it)
{
VEC3 min = (*it).min();
VEC3 max = (*it).max();
sx.insert(min[0]);
sx.insert(max[0]);
sy.insert(min[1]);
sy.insert(max[1]);
}
//
// Creation de la grille
//
Algo::Modelisation::Polyhedron<PFP> prim(map,positions);
std::set<int>::iterator sity = sy.begin();
int cx = sx.size();
int cy = sy.size();
prim.grid_topo(cx - 1, cy - 1);
//tableau des brins (un par sommet)
std::vector<Dart> tableVertDarts = prim.getVertexDarts();
for(int i=0; i<cy; ++i)
{
//std::cout << "cood y =" << *sity << std::endl;
std::set<int>::iterator sitx = sx.begin();
for(int j=0; j<cx;++j)
{
Dart d = tableVertDarts[i*(cx)+j];
positions[d] = VEC3(*sitx, *sity, 0);
areas[d] = 0;
++sitx;
}
++sity;
}
//
// Parcours avec marquage des faces
//
DartMarkerStore mf(map);
for(Dart e = map.begin() ; e != map.end() ; map.next(e))
{
if(!mf.isMarked(e))
{
//Calcul du centre de ce quad
VEC3 c = Algo::Geometry::faceCentroid<PFP>(map, e, positions);
//Calcul de la bb de ce quad
// Geom::BoundingBox<typename PFP::VEC3> bbquad(positions[e]);
//
// Dart temp = e;
// do
// {
// bbquad.addPoint(positions[temp]);
// temp = map.phi1(temp);
// }
// while(temp != e);
int i = 1;
//Comparaison avec toutes les coordonnees si le point se trouve dedans
for(typename std::vector<Geom::BoundingBox<typename PFP::VEC3> >::iterator it = bb.begin(); it != bb.end() ; ++it)
{
VEC3 min = (*it).min();
VEC3 max = (*it).max();
//comparaison si la coord du centre se situe dans l'intervalle de la boite anglobante
if(min[0] <= c[0] && c[0] < max[0] && min[1] <= c[1] && c[1] < max[1])
{
areas[e] = i ;
mf.markOrbit(FACE, e);
break;
}
else
++i;
}
}
}
// //
// // Fusion des faces communes a une bb
// //
// for(Dart e = map.begin() ; e != map.end() ; map.next(e))
// {
// if(areas[e] != 0 && areas[map.phi2(e)] != 0)
// {
// if(areas[map.phi2(e)] == areas[e])
// {
// map.mergeFaces(e);
// }
// }
// }
//
// Parcours pour subdivision
//
DartMarkerStore mf2(map);
for(Dart e = map.begin() ; e != map.end() ; map.next(e))
{
}
return true;
}
} //import
} //algo
......
include/Geometry/bounding_box.h
View file @ ff85b800
......@@ -71,6 +71,8 @@ class BoundingBox
VEC center() const ;
bool isInitialized() const ;
/**********************************************/
/* FUNCTIONS */
/**********************************************/
......
include/Geometry/bounding_box.hpp
View file @ ff85b800
......@@ -118,6 +118,12 @@ VEC BoundingBox<VEC>::center() const
return center ;
}
template <typename VEC>
bool BoundingBox<VEC>::isInitialized() const
{
return m_initialized;
}
/**********************************************/
/* FUNCTIONS */
/**********************************************/
......
include/Topology/generic/attributeHandler.h
View file @ ff85b800
......@@ -138,7 +138,7 @@ public:
unsigned int insert(const T& elt) ;