diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-27 17:52:51 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-28 15:39:57 +0200 |
commit | 33e1b8dda549630a6b782fa465b21f0c4f269280 (patch) | |
tree | 2ce083c7b0fe4068a0878e7271791aa4186d9c54 /examples | |
parent | f1601a4930ea138955569ebc489d7d73e469b21b (diff) |
Remove unused parameters in hellowindow.
(cherry picked from commit 3d7f0d967ca1e7e76087d84efc67f5247b72dae6)
Diffstat (limited to 'examples')
-rw-r--r-- | examples/opengl/hellowindow/hellowindow.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/hellowindow/hellowindow.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/examples/opengl/hellowindow/hellowindow.cpp b/examples/opengl/hellowindow/hellowindow.cpp index f74d321fd9..6de48e8c95 100644 --- a/examples/opengl/hellowindow/hellowindow.cpp +++ b/examples/opengl/hellowindow/hellowindow.cpp @@ -69,7 +69,6 @@ void HelloWindow::render() modelview.rotate(m_fAngle, 0.0f, 1.0f, 0.0f); modelview.rotate(m_fAngle, 1.0f, 0.0f, 0.0f); modelview.rotate(m_fAngle, 0.0f, 0.0f, 1.0f); - modelview.scale(m_fScale); modelview.translate(0.0f, -0.2f, 0.0f); program.bind(); @@ -139,7 +138,6 @@ void HelloWindow::initialize() colorUniform = program.uniformLocation("sourceColor"); m_fAngle = 0; - m_fScale = 1; createGeometry(); updateColor(); } diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h index ffa1f7d552..b0adecbb10 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/examples/opengl/hellowindow/hellowindow.h @@ -21,9 +21,7 @@ private: void initialize(); void updateColor(); - GLuint m_uiTexture; - qreal m_fAngle; - qreal m_fScale; + qreal m_fAngle; bool m_showBubbles; void paintQtLogo(); void createGeometry(); @@ -32,9 +30,6 @@ private: void extrude(qreal x1, qreal y1, qreal x2, qreal y2); QVector<QVector3D> vertices; QVector<QVector3D> normals; - bool qtLogo; - int frames; - QTime time; QGLShaderProgram program; int vertexAttr; int normalAttr; |