diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-23 21:34:06 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-23 21:34:06 (GMT) |
| commit | 5389107aa684ab99701e238a7297f07b35f7d521 (patch) | |
| tree | 327a51e43bcb642c849c5cfafadf8e84966c662d /src/QGLView.h | |
| parent | 4f578513a0960d4f079260922cdc86de0948099c (diff) | |
create GLView as parent of OffscreenView and QGLView. combine setRenderer()
Diffstat (limited to 'src/QGLView.h')
| -rw-r--r-- | src/QGLView.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/QGLView.h b/src/QGLView.h index bc7e6d3..f617286 100644 --- a/src/QGLView.h +++ b/src/QGLView.h @@ -1,5 +1,5 @@ -#ifndef GLVIEW_H_ -#define GLVIEW_H_ +#ifndef QGLVIEW_H_ +#define QGLVIEW_H_ #include "system-gl.h" #include <QGLWidget> @@ -7,8 +7,10 @@ #include <Eigen/Core> #include <Eigen/Geometry> +#include "GLView.h" +#include "renderer.h" -class QGLView : public QGLWidget +class QGLView : public QGLWidget, public GLView { Q_OBJECT Q_PROPERTY(bool showFaces READ showFaces WRITE setShowFaces); @@ -20,7 +22,6 @@ class QGLView : public QGLWidget public: QGLView(QWidget *parent = NULL); QGLView(const QGLFormat & format, QWidget *parent = NULL); - void setRenderer(class Renderer* r); #ifdef ENABLE_OPENCSG bool hasOpenCSGSupport() { return this->opencsg_support; } #endif @@ -55,7 +56,6 @@ public: private: void init(); - Renderer *renderer; std::string rendererInfo; |