qtgl.cpp 12.9 KB
Newer Older
Sylvain Thery's avatar
Sylvain Thery 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           *
Sylvain Thery's avatar
Sylvain Thery 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/                                         *
Sylvain Thery's avatar
Sylvain Thery committed
21
22
23
* Contact information: cgogn@unistra.fr                                        *
*                                                                              *
*******************************************************************************/
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
24

Sylvain Thery's avatar
Sylvain Thery committed
25
26
27
28
29
30
#include <GL/glew.h>
#include <iostream>
#include "Utils/qtgl.h"
#include "Utils/trackball.h"

#include "Utils/qtSimple.h"
31
#include "glm/gtc/type_precision.hpp"
32
#include "Utils/GLSLShader.h"
Sylvain Thery's avatar
Sylvain Thery committed
33
34
35

namespace CGoGN
{
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
36

Sylvain Thery's avatar
Sylvain Thery committed
37
38
namespace Utils
{
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
39

Sylvain Thery's avatar
Sylvain Thery committed
40
41
42
namespace QT
{

Pierre Kraemer's avatar
Pierre Kraemer committed
43
float GLWidget::FAR_PLANE = 500.0f;
44

Sylvain Thery's avatar
Sylvain Thery committed
45
GLWidget::GLWidget(SimpleQT* cbs, QWidget *parent) :
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
46
47
	QGLWidget(QGLFormat(QGL::Rgba | QGL::DoubleBuffer| QGL::DepthBuffer), parent),
	m_cbs(cbs),
Pierre Kraemer's avatar
Pierre Kraemer committed
48
49
	m_state_modifier(0),
	allow_rotation(true)
Sylvain Thery's avatar
Sylvain Thery committed
50
51
52
53
54
{
	makeCurrent();
	glewInit();

	newModel = 1;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
55
56
	m_cbs->trans_x() = 0.;
	m_cbs->trans_y() = 0.;
Sylvain Thery's avatar
Sylvain Thery committed
57
	float f = FAR_PLANE;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
58
59
	m_cbs->trans_z() = -f / 5.0f;
	foc = 2.0f;
Sylvain Thery's avatar
Sylvain Thery committed
60
61

	// init trackball
62
	trackball(m_cbs->curquat(), 0.0f, 0.0f, 0.0f, 0.0f);
Sylvain Thery's avatar
Sylvain Thery committed
63
64
65
66
67
68
69
70
}

GLWidget::~GLWidget()
{
}

void GLWidget::setParamObject(float width, float* pos)
{
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
71
72
	m_obj_sc = ((FAR_PLANE / 5.0f) / foc) / width;
	m_obj_pos = glm::vec3(-pos[0], -pos[1], -pos[2]);
Sylvain Thery's avatar
Sylvain Thery committed
73
74
}

Pierre Kraemer's avatar
Pierre Kraemer committed
75
76
77
78
79
void GLWidget::setRotation(bool b)
{
	allow_rotation = b;
}

Sylvain Thery's avatar
Sylvain Thery committed
80
81
void  GLWidget::setFocal(float df)
{
82
83
	if (df > 5.0f)
		df = 5.0f;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
84
85
	if (df < 0.2f)
		df = 0.2f;
Sylvain Thery's avatar
Sylvain Thery committed
86

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
87
	m_obj_sc *= foc / df;
Sylvain Thery's avatar
Sylvain Thery committed
88
89

	foc = df;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
90
	resizeGL(W, H);
Sylvain Thery's avatar
Sylvain Thery committed
91
92
93
94
95
96
97
98
99
100
101
102
103
104
}

QSize GLWidget::minimumSizeHint() const
{
    return QSize(200, 200);
}

QSize GLWidget::sizeHint() const
{
    return QSize(500, 500);
}

void GLWidget::recalcModelView()
{
105
106
107
108
109
110
	m_cbs->modelViewMatrix()= glm::mat4(1.0f);

	// positionne l'objet / mvt souris
	oglTranslate(m_cbs->trans_x(), m_cbs->trans_y(), m_cbs->trans_z());

	// tourne l'objet / mvt souris
Sylvain Thery's avatar
Sylvain Thery committed
111
	glm::mat4 m;
112
	build_rotmatrixgl3(m, m_cbs->curquat());
Pierre Kraemer's avatar
Pierre Kraemer committed
113
	// update matrice
114
	m_cbs->modelViewMatrix() *= m;
Sylvain Thery's avatar
Sylvain Thery committed
115

116
117
118
119
	// transfo pour que l'objet soit centre et a la bonne taille
	oglScale(m_obj_sc, m_obj_sc, m_obj_sc);
	oglTranslate(m_obj_pos[0], m_obj_pos[1], m_obj_pos[2]);

120
121
122
	// ajout transformation
//	m_cbs->modelViewMatrix() *=m_cbs->transfoMatrix();

123
124
125
126
127
128
129
130
	newModel = 0;

	if (m_cbs)
		m_cbs->cb_updateMatrix();
}

void GLWidget::changeCenterOfRotation(const glm::vec3& newCenter)
{
131
	glm::mat4 storeMVM(m_cbs->modelViewMatrix());
132

133
	m_cbs->modelViewMatrix() = glm::mat4(1.0f);
134

Sylvain Thery's avatar
Sylvain Thery committed
135
	// positionne l'objet / mvt souris
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
136
	oglTranslate(m_cbs->trans_x(), m_cbs->trans_y(), m_cbs->trans_z());
Sylvain Thery's avatar
Sylvain Thery committed
137
138

	// tourne l'objet / mvt souris
139
	glm::mat4 m;
140
	build_rotmatrixgl3(m, m_cbs->curquat());
Sylvain Thery's avatar
Sylvain Thery committed
141
142
143
	// update matrice
	m_cbs->modelViewMatrix() *= m;

144
145
146
	// ajout transformation in screen
	m_cbs->modelViewMatrix()*= m_cbs->transfoMatrix();

Sylvain Thery's avatar
Sylvain Thery committed
147
	// transfo pour que l'objet soit centre et a la bonne taille
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
148
	oglScale(m_obj_sc, m_obj_sc, m_obj_sc);
Sylvain Thery's avatar
Sylvain Thery committed
149
150
	oglTranslate(m_obj_pos[0], m_obj_pos[1], m_obj_pos[2]);

151
	oglTranslate(newCenter[0], newCenter[1], newCenter[2]);
152
	oglScale(1.0f / m_obj_sc, 1.0f / m_obj_sc, 1.0f / m_obj_sc);
Sylvain Thery's avatar
Sylvain Thery committed
153

154
	m = glm::inverse(m_cbs->transfoMatrix());
155
	m_cbs->modelViewMatrix() *= m;
156
157
158
159
160
161

	matrix_to_quat( m_cbs->curquat(), m_cbs->modelViewMatrix());

	m_cbs->trans_x() = m_cbs->modelViewMatrix()[3][0];
	m_cbs->trans_y() = m_cbs->modelViewMatrix()[3][1];
	m_cbs->trans_z() = m_cbs->modelViewMatrix()[3][2];
162

163
	m_cbs->modelViewMatrix() = storeMVM;
164

165
	m_obj_pos = glm::vec3(-newCenter[0], -newCenter[1], -newCenter[2]);
Sylvain Thery's avatar
Sylvain Thery committed
166
167
}

168
169
170
171
glm::vec3& GLWidget::getObjPos()
{
	return m_obj_pos ;
}
172

Sylvain Thery's avatar
Sylvain Thery committed
173
174
175
176
177
178
179
180
181
182
void GLWidget::initializeGL()
{
	glEnable(GL_DEPTH_TEST);

	if (m_cbs)
		m_cbs->cb_initGL();
}

void GLWidget::resizeGL(int w, int h)
{
Sylvain Thery's avatar
Sylvain Thery committed
183
184
	W = w;
	H = h;
Sylvain Thery's avatar
Sylvain Thery committed
185

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
186
	glViewport(0, 0, W, H);
Sylvain Thery's avatar
Sylvain Thery committed
187
	float f = FAR_PLANE;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
188
	m_cbs->projectionMatrix() = glm::frustum(-1.0f, 1.0f, -1.0f * H / W, 1.0f * H / W, foc, f);
Sylvain Thery's avatar
Sylvain Thery committed
189
190
191
192
193
194
195
196
197
198
199

	recalcModelView();
}

void GLWidget::paintGL()
{
	if (newModel)
	    recalcModelView();

	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
	if (m_cbs)
200
201
	{
		Utils::GLSLShader::s_current_matrices = m_cbs->matricesPtr();
Sylvain Thery's avatar
Sylvain Thery committed
202
		m_cbs->cb_redraw();
203
	}
Sylvain Thery's avatar
Sylvain Thery committed
204
205
206
207
208
209
}

void GLWidget::mousePressEvent(QMouseEvent* event)
{
	beginx = event->x();
	beginy = event->y();
210
	clickPoint = event->pos();
Sylvain Thery's avatar
Sylvain Thery committed
211
212
213
	m_current_button = event->button();

	if (m_cbs)
214
		m_cbs->cb_mousePress(event->button(), event->x(), getHeight() - event->y());
Sylvain Thery's avatar
Sylvain Thery committed
215
216
217
218
219
}

void GLWidget::mouseReleaseEvent(QMouseEvent* event)
{
	if (m_cbs)
220
221
222
223
		m_cbs->cb_mouseRelease(event->button(), event->x(), getHeight() - event->y());

	if(event->pos() == clickPoint)
		mouseClickEvent(event) ;
Sylvain Thery's avatar
Sylvain Thery committed
224
225
}

226
void GLWidget::mouseClickEvent(QMouseEvent* event)
Sylvain Thery's avatar
Sylvain Thery committed
227
{
228

229
230
231
	if (m_cbs)
		m_cbs->cb_mouseClick(event->button(), event->x(), getHeight() - event->y());
}
Sylvain Thery's avatar
Sylvain Thery committed
232

233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
void GLWidget::mouseDoubleClickEvent(QMouseEvent* event)
{
	if (event->button()==1)
	{
		GLint x = event->x();
		GLint y = getHeight() - event->y();
		GLfloat depth;
		glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
		if (depth < 1.0f)
		{
			glm::i32vec4 viewport;
			glGetIntegerv(GL_VIEWPORT, &(viewport[0]));
			glm::vec3 win(x, y, depth);
			glm::vec3 P = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);
			changeCenterOfRotation(P);
		}
	}
}

252
253
void GLWidget::mouseMoveEvent(QMouseEvent* event)
{
254
	// move object only if no special keys pressed
255
	if (!(m_state_modifier & ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)))
Sylvain Thery's avatar
Sylvain Thery committed
256
	{
257
258
259
260
		int x = event->x();
		int y = event->y();

		switch (m_current_button)
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
261
		{
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
			case Qt::RightButton:
			{
				float wl;
				if (m_cbs->trans_z() > -20.0f)
					wl = 20.0f / foc;
				else
					wl = -2.0f * m_cbs->trans_z() / foc;
				m_cbs->trans_x() += wl / W * (x - beginx);
				m_cbs->trans_y() += wl / H * (beginy - y);
			}
				break;
			case Qt::MidButton:
			{
				float wl = -0.5f * FAR_PLANE / foc;
				m_cbs->trans_z() -= wl / W * (x - beginx);
				m_cbs->trans_z() -= wl / H * (y - beginy);
			}
				break;
			case Qt::LeftButton:
			{
Pierre Kraemer's avatar
Pierre Kraemer committed
282
283
284
285
286
287
288
289
290
291
				if(allow_rotation)
				{
					trackball(
						m_cbs->lastquat(),
						(2.0f * beginx - W) / W,
						(H - 2.0f * beginy) / H,
						(2.0f * x - W) / W,(H - 2.0f * y) / H
					);
					add_quats(m_cbs->lastquat(), m_cbs->curquat(), m_cbs->curquat());
				}
292
293
			}
				break;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
294
295
		}

296
297
298
299
300
		beginx = x;
		beginy = y;
		newModel = 1;
		updateGL();
	}
Sylvain Thery's avatar
Sylvain Thery committed
301
302

