diff options
Diffstat (limited to 'demos/boxes/scene.h')
| -rw-r--r-- | demos/boxes/scene.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index cc1dace..efe1e3f 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -50,14 +50,16 @@ #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 { public: @@ -195,7 +197,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(); @@ -231,13 +233,11 @@ private: GLTexture3D *m_noise; 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 |