Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

importSvg.hpp 15.2 KB
Newer Older
Pierre Kraemer's avatar
Pierre Kraemer committed
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
* version 0.1                                                                  *
* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg           *
*                                                                              *
* This library is free software; you can redistribute it and/or modify it      *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your     *
* option) any later version.                                                   *
*                                                                              *
* This library is distributed in the hope that it will be useful, but WITHOUT  *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
* for more details.                                                            *
*                                                                              *
* You should have received a copy of the GNU Lesser General Public License     *
* along with this library; if not, write to the Free Software Foundation,      *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
*                                                                              *
* Web site: http://cgogn.unistra.fr/                                           *
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

untereiner's avatar
...    
untereiner committed
25
26
27
28
#include <iostream>
#include "Geometry/bounding_box.h"
#include "Geometry/plane_3d.h"
#include "Algo/BooleanOperator/mergeVertices.h"
untereiner's avatar
untereiner committed
29
#include "Container/fakeAttribute.h"
untereiner's avatar
...    
untereiner committed
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
#include <limits>

namespace CGoGN
{

namespace Algo
{

namespace Import
{

inline bool checkXmlNode(xmlNodePtr node, const std::string& name)
{
	return (strcmp((char*)(node->name),(char*)(name.c_str())) == 0);
}

template<typename T>
inline bool valueOf(const std::string &s, T &obj)
{
  std::istringstream is(s);
  return is >> obj;
}

template <typename VEC>
bool posSort(const std::pair<VEC, Dart>& a1, const std::pair<VEC, Dart>& a2)
{
	VEC v1 = a1.first;
	VEC v2 = a2.first;
	return v1[0] < v2[0] || (v1[0] == v2[0] && v1[1] < v2[1]);
}

template <typename VEC3>
void getPolygonFromSVG(std::string allcoords, std::vector<VEC3>& curPoly, bool& closedPoly)
{
	closedPoly=false;
	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;
			relative=true;
		}
		else if(coord[0]=='M' || coord[0] == 'L' || coord[0]=='T') //same in absolute coordinates
		{
			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
		{
			mode = 3;
			relative=(coord[0]=='v');
		}
		else if(coord[0]=='c' || coord[0] == 'C') //bezier curve
		{
			mode = 4;
			relative=(coord[0]=='c');
		}
		else if(coord[0]=='s' || coord[0] == 'S' || coord[0]=='q' || coord[0] == 'Q') //bezier curve 2
		{
			mode = 5;
			relative= ((coord[0]=='s') || (coord[0]=='q'));
		}
		else if(coord[0]=='a' || coord[0] == 'A') //elliptic arc
		{
			mode =6;
			relative= (coord[0]=='a');
		}
111
		else if(coord[0]=='z') //end of path
untereiner's avatar
...    
untereiner committed
112
113
		{
			closedPoly = true;
Jund Thomas's avatar
Jund Thomas committed
114

untereiner's avatar
...    
untereiner committed
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
		}
		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);

					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);

untereiner's avatar
untereiner committed
146
					VEC3 previous = (curPoly)[(curPoly).size()-1];
untereiner's avatar
...    
untereiner committed
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
					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)
		{

			VEC3 previous;

			if(curPoly.size()>0)
				previous = (curPoly)[(curPoly).size()-1];

			if(relative)
			{
				x += previous[0];
				y += previous[1];
			}

			if(curPoly.size()==0 || (curPoly.size()>0 && (x!=previous[0] || y!= previous[1])))
				curPoly.push_back(VEC3(x,y,0));
		}
	}
}