	if (m_cbs)
Sylvain Thery's avatar
Sylvain Thery committed
303
		m_cbs->cb_mouseMove(event->buttons(), event->x(), getHeight() - event->y());
Sylvain Thery's avatar
Sylvain Thery committed
304
305
}

306
void GLWidget::wheelEvent(QWheelEvent* event)
Sylvain Thery's avatar
Sylvain Thery committed
307
{
308
309
310
	if (!(m_state_modifier & ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)))
	{
		float wl = -0.05f * FAR_PLANE / foc;
Sylvain Thery's avatar
Sylvain Thery committed
311

312
313
314
315
		if (event->delta() > 0)
			m_cbs->trans_z() += wl;
		else
			m_cbs->trans_z() -= wl;
Sylvain Thery's avatar
Sylvain Thery committed
316

317
318
319
		newModel = 1;
		updateGL();
	}
Pierre Kraemer's avatar
Pierre Kraemer committed
320
321
322

	if (m_cbs)
		m_cbs->cb_wheelEvent(event->delta(), event->x(), getHeight() - event->y());
Sylvain Thery's avatar
Sylvain Thery committed
323
324
}

325
326
327
328
329
330
void GLWidget::closeEvent(QCloseEvent *event)
{
	if (m_cbs)
		m_cbs->cb_exit() ;
}

