summaryrefslogtreecommitdiffstats
path: root/demos/boxes/glbuffers.h
diff options
context:
space:
mode:
Diffstat (limited to 'demos/boxes/glbuffers.h')
-rw-r--r--demos/boxes/glbuffers.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h
index c9e866d..7d5b5c5 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,10 @@ if (m_failed || !(assertion)) {
returnStatement; \
}
+QT_BEGIN_NAMESPACE
+class QMatrix4x4;
+QT_END_NAMESPACE
+
class GLTexture
{
public:
@@ -135,8 +137,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;
};