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

topo3Render.hpp 15.7 KB
Newer Older
Pierre Kraemer's avatar
Pierre Kraemer committed
1
2
3
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
* version 0.1                                                                  *
4
* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg           *
Pierre Kraemer's avatar
Pierre Kraemer committed
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
*                                                                              *
* 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.           *
*                                                                              *
20
* Web site: http://cgogn.u-strasbg.fr/                                         *
Pierre Kraemer's avatar
Pierre Kraemer committed
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/

#include "Geometry/vector_gen.h"
#include "Topology/generic/autoAttributeHandler.h"
#include "Topology/generic/dartmarker.h"
#include "Topology/generic/cellmarker.h"

#include "Topology/map/map3.h"
#include "Topology/gmap/gmap3.h"


namespace CGoGN
{

namespace Algo
{

namespace Render
{

Sylvain Thery's avatar
Sylvain Thery committed
43
namespace GL2
Pierre Kraemer's avatar
Pierre Kraemer committed
44
45
46
{

template<typename PFP>
47
void Topo3RenderMapD::updateData(typename PFP::MAP& map, const FunctorSelect& good, const typename PFP::TVEC3& positions, float ke, float kf, float kv)
Pierre Kraemer's avatar
Pierre Kraemer committed
48
49
50
51
52
53
54
{
	typedef typename PFP::VEC3 VEC3;
	typedef typename PFP::REAL REAL;


	if (m_attIndex.map() != &map)
	{
Sylvain Thery's avatar
Sylvain Thery committed
55
56
57
		m_attIndex  = map.template getAttribute<unsigned int>(DART, "dart_index");
		if (!m_attIndex.isValid())
			m_attIndex  = map.template addAttribute<unsigned int>(DART, "dart_index");
Pierre Kraemer's avatar
Pierre Kraemer committed
58
59
	}

Sylvain Thery's avatar
Sylvain Thery committed
60
61


Pierre Kraemer's avatar
Pierre Kraemer committed
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
	m_nbDarts = 0;

	// table of center of volume
	std::vector<VEC3> vecCenters;
	vecCenters.reserve(1000);
	// table of nbfaces per volume
	std::vector<unsigned int> vecNbFaces;
	vecNbFaces.reserve(1000);
	// table of face (one dart of each)
	std::vector<Dart> vecDartFaces;
	vecDartFaces.reserve(map.getNbDarts()/4);

	DartMarker mark(map);					// marker for darts
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
		if (good(d))
		{
79
			CellMarkerStore markVert(map, VERTEX);		//marker for vertices
Pierre Kraemer's avatar
Pierre Kraemer committed
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
111
112
113
114
115
116
117
118
			VEC3 center(0, 0, 0);
			unsigned int nbv = 0;
			unsigned int nbf = 0;
			std::list<Dart> visitedFaces;	// Faces that are traversed
			visitedFaces.push_back(d);		// Start with the face of d

			// For every face added to the list
			for (std::list<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
			{
				if (!mark.isMarked(*face))		// Face has not been visited yet
				{
					// store a dart of face
					vecDartFaces.push_back(*face);
					nbf++;
					Dart dNext = *face ;
					do
					{
						if (!markVert.isMarked(dNext))
						{
							markVert.mark(dNext);
							center += positions[dNext];
							nbv++;
						}
						mark.mark(dNext);					// Mark
						m_nbDarts++;
						Dart adj = map.phi2(dNext);				// Get adjacent face
						if (adj != dNext && !mark.isMarked(adj))
							visitedFaces.push_back(adj);	// Add it
						dNext = map.phi1(dNext);
					} while(dNext != *face);
				}
			}
			center /= typename PFP::REAL(nbv);
			vecCenters.push_back(center);
			vecNbFaces.push_back(nbf);
		}
	}

	// debut phi1
119
	AutoAttributeHandler<VEC3> fv1(map, DART);
Pierre Kraemer's avatar
Pierre Kraemer committed
120
	// fin phi1
121
	AutoAttributeHandler<VEC3> fv11(map, DART);
Pierre Kraemer's avatar
Pierre Kraemer committed
122
123

	// phi2
124
125
	AutoAttributeHandler<VEC3> fv2(map, DART);
	AutoAttributeHandler<VEC3> fv2x(map, DART);
Pierre Kraemer's avatar
Pierre Kraemer committed
126

127
128
129
	m_vbo4->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* ColorDartsBuffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
Pierre Kraemer's avatar
Pierre Kraemer committed
130
131
	VEC3* colorDartBuf = reinterpret_cast<VEC3*>(ColorDartsBuffer);

132
133
134
	m_vbo0->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* PositionDartsBuffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
Pierre Kraemer's avatar
Pierre Kraemer committed
135
136
137
138
139
140
141
142
143
144
145
146
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
	VEC3* positionDartBuf = reinterpret_cast<VEC3*>(PositionDartsBuffer);
	unsigned int posDBI=0;



	std::vector<Dart>::iterator face = vecDartFaces.begin();
	for (unsigned int iVol=0; iVol<vecNbFaces.size(); ++iVol)
	{
		for (unsigned int iFace = 0; iFace < vecNbFaces[iVol]; ++iFace)
		{
			Dart d = *face++;

			std::vector<VEC3> vecPos;
			vecPos.reserve(16);

			// store the face & center
			VEC3 center(0, 0, 0);
			Dart dd = d;
			do
			{
				const VEC3& P = positions[d];
				vecPos.push_back(P);
				m_attIndex[d] = posDBI;
				posDBI+=2;
				center += P;
				d = map.phi1(d);
			} while (d != dd);
			center /= REAL(vecPos.size());

			//shrink the face
			unsigned int nb = vecPos.size();
			float okf = 1.0f - kf;
			float okv = 1.0f - kv;
			for (unsigned int i = 0; i < nb; ++i)
			{
				vecPos[i] = vecCenters[iVol]*okv + vecPos[i]*kv;
				vecPos[i] = center*okf + vecPos[i]*kf;
			}
			vecPos.push_back(vecPos.front()); // copy the first for easy computation on next loop

			// compute position of points to use for drawing topo
			float oke = 1.0f - ke;
			for (unsigned int i = 0; i < nb; ++i)
			{
				VEC3 P = vecPos[i]*ke + vecPos[i+1]*oke;
				VEC3 Q = vecPos[i+1]*ke + vecPos[i]*oke;

				*positionDartBuf++ = P;
				*positionDartBuf++ = Q;
				*colorDartBuf++ = VEC3(1.,1.,1.);
				*colorDartBuf++ = VEC3(1.,1.,1.);

				fv1[d] = P*0.1f + Q*0.9f;
				fv11[d] = P*0.9f + Q*0.1f;

				fv2[d] = P*0.52f + Q*0.48f;
				fv2x[d] = P*0.48f + Q*0.52f;

				d = map.phi1(d);
			}

		}
	}

199
200
	m_vbo0->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);
Pierre Kraemer's avatar
Pierre Kraemer committed
201
202

	// phi1
203
204
	m_vbo1->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(typename PFP::VEC3), 0, GL_STREAM_DRAW);
Pierre Kraemer's avatar
Pierre Kraemer committed
205
206
207
	GLvoid* PositionBuffer1 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	//phi2
208
209
	m_vbo2->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(typename PFP::VEC3), 0, GL_STREAM_DRAW);
Pierre Kraemer's avatar
Pierre Kraemer committed
210
211
212
	GLvoid* PositionBuffer2 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	//phi3
213
214
	m_vbo3->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(typename PFP::VEC3), 0, GL_STREAM_DRAW);
Pierre Kraemer's avatar
Pierre Kraemer committed
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
	GLvoid* PositionBuffer3 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	VEC3* positionF1 = reinterpret_cast<VEC3*>(PositionBuffer1);
	VEC3* positionF2 = reinterpret_cast<VEC3*>(PositionBuffer2);
	VEC3* positionF3 = reinterpret_cast<VEC3*>(PositionBuffer3);

