songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF

This commit is contained in:
Andreas Fabri 2015-07-07 15:14:40 +02:00
parent d168a770d0 faf3343865
commit 1d146ca31e
5 changed files with 1051 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
AABB_tree/demo/AABB_tree/Scene.cpp
View File

@ -19,6 +19,7 @@
#include <QOpenGLFunctions_3_3_Core>
#include <QOpenGLShader>
#include <QDebug>
#include "Viewer.h"
// constants
@ -288,8 +289,8 @@ void Scene::initialize_buffers()
buffers[7].release();
tex_rendering_program.release();
gl.glBindTexture(GL_TEXTURE_2D, textureId);
gl.glTexImage2D(GL_TEXTURE_2D,
gl->glBindTexture(GL_TEXTURE_2D, textureId);
gl->glTexImage2D(GL_TEXTURE_2D,
0,
GL_RGB,
texture->getWidth(),
@ -298,10 +299,10 @@ void Scene::initialize_buffers()
GL_RGB,
GL_UNSIGNED_BYTE,
texture->getData());
gl.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
gl.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
gl.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE );
gl.glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE );
gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,GL_CLAMP_TO_EDGE );
gl->glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,GL_CLAMP_TO_EDGE );
vao[6].release();
are_buffers_initialized = true;
@ -602,20 +603,20 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(0.0,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_poly.size()/3));
gl->glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_poly.size()/3));
rendering_program.release();
vao[2].release();
}
if(m_view_points && pos_points.size()>0)
{
gl.glPointSize(2.0f);
gl->glPointSize(2.0f);
vao[0].bind();
attrib_buffers(viewer);
rendering_program.bind();
color.setRgbF(0.7,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(pos_points.size()/3));
gl->glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(pos_points.size()/3));
rendering_program.release();
vao[0].release();
}
@ -628,7 +629,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(0.0,0.7,0.0);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_lines.size()/3));
gl->glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_lines.size()/3));
rendering_program.release();
vao[1].release();
}
@ -640,8 +641,8 @@ void Scene::draw(QGLViewer* viewer)
case UNSIGNED_FACETS:
case SIGNED_FACETS:
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, textureId);
gl->glActiveTexture(GL_TEXTURE0);
gl->glBindTexture(GL_TEXTURE_2D, textureId);
for(int i=0; i< 16 ; i++)
fMatrix.data()[i] = m_frame->matrix()[i];
@ -650,7 +651,7 @@ void Scene::draw(QGLViewer* viewer)
tex_rendering_program.bind();
tex_rendering_program.setUniformValue(tex_fLocation, fMatrix);
gl.glDrawArrays(GL_TRIANGLES, 0,static_cast<GLsizei>(pos_plane.size()/3));
gl->glDrawArrays(GL_TRIANGLES, 0,static_cast<GLsizei>(pos_plane.size()/3));
tex_rendering_program.release();
vao[6].release();
break;
@ -666,7 +667,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(1.0,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_cut_segments.size()/3));
gl->glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_cut_segments.size()/3));
::glLineWidth(1.0f);
rendering_program.release();
vao[3].release();
@ -679,7 +680,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(.6f, .6f, .6f);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_grid.size()/3));
gl->glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_grid.size()/3));
rendering_program.release();
vao[5].release();
@ -694,7 +695,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(.6f, .85f, 1.f, .65f);
rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix);
gl.glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(pos_plane.size()/3));
gl->glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(pos_plane.size()/3));
::glDisable(GL_BLEND);
rendering_program.release();
vao[4].release();
@ -1309,10 +1310,24 @@ void Scene::deactivate_cutting_plane()
disconnect(m_frame, SIGNAL(modified()), this, SLOT(cutting_plane()));
m_view_plane = false;
}
void Scene::initGL()
void Scene::initGL(Viewer *viewer)
{
//qDebug()<<"context from scene is valid :"<<context->isValid();
gl.initializeOpenGLFunctions();
gl.glGenTextures(1, &textureId);
//gl = 0;
//gl = viewer->context()->versionFunctions<QOpenGLFunctions_3_3_Core>();
gl = new QOpenGLFunctions_3_3_Core();
//if (!gl) {
// qFatal("Could not obtain required OpenGL context version");
// exit(1);
//}
qDebug()<<"Context's major version ="<<viewer->context()->format().majorVersion();
if(!gl->initializeOpenGLFunctions())
{
qFatal("ERROR : OpenGL Functions not initialized. Check your OpenGL Verison (should be >=3.3)");
exit(1);
}
gl->glGenTextures(1, &textureId);
compile_shaders();
}

5
AABB_tree/demo/AABB_tree/Scene.h
View File

@ -50,6 +50,7 @@ public:
GLubyte* getData(){return data; }
};
class Viewer;
class Scene : public QObject
{
Q_OBJECT
@ -81,11 +82,11 @@ public:
void update_bbox();
Bbox bbox() { return m_bbox; }
ManipulatedFrame* manipulatedFrame() const { return m_frame; }
void initGL();
void initGL(Viewer *viewer);
private:
// member data
QOpenGLFunctions_3_3_Core gl;
QOpenGLFunctions_3_3_Core *gl;
Bbox m_bbox;
Polyhedron *m_pPolyhedron;
std::list<Point> m_points;

22
AABB_tree/demo/AABB_tree/Viewer.cpp
View File

@ -2,21 +2,21 @@
#include "Scene.h"
#include <QMouseEvent>
#include <QGLFunctions>
QGLContext* createContext()
{
QOpenGLContext *context = new QOpenGLContext();
QSurfaceFormat format;
format.setVersion(3,3);
format.setProfile(QSurfaceFormat::CompatibilityProfile);
context->setFormat(format);
return QGLContext::fromOpenGLContext(context);
}
Viewer::Viewer(QWidget* parent)
: QGLViewer(parent),
: QGLViewer(createContext(),parent),
m_pScene(NULL),
m_custom_mouse(false)
{
QSurfaceFormat format;
format.setVersion(3,3);
format.setProfile(QSurfaceFormat::CoreProfile);
QOpenGLContext qContext;
qContext.setFormat(format);
qContext.create();
}
void Viewer::setScene(Scene* pScene)
@ -38,7 +38,7 @@ void Viewer::initializeGL()
{
QGLViewer::initializeGL();
setBackgroundColor(::Qt::white);
m_pScene->initGL();
m_pScene->initGL(this);
}
void Viewer::mousePressEvent(QMouseEvent* e)

2
AABB_tree/demo/AABB_tree/Viewer.h
View File

@ -18,6 +18,7 @@ public:
void draw();
void initializeGL();
void setScene(Scene* pScene);
QOpenGLContext *oglContext()const {return oglContext_;}
protected:
virtual void mousePressEvent(QMouseEvent* e);
@ -26,6 +27,7 @@ protected:
private:
Scene* m_pScene;
bool m_custom_mouse;
QOpenGLContext *oglContext_;
}; // end class Viewer
#endif // VIEWER_H

1001
Alpha_shapes_3/test/Alpha_shapes_3/data/fin Normal file
View File

File diff suppressed because it is too large Load Diff