diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-06 03:01:33 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-06 03:01:33 (GMT) |
| commit | 73faee12d520d419835f2ee7641752d2afce6b29 (patch) | |
| tree | 0393788cce4bdd5e41826fb60ab6bfa267b92a48 /demos/boxes/scene.h | |
| parent | 908027ae023f089bf83a2b614e933927989b524c (diff) | |
| parent | 79bc8f778f0b7b935ce3d808d8c91c3730f886bb (diff) | |
| download | Qt-73faee12d520d419835f2ee7641752d2afce6b29.zip Qt-73faee12d520d419835f2ee7641752d2afce6b29.tar.gz Qt-73faee12d520d419835f2ee7641752d2afce6b29.tar.bz2 | |
Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into kinetic-declarativeui
Conflicts:
demos/boxes/scene.cpp
src/opengl/qglpixmapfilter.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
Diffstat (limited to 'demos/boxes/scene.h')
| -rw-r--r-- | demos/boxes/scene.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index c056739..48ecaba 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -50,13 +50,13 @@ #include "roundedbox.h" #include "gltrianglemesh.h" -#include "vector.h" #include "trackball.h" #include "glbuffers.h" #include "qtbox.h" #define PI 3.14159265358979 +class QMatrix4x4; class ParameterEdit : public QWidget { public: @@ -194,7 +194,7 @@ public slots: void setFloatParameter(const QString &name, float value); 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(); void defaultStates(); @@ -237,6 +237,4 @@ private: QGLShaderProgram *m_environmentProgram; }; - - #endif |