Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed remaining glut parts from OpenMesh QGLViewer

Browse Source
This commit is contained in:
Jan Möbius
2019-02-06 10:15:48 +01:00
parent 253f47f6db
commit fa92a28749
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
View File

@@ -52,11 +52,7 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
// -------------------- // --------------------
#ifdef ARCH_DARWIN
# include <glut.h>
#else
# include <GL/glut.h>
#endif
// -------------------- // --------------------
#include <QApplication> #include <QApplication>
#include <QMenu> #include <QMenu>
@@ -266,21 +262,21 @@ QGLViewerWidget::draw_scene(const std::string& _draw_mode)
if (_draw_mode == "Wireframe") if (_draw_mode == "Wireframe")
{ {
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glutWireTeapot(0.5); // glutWireTeapot(0.5);
} }
else if (_draw_mode == "Solid Flat") else if (_draw_mode == "Solid Flat")
{ {
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glShadeModel(GL_FLAT); glShadeModel(GL_FLAT);
glutSolidTeapot(0.5); //glutSolidTeapot(0.5);
} }
else if (_draw_mode == "Solid Smooth") else if (_draw_mode == "Solid Smooth")
{ {
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glutSolidTeapot(0.5); //glutSolidTeapot(0.5);
} }
} }
@@ -585,8 +581,19 @@ QGLViewerWidget::update_projection_matrix()
makeCurrent(); makeCurrent();
glMatrixMode( GL_PROJECTION ); glMatrixMode( GL_PROJECTION );
glLoadIdentity(); glLoadIdentity();
gluPerspective(45.0, (GLfloat) width() / (GLfloat) height(),
0.01*radius_, 100.0*radius_); const double fovY = 45.0;
const double aspect = static_cast<double>(width()) / static_cast<double>(height());
const double zNear = 0.01*radius_;
const double zFar = 100.0*radius_;
// Replacement for: gluPerspective(45.0, (GLfloat) width() / (GLfloat) height(), 0.01*radius_, 100.0*radius_);
const double pi = 3.1415926535897932384626433832795;
const double fH = tan( fovY / 360 * pi ) * zNear;
const double fW = fH * aspect;
glFrustum( -fW, fW, -fH, fH, zNear, zFar );
glGetDoublev( GL_PROJECTION_MATRIX, projection_matrix_); glGetDoublev( GL_PROJECTION_MATRIX, projection_matrix_);
glMatrixMode( GL_MODELVIEW ); glMatrixMode( GL_MODELVIEW );
} }

9
src/OpenMesh/Apps/QtViewer/meshviewer.cc
View File

@@ -51,12 +51,6 @@
#include <QMenuBar> #include <QMenuBar>
#include <QFileDialog> #include <QFileDialog>
#ifdef ARCH_DARWIN
#include <glut.h>
#else
#include <GL/glut.h>
#endif
#include "MeshViewerWidget.hh" #include "MeshViewerWidget.hh"
@@ -68,9 +62,6 @@ int main(int argc, char **argv)
// OpenGL check // OpenGL check
QApplication::setColorSpec( QApplication::CustomColor ); QApplication::setColorSpec( QApplication::CustomColor );
QApplication app(argc,argv); QApplication app(argc,argv);
#if !defined(__APPLE__)
glutInit(&argc,argv);
#endif
if ( !QGLFormat::hasOpenGL() ) { if ( !QGLFormat::hasOpenGL() ) {
QString msg = "System has no OpenGL support!"; QString msg = "System has no OpenGL support!";