Mercurial > projects > qtd

changeset 5:834feae7809b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix include paths in CMake script. Revert wrong changes of 8 revision.
author SokoL_SD
date Wed, 13 May 2009 19:45:58 +0000
parents 0a29ce1ae854
children 374a61671448
files CMakeLists.txt examples/opengl/hellogl/glwidget.d examples/widgets/analogclock/AnalogClock.d
diffstat 3 files changed, 34 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed May 13 19:01:55 2009 +0000
+++ b/CMakeLists.txt	Wed May 13 19:45:58 2009 +0000
@@ -2,7 +2,7 @@
 PROJECT(qtd CXX C)
 FIND_PACKAGE(Qt4 REQUIRED)
 
-include_directories(${QT_INCLUDES} include)
+include_directories(${QT_INCLUDES} include ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 option(BUILD_QT_OPENGL "Build QtOpenGL" "ON")
 option(BUILD_EXAMPLES "Build examples" "ON")
--- a/examples/opengl/hellogl/glwidget.d	Wed May 13 19:01:55 2009 +0000
+++ b/examples/opengl/hellogl/glwidget.d	Wed May 13 19:45:58 2009 +0000
@@ -50,7 +50,7 @@
 class GLWidget : QGLWidget
 {
 //    Q_OBJECT
-    
+
     public:
         this(QWidget parent = null)
         {
@@ -59,18 +59,17 @@
             xRot = 0;
             yRot = 0;
             zRot = 0;
-            
+
             trolltechGreen = QColor.fromCmykF(0.40, 0.0, 1.0, 0.0);
             trolltechPurple = QColor.fromCmykF(0.39, 0.39, 0.0, 0.0);
-            
         }
-        
+
         ~this()
         {
             makeCurrent();
             glDeleteLists(object, 1);
-        }        
-        
+        }
+
         QSize minimumSizeHint()
         {
             return QSize(50, 50);
@@ -92,7 +91,7 @@
                 updateGL();
             }
         }
-        
+
         void setYRotation(int angle)
         {
             normalizeAngle(&angle);
@@ -102,7 +101,7 @@
                 updateGL();
             }
         }
-        
+
         void setZRotation(int angle)
         {
             normalizeAngle(&angle);
@@ -112,11 +111,11 @@
                 updateGL();
             }
         }
-        
+
         mixin Signal!("xRotationChanged", int);
         mixin Signal!("yRotationChanged", int);
         mixin Signal!("zRotationChanged", int);
-        
+
 
     protected:
         void initializeGL()
@@ -143,7 +142,7 @@
         {
             int side = qMin(width, height);
             glViewport((width - side) / 2, (height - side) / 2, side, side);
-            
+
             glMatrixMode(GL_PROJECTION);
             glLoadIdentity();
             glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
@@ -154,12 +153,12 @@
         {
             lastPos = QPoint(event.pos.x, event.pos.y);
         }
-        
+
         void mouseMoveEvent(QMouseEvent event)
         {
             int dx = event.x - lastPos.x;
             int dy = event.y - lastPos.y;
-            
+
             if (event.buttons() & Qt.LeftButton) {
                 setXRotation(xRot + 8 * dy);
                 setYRotation(yRot + 8 * dx);
@@ -174,9 +173,9 @@
         {
             GLuint list = glGenLists(1);
             glNewList(list, GL_COMPILE);
-            
+
             glBegin(GL_QUADS);
-            
+
             GLdouble x1 = +0.06;
             GLdouble y1 = -0.14;
             GLdouble x2 = +0.14;
@@ -185,10 +184,10 @@
             GLdouble y3 = +0.00;
             GLdouble x4 = +0.30;
             GLdouble y4 = +0.22;
-            
+
             quad(x1, y1, x2, y2, y2, x2, y1, x1);
             quad(x3, y3, x4, y4, y4, x4, y3, x3);
-            
+
             extrude(x1, y1, x2, y2);
             extrude(x2, y2, y2, x2);
             extrude(y2, x2, y1, x1);
@@ -196,61 +195,61 @@
             extrude(x3, y3, x4, y4);
             extrude(x4, y4, y4, x4);
             extrude(y4, x4, y3, x3);
-            
+
             const double Pi = 3.14159265358979323846;
             const int NumSectors = 200;
-            
+
             for (int i = 0; i < NumSectors; ++i) {
                 double angle1 = (i * 2 * Pi) / NumSectors;
                 GLdouble x5 = 0.30 * sin(angle1);
                 GLdouble y5 = 0.30 * cos(angle1);
                 GLdouble x6 = 0.20 * sin(angle1);
                 GLdouble y6 = 0.20 * cos(angle1);
-                
+
                 double angle2 = ((i + 1) * 2 * Pi) / NumSectors;
                 GLdouble x7 = 0.20 * sin(angle2);
                 GLdouble y7 = 0.20 * cos(angle2);
                 GLdouble x8 = 0.30 * sin(angle2);
                 GLdouble y8 = 0.30 * cos(angle2);
-                
+
                 quad(x5, y5, x6, y6, x7, y7, x8, y8);
-                
+
                 extrude(x6, y6, x7, y7);
                 extrude(x8, y8, x5, y5);
             }
-            
+
             glEnd();
 
             glEndList();
             return list;
         }
-        
+
         void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
                    GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4)
         {
             qglColor(trolltechGreen);
-            
+
             glVertex3d(x1, y1, -0.05);
             glVertex3d(x2, y2, -0.05);
             glVertex3d(x3, y3, -0.05);
             glVertex3d(x4, y4, -0.05);
-            
+
             glVertex3d(x4, y4, +0.05);
             glVertex3d(x3, y3, +0.05);
             glVertex3d(x2, y2, +0.05);
             glVertex3d(x1, y1, +0.05);
         }
-        
+
         void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
         {
             qglColor(trolltechGreen.darker(rndint(250 + (100 * x1))));
-            
+
             glVertex3d(x1, y1, +0.05);
             glVertex3d(x2, y2, +0.05);
             glVertex3d(x2, y2, -0.05);
             glVertex3d(x1, y1, -0.05);
         }
-        
+
         void normalizeAngle(int *angle)
         {
             while (*angle < 0)
@@ -258,7 +257,7 @@
             while (*angle > 360 * 16)
                 *angle -= 360 * 16;
         }
-        
+
         GLuint object;
         int xRot;
         int yRot;
--- a/examples/widgets/analogclock/AnalogClock.d	Wed May 13 19:01:55 2009 +0000
+++ b/examples/widgets/analogclock/AnalogClock.d	Wed May 13 19:45:58 2009 +0000
@@ -64,26 +64,16 @@
 
     void paintEvent(QPaintEvent event)
     {
-/*        static const QPoint hourHand[3] = {
+        static const QPoint[3] hourHand = [
             QPoint(7, 8),
             QPoint(-7, 8),
             QPoint(0, -40)
-        };
-        static const QPoint minuteHand[3] = {
+        ];
+        static const QPoint[3] minuteHand = [
             QPoint(7, 8),
             QPoint(-7, 8),
             QPoint(0, -70)
-        };
-*/
-        scope hourHand = new QPolygon;
-        hourHand.append(QPoint(7, 8));
-        hourHand.append(QPoint(-7, 8));
-        hourHand.append(QPoint(0, -40));
-
-        scope minuteHand = new QPolygon;
-        minuteHand.append(QPoint(7, 8));
-        minuteHand.append(QPoint(-7, 8));
-        minuteHand.append(QPoint(0, -70));
+        ];
 
         scope hourColor = new QColor(127, 0, 127);
         scope minuteColor = new QColor(0, 127, 127, 191);