Changeset 561 for trunk/demos/boxes/scene.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/boxes/scene.h (modified) (7 diffs)

trunk/demos/boxes/scene.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** 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 qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -51 +51 @@
 #include "roundedbox.h"
 #include "gltrianglemesh.h"
-#include "vector.h"
 #include "trackball.h"
 #include "glbuffers.h"
-#include "glshaders.h"
 #include "qtbox.h"
 
 #define PI 3.14159265358979
+
+QT_BEGIN_NAMESPACE
+class QMatrix4x4;
+QT_END_NAMESPACE
 
 class ParameterEdit : public QWidget
@@ -107 +109 @@
 class GraphicsWidget : public QGraphicsProxyWidget
 {
+public:
+    GraphicsWidget() : QGraphicsProxyWidget(0, Qt::Window) {}
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
@@ -196 +200 @@
     void newItem(ItemDialog::ItemType type);
 protected:
-    void renderBoxes(const gfx::Matrix4x4f &view, int excludeBox = -2);
+    void renderBoxes(const QMatrix4x4 &view, int excludeBox = -2);
     void setStates();
     void setLights();
@@ -232 +236 @@
     GLRenderTargetCube *m_mainCubemap;
     QVector<GLRenderTargetCube *> m_cubemaps;
-    QVector<GLProgram *> m_programs;
-    GLVertexShader *m_vertexShader;
-    QVector<GLFragmentShader *> m_fragmentShaders;
-    GLFragmentShader *m_environmentShader;
-    GLProgram *m_environmentProgram;
-};
-
-
+    QVector<QGLShaderProgram *> m_programs;
+    QGLShader *m_vertexShader;
+    QVector<QGLShader *> m_fragmentShaders;
+    QGLShader *m_environmentShader;
+    QGLShaderProgram *m_environmentProgram;
+};
 
 #endif