Mercurial > hg > orthanc-stone
diff Samples/Sdl/BasicScene.cpp @ 911:64e5f3ff6360 am-dev
Merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Thu, 18 Jul 2019 10:50:59 +0200 |
parents | 9c2f6d6b9f4a 7a7e4e1f558f |
children | 2d8ab34c8c91 |
line wrap: on
line diff
--- a/Samples/Sdl/BasicScene.cpp Wed Jul 17 15:33:07 2019 +0200 +++ b/Samples/Sdl/BasicScene.cpp Thu Jul 18 10:50:59 2019 +0200 @@ -48,6 +48,7 @@ static const unsigned int FONT_SIZE = 32; static const int LAYER_POSITION = 150; +#define OPENGL_ENABLED 0 void PrepareScene(OrthancStone::Scene2D& scene) { @@ -259,7 +260,7 @@ } } - +#if OPENGL_ENABLED==1 static void GLAPIENTRY OpenGLMessageCallback(GLenum source, GLenum type, @@ -276,7 +277,7 @@ type, severity, message ); } } - +#endif void Run(OrthancStone::MessageBroker& broker, OrthancStone::SdlViewport& viewport) @@ -286,8 +287,10 @@ boost::shared_ptr<ViewportController> controller( new ViewportController(boost::make_shared<UndoStack>(), broker, viewport)); +#if OPENGL_ENABLED==1 glEnable(GL_DEBUG_OUTPUT); glDebugMessageCallback(OpenGLMessageCallback, 0); +#endif boost::shared_ptr<IFlexiblePointerTracker> tracker; @@ -334,6 +337,7 @@ { case SDL_WINDOWEVENT_SIZE_CHANGED: tracker.reset(); + viewport.UpdateSize(event.window.data1, event.window.data2); break; case SDL_WINDOWEVENT_SHOWN: @@ -356,7 +360,7 @@ switch (event.key.keysym.sym) { case SDLK_f: - viewport.GetContext().GetWindow().ToggleMaximize(); + viewport.GetWindow().ToggleMaximize(); break; case SDLK_q: @@ -390,7 +394,11 @@ try { - OrthancStone::SdlViewport viewport("Hello", 1024, 768); +#if OPENGL_ENABLED==1 + OrthancStone::SdlOpenGLViewport viewport("Hello", 1024, 768); +#else + OrthancStone::SdlCairoViewport viewport("Hello", 1024, 768); +#endif PrepareScene(viewport.GetScene()); viewport.GetCompositor().SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT,