comparison Samples/Qt/BasicScene.cpp @ 897:9c2f6d6b9f4a am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:37:29 +0200
parents 6073c980323a
children
comparison
equal deleted inserted replaced
896:875bd6aca5e6 897:9c2f6d6b9f4a
19 **/ 19 **/
20 20
21 #define GLEW_STATIC 1 21 #define GLEW_STATIC 1
22 // From Stone 22 // From Stone
23 #include "../../Framework/OpenGL/OpenGLIncludes.h" 23 #include "../../Framework/OpenGL/OpenGLIncludes.h"
24 #include "../../Applications/Sdl/SdlOpenGLWindow.h" 24 #include "../../Applications/Sdl/SdlWindow.h"
25 #include "../../Framework/Scene2D/CairoCompositor.h" 25 #include "../../Framework/Scene2D/CairoCompositor.h"
26 #include "../../Framework/Scene2D/ColorTextureSceneLayer.h" 26 #include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
27 #include "../../Framework/Scene2D/OpenGLCompositor.h" 27 #include "../../Framework/Scene2D/OpenGLCompositor.h"
28 #include "../../Framework/Scene2D/PanSceneTracker.h" 28 #include "../../Framework/Scene2D/PanSceneTracker.h"
29 #include "../../Framework/Scene2D/RotateSceneTracker.h" 29 #include "../../Framework/Scene2D/RotateSceneTracker.h"
92 92
93 MessageBroker broker; 93 MessageBroker broker;
94 boost::shared_ptr<UndoStack> undoStack(new UndoStack); 94 boost::shared_ptr<UndoStack> undoStack(new UndoStack);
95 boost::shared_ptr<ViewportController> controller = boost::make_shared<ViewportController>( 95 boost::shared_ptr<ViewportController> controller = boost::make_shared<ViewportController>(
96 undoStack, boost::ref(broker)); 96 undoStack, boost::ref(broker));
97 PrepareScene(*(controller->GetScene())); 97 PrepareScene(controller->GetScene());
98 98
99 boost::shared_ptr<OrthancStone::Scene2DInteractor> interactor(new BasicScene2DInteractor(controller)); 99 boost::shared_ptr<OrthancStone::Scene2DInteractor> interactor(new BasicScene2DInteractor(controller));
100 window.GetOpenGlWidget().SetInteractor(interactor); 100 window.GetOpenGlWidget().SetInteractor(interactor);
101 101
102 QOpenGLContext * context = new QOpenGLContext; 102 QOpenGLContext * context = new QOpenGLContext;