Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/OpenGLCompositor.h @ 897:9c2f6d6b9f4a am-dev
Merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Tue, 16 Jul 2019 12:37:29 +0200 |
parents | 6e79e8c9021c 0aff28f15ea2 |
children | 64e5f3ff6360 |
comparison
equal
deleted
inserted
replaced
896:875bd6aca5e6 | 897:9c2f6d6b9f4a |
---|---|
27 #include "Internals/OpenGLLinesProgram.h" | 27 #include "Internals/OpenGLLinesProgram.h" |
28 #include "Internals/OpenGLTextProgram.h" | 28 #include "Internals/OpenGLTextProgram.h" |
29 | 29 |
30 namespace OrthancStone | 30 namespace OrthancStone |
31 { | 31 { |
32 class OpenGLCompositor : | 32 class OpenGLCompositor : private Internals::CompositorHelper::IRendererFactory |
33 public ICompositor, | |
34 private Internals::CompositorHelper::IRendererFactory | |
35 { | 33 { |
36 private: | 34 private: |
37 class Font; | 35 class Font; |
38 | 36 |
39 typedef std::map<size_t, Font*> Fonts; | 37 typedef std::map<size_t, Font*> Fonts; |
56 OpenGLCompositor(OpenGL::IOpenGLContext& context, | 54 OpenGLCompositor(OpenGL::IOpenGLContext& context, |
57 const Scene2D& scene); | 55 const Scene2D& scene); |
58 | 56 |
59 ~OpenGLCompositor(); | 57 ~OpenGLCompositor(); |
60 | 58 |
61 void UpdateSize(); | 59 void Refresh(); |
62 | |
63 virtual void Refresh(); | |
64 | 60 |
65 void SetFont(size_t index, | 61 void SetFont(size_t index, |
66 const GlyphBitmapAlphabet& dict); | 62 const GlyphBitmapAlphabet& dict); |
67 | 63 |
68 #if ORTHANC_ENABLE_LOCALE == 1 | 64 #if ORTHANC_ENABLE_LOCALE == 1 |
70 Orthanc::EmbeddedResources::FileResourceId resource, | 66 Orthanc::EmbeddedResources::FileResourceId resource, |
71 unsigned int fontSize, | 67 unsigned int fontSize, |
72 Orthanc::Encoding codepage); | 68 Orthanc::Encoding codepage); |
73 #endif | 69 #endif |
74 | 70 |
75 virtual unsigned int GetCanvasWidth() const | 71 unsigned int GetCanvasWidth() const |
76 { | 72 { |
77 return canvasWidth_; | 73 return canvasWidth_; |
78 } | 74 } |
79 | 75 |
80 virtual unsigned int GetCanvasHeight() const | 76 unsigned int GetCanvasHeight() const |
81 { | 77 { |
82 return canvasHeight_; | 78 return canvasHeight_; |
83 } | 79 } |
84 }; | 80 }; |
85 } | 81 } |