	m_nbRel2=0;
	m_nbRel3=0;

	for(std::vector<Dart>::iterator face = vecDartFaces.begin(); face != vecDartFaces.end(); ++face)
	{
		Dart d = *face;
		do
		{
			Dart e = map.phi2(d);
			if (d < e)
			{
				*positionF2++ = fv2[d];
				*positionF2++ = fv2x[e];
				*positionF2++ = fv2[e];
				*positionF2++ = fv2x[d];
				m_nbRel2++;
			}
			e = map.phi3(d);
239
			if (!map.isBoundaryFace(d) && (d < e))
Pierre Kraemer's avatar
Pierre Kraemer committed
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
			{
				*positionF3++ = fv2[d];
				*positionF3++ = fv2x[e];
				*positionF3++ = fv2[e];
				*positionF3++ = fv2x[d];
				m_nbRel3++;
			}
			e = map.phi1(d);
			*positionF1++ = fv1[d];
			*positionF1++ = fv11[e];

			d = map.phi1(d);
		} while (d != *face );
	}

255
256
	m_vbo3->bind();
	glUnmapBufferARB(GL_ARRAY_BUFFER);
Pierre Kraemer's avatar
Pierre Kraemer committed
257

258
259
	m_vbo2->bind();
	glUnmapBufferARB(GL_ARRAY_BUFFER);
Pierre Kraemer's avatar
Pierre Kraemer committed
260

261
262
	m_vbo1->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);
