Mercurial > hg > orthanc-stone
diff Framework/Scene2D/OpenGLCompositor.cpp @ 942:685c9a2d115f
Added missing ORTHANC_OVERRIDE + preparation for lost GL context handling + stubs for GL context event handlers
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 05 Aug 2019 12:27:27 +0200 |
parents | 9c2f6d6b9f4a |
children | 1091b2adeb5a |
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.cpp Wed Jul 31 11:29:08 2019 +0200 +++ b/Framework/Scene2D/OpenGLCompositor.cpp Mon Aug 05 12:27:27 2019 +0200 @@ -18,7 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ - #include "OpenGLCompositor.h" #include "Internals/OpenGLAdvancedPolylineRenderer.h" @@ -60,7 +59,6 @@ } }; - const OpenGLCompositor::Font* OpenGLCompositor::GetFont(size_t fontIndex) const { Fonts::const_iterator found = fonts_.find(fontIndex); @@ -76,7 +74,6 @@ } } - Internals::CompositorHelper::ILayerRenderer* OpenGLCompositor::Create(const ISceneLayer& layer) { switch (layer.GetType()) @@ -122,7 +119,6 @@ } } - OpenGLCompositor::OpenGLCompositor(OpenGL::IOpenGLContext& context, const Scene2D& scene) : context_(context), @@ -136,7 +132,6 @@ { } - OpenGLCompositor::~OpenGLCompositor() { for (Fonts::iterator it = fonts_.begin(); it != fonts_.end(); ++it) @@ -146,7 +141,6 @@ } } - void OpenGLCompositor::Refresh() { context_.MakeCurrent(); @@ -163,7 +157,6 @@ context_.SwapBuffer(); } - void OpenGLCompositor::SetFont(size_t index, const GlyphBitmapAlphabet& dict) { @@ -185,7 +178,6 @@ found->second = font.release(); } } - #if ORTHANC_ENABLE_LOCALE == 1 void OpenGLCompositor::SetFont(size_t index,