205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
template <typename PFP>
void readCoordAndStyle(xmlNode* cur_path,
		std::vector<std::vector<VEC3 > >& allPoly,
		std::vector<std::vector<VEC3 > >& allBrokenLines,
		std::vector<float>& allBrokenLinesWidth)
{
	typedef typename PFP::VEC3 VEC3;
	typedef std::vector<VEC3 > POLYGON;

	bool closedPoly;
	POLYGON curPoly;

//	CGoGNout << "--load a path--"<< CGoGNendl;
	xmlChar* prop = xmlGetProp(cur_path, BAD_CAST "d");
	std::string allcoords((reinterpret_cast<const char*>(prop)));
	getPolygonFromSVG(allcoords,curPoly,closedPoly);

	//check orientation : set in CCW
	if(curPoly.size()>2)
	{
Jund Thomas's avatar
Jund Thomas committed
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
		VEC3 v(0), v1, v2;
		typename std::vector<VEC3 >::iterator it0, it1, it2;
		it0 = curPoly.begin();
		it1 = it0+1;
		it2 = it1+1;
		for(unsigned int i = 0 ; i < curPoly.size() ; ++i)
		{
			VEC3 t = (*it1)^(*it0);
			v += t;

			it0=it1;
			it1=it2;
			it2++;
			if(it2 == curPoly.end())
				it2 = curPoly.begin();
		}

		if(v[2]>0)
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
		{
			std::reverse(curPoly.begin(), curPoly.end());
		}
	}

	//closed polygon ?
	if(closedPoly)
		allPoly.push_back(curPoly);
	else
	{
		//if not : read the linewidth for further dilatation
		allBrokenLines.push_back(curPoly);
		xmlChar* prop = xmlGetProp(cur_path, BAD_CAST "style");
		std::string allstyle((reinterpret_cast<const char*>(prop)));
		std::stringstream is(allstyle);
		std::string style;
		while ( std::getline( is, style, ';' ) )
		{
			if(style.find("stroke-width:")!=std::string::npos)
			{
				std::stringstream isSize(style);
				std::getline( isSize, style, ':' );
				float sizeOfLine;
				isSize >> sizeOfLine;
				allBrokenLinesWidth.push_back(sizeOfLine);
			}
		}
	}
}