331
void GLWidget::keyPressEvent(QKeyEvent* event)
Sylvain Thery's avatar
Sylvain Thery committed
332
{
333
	if (event->key() == Qt::Key_Escape)
Pierre Kraemer's avatar
Pierre Kraemer committed
334
		close();
Sylvain Thery's avatar
Sylvain Thery committed
335

Pierre Kraemer's avatar
Pierre Kraemer committed
336
	m_state_modifier = event->modifiers();
Sylvain Thery's avatar
Sylvain Thery committed
337

Pierre Kraemer's avatar
Pierre Kraemer committed
338
	int k = event->key();
339
340
	if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) )
		k += 32;
Sylvain Thery's avatar
Sylvain Thery committed
341

Pierre Kraemer's avatar
Pierre Kraemer committed
342
	if (m_cbs)
Sylvain Thery's avatar
Sylvain Thery committed
343
344
345
346
347
		m_cbs->cb_keyPress(k);
}

void GLWidget::keyReleaseEvent(QKeyEvent *event)
{
348
//	QWidget::keyReleaseEvent(event);
Sylvain Thery's avatar
Sylvain Thery committed
349

Sylvain Thery's avatar
Sylvain Thery committed
350
351
	m_state_modifier = event->modifiers();
    int k = event->key();
352
353

    // align on axis
354
	if ((k == 'Z') && (event->modifiers() & Qt::ShiftModifier))
355
	{
356
357
358
	    float Z[3] = { 0.0f, 0.0f, 1.0f };
		axis_to_quat(Z, 0.0f, m_cbs->curquat());
		newModel = 1;
359
360
361
		updateGL();
	}

362
	if ((k == 'Y') && (event->modifiers() & Qt::ShiftModifier))
363
	{
364
365
366
		float X[3] = { 1.0f, 0.0f, 0.0f };
		axis_to_quat(X, M_PI / 2.0f, m_cbs->curquat());
		newModel = 1;
367
368
369
		updateGL();
	}

370
	if ((k == 'X') && (event->modifiers() & Qt::ShiftModifier))
371
	{
372
373
374
		float Y[3] = { 0.0f, 1.0f, 0.0f };
		axis_to_quat(Y, -M_PI / 2.0f, m_cbs->curquat());
		newModel = 1;
375
376
377
		updateGL();
	}

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
378
    if ( (k >= 65) && (k <= 91) && (event->modifiers() != Qt::ShiftModifier) )
379
    	k += 32;
Sylvain Thery's avatar
Sylvain Thery committed
380
381
382
383
384

	if (m_cbs)
		m_cbs->cb_keyRelease(k);
}

