AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused parameters in hellowindow.

Browse Source 
(cherry picked from commit 3d7f0d967ca1e7e76087d84efc67f5247b72dae6)
This commit is contained in:
Samuel Rødal 2011-04-27 17:52:51 +02:00
parent f1601a4930
commit 33e1b8dda5
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/opengl/hellowindow/hellowindow.cpp
View File

@ -69,7 +69,6 @@ void HelloWindow::render()
modelview.rotate(m_fAngle, 0.0f, 1.0f, 0.0f); modelview.rotate(m_fAngle, 0.0f, 1.0f, 0.0f);
modelview.rotate(m_fAngle, 1.0f, 0.0f, 0.0f); modelview.rotate(m_fAngle, 1.0f, 0.0f, 0.0f);
modelview.rotate(m_fAngle, 0.0f, 0.0f, 1.0f); modelview.rotate(m_fAngle, 0.0f, 0.0f, 1.0f);
modelview.scale(m_fScale);
modelview.translate(0.0f, -0.2f, 0.0f); modelview.translate(0.0f, -0.2f, 0.0f);
program.bind(); program.bind();
@ -139,7 +138,6 @@ void HelloWindow::initialize()
colorUniform = program.uniformLocation("sourceColor"); colorUniform = program.uniformLocation("sourceColor");
m_fAngle = 0; m_fAngle = 0;
m_fScale = 1;
createGeometry(); createGeometry();
updateColor(); updateColor();
} }

5
examples/opengl/hellowindow/hellowindow.h
View File

@ -21,9 +21,7 @@ private:
void initialize(); void initialize();
void updateColor(); void updateColor();
GLuint m_uiTexture;
qreal m_fAngle; qreal m_fAngle;
qreal m_fScale;
bool m_showBubbles; bool m_showBubbles;
void paintQtLogo(); void paintQtLogo();
void createGeometry(); void createGeometry();
@ -32,9 +30,6 @@ private:
void extrude(qreal x1, qreal y1, qreal x2, qreal y2); void extrude(qreal x1, qreal y1, qreal x2, qreal y2);
QVector<QVector3D> vertices; QVector<QVector3D> vertices;
QVector<QVector3D> normals; QVector<QVector3D> normals;
bool qtLogo;
int frames;
QTime time;
QGLShaderProgram program; QGLShaderProgram program;
int vertexAttr; int vertexAttr;
int normalAttr; int normalAttr;