Mercurial > hg > orthanc-stone
diff 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 |
line wrap: on
line diff
--- a/Samples/Qt/BasicScene.cpp Fri Jul 12 14:57:48 2019 +0200 +++ b/Samples/Qt/BasicScene.cpp Tue Jul 16 12:37:29 2019 +0200 @@ -21,7 +21,7 @@ #define GLEW_STATIC 1 // From Stone #include "../../Framework/OpenGL/OpenGLIncludes.h" -#include "../../Applications/Sdl/SdlOpenGLWindow.h" +#include "../../Applications/Sdl/SdlWindow.h" #include "../../Framework/Scene2D/CairoCompositor.h" #include "../../Framework/Scene2D/ColorTextureSceneLayer.h" #include "../../Framework/Scene2D/OpenGLCompositor.h" @@ -94,7 +94,7 @@ boost::shared_ptr<UndoStack> undoStack(new UndoStack); boost::shared_ptr<ViewportController> controller = boost::make_shared<ViewportController>( undoStack, boost::ref(broker)); - PrepareScene(*(controller->GetScene())); + PrepareScene(controller->GetScene()); boost::shared_ptr<OrthancStone::Scene2DInteractor> interactor(new BasicScene2DInteractor(controller)); window.GetOpenGlWidget().SetInteractor(interactor);