385
386
387
388
389
390
391
392
393

void GLWidget::glMousePosition(int& x, int& y)
{
	QPoint xy = mapFromGlobal(QCursor::pos());
	x = xy.x();
	y = getHeight() - xy.y();
}


Sylvain Thery's avatar
Sylvain Thery committed
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
void GLWidget::oglRotate(float angle, float x, float y, float z)
{
	m_cbs->modelViewMatrix() = glm::rotate(m_cbs->modelViewMatrix(), angle, glm::vec3(x,y,z));
}

void GLWidget::oglTranslate(float tx, float ty, float tz)
{
	m_cbs->modelViewMatrix() = glm::translate(m_cbs->modelViewMatrix(), glm::vec3(tx,ty,tz));
}

void GLWidget::oglScale(float sx, float sy, float sz)
{
	m_cbs->modelViewMatrix() = glm::scale(m_cbs->modelViewMatrix(), glm::vec3(sx,sy,sz));
}

409

410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
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
GLfloat GLWidget::getOrthoScreenRay(int x, int y, Geom::Vec3f& rayA, Geom::Vec3f& rayB, int radius)
{
	// get Z from depth buffer
	int yy = y;
	GLfloat depth_t[25];
	glReadPixels(x-2, yy-2, 5, 5, GL_DEPTH_COMPONENT, GL_FLOAT, depth_t);

	GLfloat depth=0.0f;
	unsigned int nb=0;
	for (unsigned int i=0; i< 25; ++i)
	{
		if (depth_t[i] != 1.0f)
		{
			depth += depth_t[i];
			nb++;
		}
	}
	if (nb>0)
		depth /= float(nb);
	else
		depth = 0.5f;

	glm::i32vec4 viewport;
	glGetIntegerv(GL_VIEWPORT, &(viewport[0]));

	glm::vec3 win(x, yy, 0.0f);

	glm::vec3 P = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);

	rayA[0] = P[0];
	rayA[1] = P[1];
	rayA[2] = P[2];

	win[2] = depth;

	P = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);
	rayB[0] = P[0];
	rayB[1] = P[1];
	rayB[2] = P[2];

	if (depth == 1.0f)	// depth vary in [0-1]
		win[2] = 0.5f;

	win[0] += radius;
	P = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);
	Geom::Vec3f Q;
	Q[0] = P[0];
	Q[1] = P[1];
	Q[2] = P[2];

	// compute & return distance
	Q -= rayB;
	return float(Q.norm());
}