Pierre Kraemer's avatar
Pierre Kraemer committed
263

264
265
	m_vbo4->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);
Pierre Kraemer's avatar
Pierre Kraemer committed
266
}
Sylvain Thery's avatar
Sylvain Thery committed
267

268
template<typename PFP>
269
void Topo3Render::setDartsIdColor(typename PFP::MAP& map, const FunctorSelect& good)
270
271
{

272
273
	m_vbo4->bind();
	float* colorBuffer =  reinterpret_cast<float*>(glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE));
274
275
276
277
278
279
280
281
	unsigned int nb=0;

	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
		if (nb < m_nbDarts)
		{
			if (good(d))
			{
Sylvain Thery's avatar
Sylvain Thery committed
282
283
284
285
286
287
288
289
290
				float r,g,b;
				dartToCol(d, r,g,b);
				float* local = colorBuffer+3*m_attIndex[d]; // get the right position in VBO
				*local++ = r;
				*local++ = g;
				*local++ = b;
				*local++ = r;
				*local++ = g;
				*local++ = b;
291
292
293
294
295
296

				nb++;
			}
		}
		else
		{
297
			CGoGNerr << "Error buffer too small for color picking (change the good parameter ?)" << CGoGNendl;
298
299
300
			d = map.end();
		}
	}
301
	glUnmapBuffer(GL_ARRAY_BUFFER);
302
303
}

Sylvain Thery's avatar
Sylvain Thery committed
304
305
306
307
308
309
310
311
312
313
template<typename PFP>
Dart Topo3Render::picking(typename PFP::MAP& map, const FunctorSelect& good, int x, int y)
{
	pushColors();
	setDartsIdColor<PFP>(map,good);
	Dart d = pickColor(x,y);
	popColors();
	return d;
}

