summaryrefslogtreecommitdiff
path: root/demos/boxes/glbuffers.h
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 11:41:12 +1000
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-05-01 11:41:53 +1000
commit79bc8f778f0b7b935ce3d808d8c91c3730f886bb (patch)
treeffe8356a7c1038af0c104fee1516ce4d84defcef /demos/boxes/glbuffers.h
parent1092ef425b9ed5835e4863c5ec32f9fc21af8d4d (diff)
downloadqt4-tools-79bc8f778f0b7b935ce3d808d8c91c3730f886bb.tar.gz
Port boxes demo to use math3d throughout
Patch originally by Ian Walters.
Diffstat (limited to 'demos/boxes/glbuffers.h')
-rw-r--r--demos/boxes/glbuffers.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
index 88de4e82fa..392924e8bb 100644
--- a/demos/boxes/glbuffers.h
+++ b/demos/boxes/glbuffers.h
@@ -48,8 +48,6 @@
#include <QtGui>
#include <QtOpenGL>
-#include "vector.h"
-
#define BUFFER_OFFSET(i) ((char*)0 + (i))
#define SIZE_OF_MEMBER(cls, member) sizeof(static_cast<cls *>(0)->member)
@@ -60,6 +58,8 @@ if (m_failed || !(assertion)) {
returnStatement; \
}
+class QMatrix4x4;
+
class GLTexture
{
public:
@@ -135,8 +135,8 @@ public:
void end();
virtual bool failed() {return m_failed || m_fbo.failed();}
- static void getViewMatrix(gfx::Matrix4x4f& mat, int face);
- static void getProjectionMatrix(gfx::Matrix4x4f& mat, float nearZ, float farZ);
+ static void getViewMatrix(QMatrix4x4& mat, int face);
+ static void getProjectionMatrix(QMatrix4x4& mat, float nearZ, float farZ);
private:
GLFrameBufferObject m_fbo;
};