diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /examples/opengl/cube | |
parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'examples/opengl/cube')
-rw-r--r-- | examples/opengl/cube/geometryengine.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/cube/mainwidget.cpp | 10 | ||||
-rw-r--r-- | examples/opengl/cube/mainwidget.h | 8 |
3 files changed, 6 insertions, 14 deletions
diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index 1f9e16a935..24e014201e 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -174,6 +174,6 @@ void GeometryEngine::drawCubeGeometry(QOpenGLShaderProgram *program) program->setAttributeBuffer(texcoordLocation, GL_FLOAT, offset, 2, sizeof(VertexData)); // Draw cube geometry using indices from VBO 1 - glDrawElements(GL_TRIANGLE_STRIP, 34, GL_UNSIGNED_SHORT, 0); + glDrawElements(GL_TRIANGLE_STRIP, 34, GL_UNSIGNED_SHORT, nullptr); } //! [2] diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 292a4245fa..558ecd1299 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -52,15 +52,7 @@ #include <QMouseEvent> -#include <math.h> - -MainWidget::MainWidget(QWidget *parent) : - QOpenGLWidget(parent), - geometries(0), - texture(0), - angularSpeed(0) -{ -} +#include <cmath> MainWidget::~MainWidget() { diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index cd2f8098ad..b6a03d454a 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.h @@ -69,7 +69,7 @@ class MainWidget : public QOpenGLWidget, protected QOpenGLFunctions Q_OBJECT public: - explicit MainWidget(QWidget *parent = 0); + using QOpenGLWidget::QOpenGLWidget; ~MainWidget(); protected: @@ -87,15 +87,15 @@ protected: private: QBasicTimer timer; QOpenGLShaderProgram program; - GeometryEngine *geometries; + GeometryEngine *geometries = nullptr; - QOpenGLTexture *texture; + QOpenGLTexture *texture = nullptr; QMatrix4x4 projection; QVector2D mousePressPosition; QVector3D rotationAxis; - qreal angularSpeed; + qreal angularSpeed = 0; QQuaternion rotation; }; |