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-2012, 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.unistra.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
#include <GL/glew.h>
#include <iostream>
#include "Utils/trackball.h"
28
29
#include "Utils/Qt/qtgl.h"
#include "Utils/Qt/qtSimple.h"
30
#include "glm/gtc/type_precision.hpp"
31
#include "Utils/GLSLShader.h"
Sylvain Thery's avatar
Sylvain Thery committed
32
33
34

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

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

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

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

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

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

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

GLWidget::~GLWidget()
{
}

void GLWidget::setParamObject(float width, float* pos)
{
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
70
71
	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
72
73
}

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

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

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

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

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

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

void GLWidget::recalcModelView()
{
104
105
106
107
108
109
	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
110
	glm::mat4 m;
111
	build_rotmatrixgl3(m, m_cbs->curquat());
Pierre Kraemer's avatar
Pierre Kraemer committed
112
	// update matrice
113
	m_cbs->modelViewMatrix() *= m;
Sylvain Thery's avatar
Sylvain Thery committed
114

115
116
117
118
	// 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]);

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

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

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

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

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

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

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

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

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

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

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

	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];
161

162
	m_cbs->modelViewMatrix() = storeMVM;
163

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

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

Sylvain Thery's avatar
Sylvain Thery committed
172
173
174
175
176
177
178
179
180
181
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
182
183
	W = w;
	H = h;
Sylvain Thery's avatar
Sylvain Thery committed
184

Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
185
	glViewport(0, 0, W, H);
Sylvain Thery's avatar
Sylvain Thery committed
186
	float f = FAR_PLANE;
Pierre Kraemer's avatar
merge..    
Pierre Kraemer committed
187
	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
188
189
190
191
192
193
194
195
196
197
198

	recalcModelView();
}

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

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

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

	if (m_cbs)
213
		m_cbs->cb_mousePress(event->button(), event->x(), getHeight() - event->y());
Sylvain Thery's avatar
Sylvain Thery committed
214
	setFocus(Qt::MouseFocusReason);
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
void GLWidget::keyPressEvent(QKeyEvent* event)
Sylvain Thery's avatar
Sylvain Thery committed
327
{
328
	if (event->key() == Qt::Key_Escape)
Sylvain Thery's avatar
Sylvain Thery committed
329
	{
Pierre Kraemer's avatar
Pierre Kraemer committed
330
		close();
Sylvain Thery's avatar
Sylvain Thery committed
331
332
		m_cbs->close();
	}
Sylvain Thery's avatar
Sylvain Thery committed
333

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

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

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

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

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

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

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

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

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

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

383
384
385
386
387
388
389
390
391

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
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
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));
}

407

408
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
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));
485
	recalcModelView() ;
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
}

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
531

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

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

} // namespace CGoGN