Thomas's avatar
Thomas committed
314
315
316
317
318
319
320
321
322
323
324
template<typename PFP>
void Topo3RenderGMap::updateData(typename PFP::MAP& map, const FunctorSelect& good, const typename PFP::TVEC3& positions, float kd, float ke, float kf, float kv)
{
	typedef typename PFP::VEC3 VEC3;
	typedef typename PFP::REAL REAL;

	AutoAttributeHandler<Geom::Vec3f> posBeta1(map, DART);
	AutoAttributeHandler<Geom::Vec3f> posBeta2(map, DART); //beta 3 link is represented at the same location as beta2
	AutoAttributeHandler<Geom::Vec3f> posBeta2x(map, DART); //beta 3 link is represented at the same location as beta2
	AutoAttributeHandler<Geom::Vec3f> vert(map, DART);

325
	if (m_attIndex.map() != &map)
Thomas's avatar
Thomas committed
326
	{
Sylvain Thery's avatar
Sylvain Thery committed
327
328
329
		m_attIndex  = map.template getAttribute<unsigned int>(DART, "dart_index");
		if (!m_attIndex.isValid())
			m_attIndex  = map.template addAttribute<unsigned int>(DART, "dart_index");
Thomas's avatar
Thomas committed
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
	}

	m_nbDarts = 0;

	// table of face (one dart of each)
	std::vector<Dart> vecDartFaces;
	vecDartFaces.reserve(map.getNbDarts()/6); //6 = nb of darts for tri mesh

	// table of nbfaces per volume
	std::vector<unsigned int> vecNbFaces;
	vecNbFaces.reserve(vecDartFaces.size());

	// table of center of volume
	std::vector<VEC3> vecVolCenters;
	vecVolCenters.reserve(vecDartFaces.size()/4); // = nb of volumes for a tetra mesh

	DartMarker mark(map);					// marker for darts
	CellMarker mVol(map, VOLUME);
	for (Dart d = map.begin(); d != map.end(); map.next(d))
	{
		if(!mVol.isMarked(d))
		{
			mVol.mark(d);
			CellMarkerStore markVert(map, VERTEX);		//marker for vertices
			VEC3 center(0);
			unsigned int nbVertices = 0;
			unsigned int nbFace = 0;
			std::list<Dart> visitedFaces;	// Faces that are traversed
			visitedFaces.push_back(d);		// Start with the face of d

			// For every face added to the list
			for (std::list<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
			{
				if (!mark.isMarked(*face))		// Face has not been visited yet
				{
					// store a dart of face
					vecDartFaces.push_back(*face);
					nbFace++;
					Dart dNext = *face ;
					do
					{
						mark.mark(dNext); // Mark
						m_nbDarts++;

						if (!markVert.isMarked(dNext))
						{
							markVert.mark(dNext);
							center += positions[dNext];
							nbVertices++;
						}

						Dart adj = map.phi2(dNext); // add adjacent face if not done already
						if (adj != dNext && !mark.isMarked(adj))
							visitedFaces.push_back(adj);

						dNext = map.phi1(dNext);
					} while(dNext != *face);
				}
			}
			center /= typename PFP::REAL(nbVertices);
			vecVolCenters.push_back(center);
			vecNbFaces.push_back(nbFace);
		}
	}

Thomas's avatar
Thomas committed
395
	m_nbDarts *= 2; // x2 : only one orientation is used for the previous computation, multiply by 2 to get the number of darts
Thomas's avatar
Thomas committed
396

Thomas's avatar
Thomas committed
397
	//colors
Thomas's avatar
Thomas committed
398
399
400
401
402
	m_vbo4->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* ColorDartsBuffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
	VEC3* colorDartBuf = reinterpret_cast<VEC3*>(ColorDartsBuffer);

Thomas's avatar
Thomas committed
403
	//darts
Thomas's avatar
Thomas committed
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
	m_vbo0->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* PositionDartsBuffer = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
	VEC3* positionDartBuf = reinterpret_cast<VEC3*>(PositionDartsBuffer);
	unsigned int posDBI=0;

	std::vector<Dart>::iterator face = vecDartFaces.begin();
	for (unsigned int iVol=0; iVol<vecNbFaces.size(); ++iVol)
	{
		for (unsigned int iFace = 0; iFace < vecNbFaces[iVol]; ++iFace)
		{
			Dart d = *face++;

			std::vector<VEC3> vecPos;
			vecPos.reserve(16);

			// store the face & center
			VEC3 center(0);
			Dart dd = d;
			do
			{
				const VEC3& P = positions[dd];
				vecPos.push_back(P);
Thomas's avatar
Thomas committed
427
428
429
				m_attIndex[dd] = posDBI;
				posDBI+=2;
				m_attIndex[map.beta0(dd)] = posDBI; //for gmap : also affect a number to the other orientation for picking
Thomas's avatar
Thomas committed
430
				posDBI+=2;
Thomas's avatar
Thomas committed
431

Thomas's avatar
Thomas committed
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
				center += P;
				dd = map.phi1(dd);
			} while (dd != d);
			center /= REAL(vecPos.size());


			//shrink the face
			unsigned int nb = vecPos.size();
			float okf = 1.0f - kf;
			float okv = 1.0f - kv;
			for (unsigned int i = 0; i < nb; ++i)
			{
				vecPos[i] = vecVolCenters[iVol]*okv + vecPos[i]*kv;
				vecPos[i] = center*okf + vecPos[i]*kf;
			}
			vecPos.push_back(vecPos.front()); // copy the first for easy computation on next loop

			// compute position of points to use for drawing topo
			float oke = 1.0f - ke;
			for (unsigned int i = 0; i < nb; ++i)
			{
				VEC3 P = vecPos[i]*ke + vecPos[i+1]*oke;
				VEC3 Q = vecPos[i+1]*ke + vecPos[i]*oke;

				VEC3 P_mid = P+(Q-P)*kd*0.5f;
				VEC3 Q_mid = Q+(P-Q)*kd*0.5f;

				vert[d] = P;

				*positionDartBuf++ = P;
				*positionDartBuf++ = P_mid;
				*colorDartBuf++ = VEC3(1.,1.,1.);
				*colorDartBuf++ = VEC3(1.,1.,1.);

//					glColor3f(0.0f,0.0f,1.0f);
//					glVertex3fv(P_mid.data());
//					glVertex3fv(Q_mid.data());
//					glColor3f(1.0f,1.0f,1.0f);

				*positionDartBuf++ = Q;
				*positionDartBuf++ = Q_mid;
				*colorDartBuf++ = VEC3(1.,1.,1.);
				*colorDartBuf++ = VEC3(1.,1.,1.);

				posBeta1[d] = P*0.9f + P_mid*0.1f;
				posBeta1[map.beta0(d)] = Q*0.9f + Q_mid*0.1f;

				posBeta2[d] = P*0.52f + P_mid*0.48f;
				posBeta2x[d] = P*0.48f + P_mid*0.52f;
				posBeta2[map.beta0(d)] = Q*0.52f + Q_mid*0.48f;
				posBeta2x[map.beta0(d)] = Q*0.48f + Q_mid*0.52f;

				d = map.phi1(d);
			}
		}
	}

	//beta1
	m_vbo1->bind();
	glBufferData(GL_ARRAY_BUFFER, m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* PositionBuffer1 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	//beta2
	m_vbo2->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* PositionBuffer2 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	//beta3
	m_vbo3->bind();
	glBufferData(GL_ARRAY_BUFFER, 2*m_nbDarts*sizeof(VEC3), 0, GL_STREAM_DRAW);
	GLvoid* PositionBuffer3 = glMapBufferARB(GL_ARRAY_BUFFER, GL_READ_WRITE);

	VEC3* positionF1 = reinterpret_cast<VEC3*>(PositionBuffer1);
	VEC3* positionF2 = reinterpret_cast<VEC3*>(PositionBuffer2);
	VEC3* positionF3 = reinterpret_cast<VEC3*>(PositionBuffer3);

	m_nbRel2=0;
	m_nbRel3=0;

	//draw beta1, beta2, beta3 if required
	for(Dart d = map.begin(); d != map.end(); map.next(d))
	{
		Dart e = map.beta2(d);
		if ((d<e))
		{
			glColor3f(1.0,0.0,0.0);
			*positionF2++ = posBeta2[d];
			*positionF2++ = posBeta2x[d];
			*positionF2++ = posBeta2x[e];
			*positionF2++ = posBeta2[e];
			m_nbRel2++;
		}

		e = map.beta3(d);
		if ((d<e))
		{
			glColor3f(1.0,1.0,0.0);
			*positionF3++ = posBeta2[d];
			*positionF3++ = posBeta2x[d];
			*positionF3++ = posBeta2x[e];
			*positionF3++ = posBeta2[e];
			m_nbRel3++;
		}

		e = map.beta1(d);
		if ((d<e))
		{
			e = map.beta1(d);
			*positionF1++ = posBeta1[d];
			*positionF1++ = posBeta1[e];
		}
	}

	m_vbo3->bind();
	glUnmapBufferARB(GL_ARRAY_BUFFER);

	m_vbo2->bind();
	glUnmapBufferARB(GL_ARRAY_BUFFER);

	m_vbo1->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);

	m_vbo0->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);

	m_vbo4->bind();
	glUnmapBuffer(GL_ARRAY_BUFFER);

}

Sylvain Thery's avatar
Sylvain Thery committed
562

563

Pierre Kraemer's avatar
Pierre Kraemer committed
564
565
566
567
568
569
570
}//end namespace VBO

}//end namespace Algo

}//end namespace Render

}//end namespace CGoGN