Mercurial > hg > orthanc-stone
diff Framework/Scene2D/OpenGLCompositor.h @ 911:64e5f3ff6360 am-dev
Merge
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Thu, 18 Jul 2019 10:50:59 +0200 |
| parents | 9c2f6d6b9f4a 88bf49aebc13 |
| children | 685c9a2d115f |
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.h Wed Jul 17 15:33:07 2019 +0200 +++ b/Framework/Scene2D/OpenGLCompositor.h Thu Jul 18 10:50:59 2019 +0200 @@ -21,6 +21,7 @@ #pragma once +#include "ICompositor.h" #include "Internals/CompositorHelper.h" #include "Internals/OpenGLColorTextureProgram.h" #include "Internals/OpenGLFloatTextureProgram.h" @@ -29,7 +30,9 @@ namespace OrthancStone { - class OpenGLCompositor : private Internals::CompositorHelper::IRendererFactory + class OpenGLCompositor : + public ICompositor, + private Internals::CompositorHelper::IRendererFactory { private: class Font; @@ -54,9 +57,9 @@ OpenGLCompositor(OpenGL::IOpenGLContext& context, const Scene2D& scene); - ~OpenGLCompositor(); + virtual ~OpenGLCompositor(); - void Refresh(); + virtual void Refresh(); void SetFont(size_t index, const GlyphBitmapAlphabet& dict); @@ -68,12 +71,12 @@ Orthanc::Encoding codepage); #endif - unsigned int GetCanvasWidth() const + virtual unsigned int GetCanvasWidth() const { return canvasWidth_; } - unsigned int GetCanvasHeight() const + virtual unsigned int GetCanvasHeight() const { return canvasHeight_; }