float GLWidget::getWidthInWorld(unsigned int pixel_width, const Geom::Vec3f& center)
{

	glm::i32vec4 viewport;
	glGetIntegerv(GL_VIEWPORT, &(viewport[0]));

	glm::vec3 win = glm::project(glm::vec3(center[0],center[1],center[2]), m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);

	win[0]-= pixel_width/2;

	glm::vec3 P = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);

	win[0] += pixel_width;

	glm::vec3 Q = glm::unProject(win, m_cbs->modelViewMatrix(), m_cbs->projectionMatrix(), viewport);

	return glm::distance(P,Q);
}

void GLWidget::transfoRotate(float angle, float x, float y, float z)
{
	m_cbs->transfoMatrix() = glm::rotate( m_cbs->transfoMatrix(), angle, glm::vec3(x,y,z));
}

void GLWidget::transfoTranslate(float tx, float ty, float tz)
{
	m_cbs->transfoMatrix() = glm::translate( m_cbs->transfoMatrix(), glm::vec3(tx,ty,tz));
}

void GLWidget::transfoScale(float sx, float sy, float sz)
{
	m_cbs->transfoMatrix() = glm::scale( m_cbs->transfoMatrix(), glm::vec3(sx,sy,sz));
}

void GLWidget::pushTransfoMatrix()
{
	m_stack_trf.push( m_cbs->transfoMatrix());
}

bool GLWidget::popTransfoMatrix()
{
	if (m_stack_trf.empty())
		return false;
	 m_cbs->transfoMatrix() = m_stack_trf.top();
	m_stack_trf.pop();
	return true;
}

/**
 * current transfo matrix
 */
const glm::mat4& GLWidget::transfoMatrix() const { return m_cbs->transfoMatrix(); }
glm::mat4& GLWidget::transfoMatrix() { return m_cbs->transfoMatrix(); }

/**
 * current modelview matrix
 */
const glm::mat4& GLWidget::modelViewMatrix() const { return m_cbs->modelViewMatrix(); }
glm::mat4& GLWidget::modelViewMatrix() { return m_cbs->modelViewMatrix(); }

/**
 * current projection matrix
 */
const glm::mat4& GLWidget::projectionMatrix() const { return m_cbs->projectionMatrix(); }
glm::mat4& GLWidget::projectionMatrix() { return m_cbs->projectionMatrix(); }


Sylvain Thery's avatar
Sylvain Thery committed
532

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
533
} // namespace QT
Sylvain Thery's avatar
Sylvain Thery committed
534

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
535
536
537
} // namespace Utils

} // namespace CGoGN