comparison Samples/Qt/QStoneOpenGlWidget.h @ 897:9c2f6d6b9f4a am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:37:29 +0200
parents 56e4e9281076
children a911f5bb48da
comparison
equal deleted inserted replaced
896:875bd6aca5e6 897:9c2f6d6b9f4a
4 #include <QOpenGLFunctions> 4 #include <QOpenGLFunctions>
5 5
6 #include <boost/shared_ptr.hpp> 6 #include <boost/shared_ptr.hpp>
7 #include "../../Framework/OpenGL/IOpenGLContext.h" 7 #include "../../Framework/OpenGL/IOpenGLContext.h"
8 #include "../../Framework/Scene2D/OpenGLCompositor.h" 8 #include "../../Framework/Scene2D/OpenGLCompositor.h"
9 #include "../../Framework/Viewport/IViewport.h"
9 #include "../../Applications/Generic/Scene2DInteractor.h" 10 #include "../../Applications/Generic/Scene2DInteractor.h"
10 11
11 namespace OrthancStone 12 namespace OrthancStone
12 { 13 {
13 class QStoneOpenGlWidget : public QOpenGLWidget, public OrthancStone::OpenGL::IOpenGLContext 14 class QStoneOpenGlWidget : public QOpenGLWidget, public OrthancStone::OpenGL::IOpenGLContext
14 { 15 {
16 boost::shared_ptr<IViewport> viewport_;
15 boost::shared_ptr<OrthancStone::OpenGLCompositor> compositor_; 17 boost::shared_ptr<OrthancStone::OpenGLCompositor> compositor_;
16 boost::shared_ptr<Scene2DInteractor> sceneInteractor_; 18 boost::shared_ptr<Scene2DInteractor> sceneInteractor_;
17 19
18 public: 20 public:
19 QStoneOpenGlWidget(QWidget *parent) : 21 QStoneOpenGlWidget(QWidget *parent) :