summaryrefslogtreecommitdiffstats
path: root/examples/opengl/samplebuffers/glwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/opengl/samplebuffers/glwidget.cpp')
-rw-r--r--examples/opengl/samplebuffers/glwidget.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/examples/opengl/samplebuffers/glwidget.cpp b/examples/opengl/samplebuffers/glwidget.cpp
index 8dbb693..95651b3 100644
--- a/examples/opengl/samplebuffers/glwidget.cpp
+++ b/examples/opengl/samplebuffers/glwidget.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -106,7 +106,7 @@ void GLWidget::timerEvent(QTimerEvent *)
void GLWidget::makeObject()
{
- QColor trolltechGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
+ QColor qtGreen(QColor::fromCmykF(0.40, 0.0, 1.0, 0.0));
const double Pi = 3.14159265358979323846;
const int NumSectors = 15;
@@ -126,11 +126,18 @@ void GLWidget::makeObject()
GLdouble x4 = 0.30 * sin(angle2);
GLdouble y4 = 0.30 * cos(angle2);
- qglColor(trolltechGreen);
+ qglColor(qtGreen);
quad(GL_QUADS, x1, y1, x2, y2, x3, y3, x4, y4);
qglColor(Qt::black);
quad(GL_LINE_LOOP, x1, y1, x2, y2, x3, y3, x4, y4);
}
+ qglColor(qtGreen);
+ quad(GL_QUADS, x1, y1, x2, y2, y2, x2, y1, x1);
+ quad(GL_QUADS, x3, y3, x4, y4, y4, x4, y3, x3);
+
+ qglColor(Qt::black);
+ quad(GL_LINE_LOOP, x1, y1, x2, y2, y2, x2, y1, x1);
+ quad(GL_LINE_LOOP, x3, y3, x4, y4, y4, x4, y3, x3);
}
glEndList();
}