untereiner's avatar
...    
untereiner committed
273
template <typename PFP>
David Cazier's avatar
David Cazier committed
274
bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttribute<typename PFP::VEC3>& position, CellMarker<EDGE>& obstacleMark, CellMarker<FACE>& buildingMark)
untereiner's avatar
...    
untereiner committed
275
276
{
	typedef typename PFP::VEC3 VEC3;
David Cazier's avatar
David Cazier committed
277
	typedef std::vector<VEC3> POLYGON;
untereiner's avatar
...    
untereiner committed
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298

	xmlDocPtr doc = xmlReadFile(filename.c_str(), NULL, 0);
	xmlNodePtr map_node = xmlDocGetRootElement(doc);

	if (!checkXmlNode(map_node,"svg"))
	{
		CGoGNerr << "Wrong xml format: Root node != svg"<< CGoGNendl;
		return false;
	}

	std::vector<POLYGON> allPoly;
	std::vector<POLYGON> allBrokenLines;
	std::vector<float> allBrokenLinesWidth;

	for (xmlNode* cur_node = map_node->children; cur_node; cur_node = cur_node->next)
	{
		// for each layer
		if (checkXmlNode(cur_node, "g"))
			for (xmlNode* cur_path = cur_node->children ; cur_path; cur_path = cur_path->next)
			{
				if (checkXmlNode(cur_path, "path"))
299
					readCoordAndStyle<PFP>(cur_path, allPoly, allBrokenLines, allBrokenLinesWidth);
untereiner's avatar
...    
untereiner committed
300
			}
301
302
		else if (checkXmlNode(cur_node, "path"))
				readCoordAndStyle<PFP>(cur_node, allPoly, allBrokenLines, allBrokenLinesWidth);
untereiner's avatar
...    
untereiner committed
303
304
305
306
	}

	xmlFreeDoc(doc);

307
308
	std::cout << "importSVG : XML read." << std::endl;

309
	CellMarker<EDGE> brokenMark(map);
310
311
	EdgeAttribute<float> edgeWidth = map.template addAttribute<float, EDGE>("width");
	EdgeAttribute<NoMathAttribute<Geom::Plane3D<typename PFP::REAL> > > edgePlanes = map.template addAttribute<NoMathAttribute<Geom::Plane3D<typename PFP::REAL> >, EDGE>("planes");
untereiner's avatar
...    
untereiner committed
312
313
314
315
316

	/////////////////////////////////////////////////////////////////////////////////////////////
	//create broken lines
	DartMarker brokenL(map);

David Cazier's avatar
David Cazier committed
317
	typename std::vector<POLYGON >::iterator it;
untereiner's avatar
...    
untereiner committed
318
	std::vector<float >::iterator itW = allBrokenLinesWidth.begin();
David Cazier's avatar
David Cazier committed
319
	for(it = allBrokenLines.begin() ; it != allBrokenLines.end() ; ++it, ++itW)
untereiner's avatar
...    
untereiner committed
320
321
322
323
324
325
326
327
	{
		if(it->size()<2)
		{
			it = allBrokenLines.erase(it);
			itW = allBrokenLinesWidth.erase(itW);
		}
		else
		{
David Cazier's avatar
David Cazier committed
328
			Dart d = map.newPolyLine(it->size()-1);
untereiner's avatar
...    
untereiner committed
329

David Cazier's avatar
David Cazier committed
330
			for(typename POLYGON::iterator emb = it->begin(); emb != it->end() ; emb++)
untereiner's avatar
...    
untereiner committed
331
			{
David Cazier's avatar
David Cazier committed
332
333
				brokenL.mark(d);
				brokenL.mark(map.phi2(d));
334

David Cazier's avatar
David Cazier committed
335
				edgeWidth[d] = *itW;
Jund Thomas's avatar
Jund Thomas committed
336
337
				if (*itW == 0)
					std::cout << "importSVG : null path width" << std::endl ;
David Cazier's avatar
David Cazier committed
338
339
				position[d] = *emb;
				d = map.phi1(d);
untereiner's avatar
...    
untereiner committed
340
			}
341
342
		}
	}
David Cazier's avatar
David Cazier committed
343
	std::cout << "importSVG : broken lines created : " << std::endl;
344

untereiner's avatar
...    
untereiner committed
345
	/////////////////////////////////////////////////////////////////////////////////////////////
David Cazier's avatar
David Cazier committed
346
347
	// Merge near vertices
	Algo::BooleanOperator::mergeVertices<PFP>(map,position,1);
348
349
	std::cout << "importSVG : Merging of vertices." << std::endl;

Jund Thomas's avatar
Jund Thomas committed
350
	/////////////////////////////////////////////////////////////////////////////////////////////
Jund Thomas's avatar
Jund Thomas committed
351
352
353
354

	std::cout << "buildings " << allPoly.size() << std::endl;
	unsigned int c = 0;

Jund Thomas's avatar
Jund Thomas committed
355
356
357
	//create polygons
	for(it = allPoly.begin() ; it != allPoly.end() ; ++it)
	{
David Cazier's avatar
David Cazier committed
358
		if(it->size()<3)
Jund Thomas's avatar
Jund Thomas committed
359
360
361
362
363
364
		{
			it = allPoly.erase(it);
		}
		else
		{
			Dart d = map.newFace(it->size());
Jund Thomas's avatar
Jund Thomas committed
365
			c++;
David Cazier's avatar
David Cazier committed
366
367
			buildingMark.mark(d);
			buildingMark.mark(map.phi2(d));
Jund Thomas's avatar
Jund Thomas committed
368

David Cazier's avatar
David Cazier committed
369
			for(typename POLYGON::iterator emb = it->begin(); emb != it->end() ; emb++)
Jund Thomas's avatar
Jund Thomas committed
370
			{
David Cazier's avatar
David Cazier committed
371
				position[d] = *emb;
David Cazier's avatar
David Cazier committed
372
				obstacleMark.mark(d);
David Cazier's avatar
David Cazier committed
373
374
				d = map.phi1(d);
			}
Jund Thomas's avatar
Jund Thomas committed
375
376
377
		}
	}

David Cazier's avatar
David Cazier committed
378
379
380
381
	Geom::BoundingBox<typename PFP::VEC3> bb ;
	bb = Algo::Geometry::computeBoundingBox<PFP>(map, position) ;
	float tailleX = bb.size(0) ;
	float tailleY = bb.size(1) ;
382
	float tailleM = std::max<float>(tailleX, tailleY) / 30 ;
David Cazier's avatar
David Cazier committed
383
384
	std::cout << "bounding box = " << tailleX << " X " << tailleY << std::endl;

Jund Thomas's avatar
Jund Thomas committed
385
386
387
388
389
390
391
392
	for(Dart d = map.begin();d != map.end(); map.next(d))
	{
		if(position[d][0] == position[map.phi1(d)][0] && position[d][1] == position[map.phi1(d)][1])
			std::cout << "prob d " << d << std::endl;
	}

	std::cout << "importSVG : Polygons generated." << std::endl;

untereiner's avatar
...    
untereiner committed
393
	/////////////////////////////////////////////////////////////////////////////////////////////
394
395
	unsigned int count = 0 ;

untereiner's avatar
...    
untereiner committed
396
	//cut the edges to have a more regular sampling
David Cazier's avatar
David Cazier committed
397
398
	TraversorE<typename PFP::MAP> edges(map) ;
	for (Dart d = edges.begin() ; d != edges.end() ; d = edges.next())
399
	{
David Cazier's avatar
David Cazier committed
400
		if (!buildingMark.isMarked(d))
401
402
403
404
		{
			VEC3 p1 = position[d] ;
			VEC3 p2 = position[map.phi1(d)] ;
			VEC3 v  = p2 - p1 ;
David Cazier's avatar
David Cazier committed
405
			float length = v.norm() ;
406

David Cazier's avatar
David Cazier committed
407
			if (length > tailleM)
408
			{
David Cazier's avatar
David Cazier committed
409
				unsigned int nbSeg = (unsigned int)(length / tailleM) ;
410
				v /= nbSeg ;
David Cazier's avatar
David Cazier committed
411
				count += nbSeg ;
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429

				for (unsigned int i = 0 ; i < nbSeg - 1 ; ++i)
					map.cutEdge(d) ;

				brokenL.mark(d);
				brokenL.mark(map.phi2(d));
				Dart dd = map.phi1(d) ;

				for (unsigned int i = 1 ; i < nbSeg ; ++i)
				{
					brokenL.mark(dd);
					brokenL.mark(map.phi2(dd));
					position[dd] = p1 + v * i ;
					dd = map.phi1(dd) ;
				}
			}
		}
	}
David Cazier's avatar
David Cazier committed
430
	std::cout << "importSVG : Subdivision of long edges : " << count << " morceaux."<< std::endl;
David Cazier's avatar
David Cazier committed
431
432
433

	/////////////////////////////////////////////////////////////////////////////////////////////
	//simplify the edges to have a more regular sampling
David Cazier's avatar
David Cazier committed
434
	count = 0 ;
David Cazier's avatar
David Cazier committed
435
436
	for (Dart d = map.begin() ; d != map.end() ; map.next(d))
	{
David Cazier's avatar
David Cazier committed
437
		if(!buildingMark.isMarked(d))
David Cazier's avatar
David Cazier committed
438
439
		{
			bool canSimplify = true ;
David Cazier's avatar
David Cazier committed
440
			while ( canSimplify && ((position[map.phi1(d)] - position[d]).norm() < edgeWidth[d]) )
David Cazier's avatar
David Cazier committed
441
			{
442
443
				if (map.vertexDegree(map.phi1(d)) == 2)
				{
David Cazier's avatar
David Cazier committed
444
					map.uncutEdge(d) ;
David Cazier's avatar
David Cazier committed
445
					count++;
David Cazier's avatar
David Cazier committed
446
				}
447
448
				else
					canSimplify = false ;
David Cazier's avatar
David Cazier committed
449
450
451
			}
		}
	}
David Cazier's avatar
David Cazier committed
452
	std::cout << "importSVG : Downsampling of vertices : " << count << " sommets supprimés." << std::endl;
untereiner's avatar
...    
untereiner committed
453
454
455

	/////////////////////////////////////////////////////////////////////////////////////////////
	//process broken lines
456
457
	CellMarker<EDGE> eMTreated(map) ;
	for (Dart d = map.begin() ; d != map.end() ; map.next(d))
untereiner's avatar
...    
untereiner committed
458
	{
459
		if (brokenL.isMarked(d) && !eMTreated.isMarked(d))
untereiner's avatar
...    
untereiner committed
460
		{
461
462
			eMTreated.mark(d) ;
			//insert a quadrangular face in the broken line
untereiner's avatar
...    
untereiner committed
463
			// -> we convert broken lines to faces to represent their width
464
			// -> the intersection are then closed
untereiner's avatar
...    
untereiner committed
465

466
467
			Dart d1 = d ;
			Dart d2 = map.phi2(d1) ;
468

469
470
			map.unsewFaces(d1) ;
			Dart dN = map.newFace(4) ;
untereiner's avatar
...    
untereiner committed
471

472
473
474
475
476
477
478
			VEC3 p1 = position[d1] ;
			VEC3 p2 = position[d2] ;
			VEC3 v = p2 - p1 ;
			VEC3 ortho = v ^ VEC3(0, 0, 1);
			float width = edgeWidth[d1] / 2.0f ;
			ortho.normalize() ;
			v.normalize() ;
untereiner's avatar
...    
untereiner committed
479
480
481

			//if the valence of one of the vertex is equal to one
			//cut the edge to insert the quadrangular face
Jund Thomas's avatar
Jund Thomas committed
482
			if(map.vertexDegree(d1)==2)
untereiner's avatar
...    
untereiner committed
483
			{
484
485
486
487
				map.cutEdge(d2) ;
				brokenL.mark(map.phi1(d2)) ;
				eMTreated.mark(map.phi1(d2)) ;
				map.sewFaces(map.phi_1(d1), map.phi1(dN)) ;
David Cazier's avatar
David Cazier committed
488
				obstacleMark.mark(map.phi_1(d1)) ;
489
490
				position[map.phi_1(d1)] = p1 ;
				edgePlanes[map.phi_1(d1)] = Geom::Plane3D<typename PFP::REAL>(v, p1) ;
491
			}
untereiner's avatar
...    
untereiner committed
492

Jund Thomas's avatar
Jund Thomas committed
493
			if(map.vertexDegree(d2)==2)
untereiner's avatar
...    
untereiner committed
494
			{
495
496
497
498
				map.cutEdge(d1) ;
				brokenL.mark(map.phi1(d1)) ;
				eMTreated.mark(map.phi1(d1)) ;
				map.sewFaces(map.phi_1(d2), map.phi_1(dN)) ;
David Cazier's avatar
David Cazier committed
499
				obstacleMark.mark(map.phi_1(d2)) ;
500
501
				position[map.phi_1(d2)] = p2 ;
				edgePlanes[map.phi_1(d2)] = Geom::Plane3D<typename PFP::REAL>(-1.0f * v, p2) ;
502
			}
untereiner's avatar
...    
untereiner committed
503

504
			map.sewFaces(d1, dN) ;
David Cazier's avatar
David Cazier committed
505
			obstacleMark.mark(d1) ;
506
			edgePlanes[d1] = Geom::Plane3D<typename PFP::REAL>(ortho, p1 - (width * ortho)) ;
David Cazier's avatar
David Cazier committed
507
508
509

			map.sewFaces(d2, map.phi1(map.phi1(dN))) ;
			obstacleMark.mark(d2) ;
510
			edgePlanes[d2] = Geom::Plane3D<typename PFP::REAL>(-1.0f * ortho, p2 + (width * ortho)) ;
untereiner's avatar
...    
untereiner committed
511
512
513
		}
	}

Jund Thomas's avatar
Jund Thomas committed
514
	if(allBrokenLines.size()>0)
515
	{
Jund Thomas's avatar
Jund Thomas committed
516
		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
517
		{
Jund Thomas's avatar
Jund Thomas committed
518
519
520
521
			if(map.isBoundaryMarked(d))
			{
				map.fillHole(d);
			}
522

Jund Thomas's avatar
Jund Thomas committed
523
524
525
526
			if(map.faceDegree(d)==2)
			{
				map.mergeFaces(d);
			}
527
		}
untereiner's avatar
...    
untereiner committed
528

Jund Thomas's avatar
Jund Thomas committed
529
530
		//embed the path
		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
untereiner's avatar
...    
untereiner committed
531
		{
Jund Thomas's avatar
Jund Thomas committed
532
533
534
			if (brokenL.isMarked(d))
			{
				VEC3 pos;
Jund Thomas's avatar
Jund Thomas committed
535

Jund Thomas's avatar
Jund Thomas committed
536
537
				Geom::Plane3D<typename PFP::REAL> pl;
				pos = position[d] ;
untereiner's avatar
...    
untereiner committed
538

Jund Thomas's avatar
Jund Thomas committed
539
540
541
				pl = edgePlanes[d] ;
				pl.project(pos) ;
				position[d] = pos ;
Jund Thomas's avatar
Jund Thomas committed
542

Jund Thomas's avatar
Jund Thomas committed
543
544
545
546
				pos = position[map.phi1(d)] ;
				pl.project(pos) ;
				position[map.phi1(d)] = pos ;
			}
untereiner's avatar
...    
untereiner committed
547
		}
548
549
550
551
552
553
554
555
556
557
558

		map.template initAllOrbitsEmbedding<FACE>(true);

		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
		{
			if (!map.isBoundaryMarked(d) && brokenL.isMarked(d))
			{
				map.deleteFace(d,false);
			}
		}

Jund Thomas's avatar
Jund Thomas committed
559
		map.closeMap();
560
561
562
563
564
565
566

		for (Dart d = map.begin() ; d != map.end() ; map.next(d))
		{
			if (map.isBoundaryMarked(d))
				buildingMark.mark(d);
		}

Jund Thomas's avatar
Jund Thomas committed
567
	}
568

untereiner's avatar
...    
untereiner committed
569
570
571
	return true ;
}

Pierre Kraemer's avatar
Pierre Kraemer committed
572
} // namespace Import
untereiner's avatar
...    
untereiner committed
573

Pierre Kraemer's avatar
Pierre Kraemer committed
574
} // namespace Algo
untereiner's avatar
...    
untereiner committed
575

Pierre Kraemer's avatar
Pierre Kraemer committed
576
} // namespace CGoGN