Mercurial > hg > orthanc-stone
comparison Framework/Scene2D/OpenGLCompositor.h @ 1211:d10d2acb8a02 broker
compositors do not keep a reference to the scene anymore
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 04 Dec 2019 16:47:21 +0100 |
parents | 1091b2adeb5a |
children | 0ca50d275b9a |
comparison
equal
deleted
inserted
replaced
1210:644baa70373d | 1211:d10d2acb8a02 |
---|---|
35 private: | 35 private: |
36 class Font; | 36 class Font; |
37 | 37 |
38 typedef std::map<size_t, Font*> Fonts; | 38 typedef std::map<size_t, Font*> Fonts; |
39 | 39 |
40 OpenGL::IOpenGLContext& context_; | 40 OpenGL::IOpenGLContext& context_; |
41 Fonts fonts_; | 41 Fonts fonts_; |
42 Internals::CompositorHelper helper_; | 42 std::auto_ptr<Internals::CompositorHelper> helper_; |
43 Internals::OpenGLColorTextureProgram colorTextureProgram_; | 43 Internals::OpenGLColorTextureProgram colorTextureProgram_; |
44 Internals::OpenGLFloatTextureProgram floatTextureProgram_; | 44 Internals::OpenGLFloatTextureProgram floatTextureProgram_; |
45 Internals::OpenGLLinesProgram linesProgram_; | 45 Internals::OpenGLLinesProgram linesProgram_; |
46 Internals::OpenGLTextProgram textProgram_; | 46 Internals::OpenGLTextProgram textProgram_; |
47 unsigned int canvasWidth_; | 47 unsigned int canvasWidth_; |
48 unsigned int canvasHeight_; | 48 unsigned int canvasHeight_; |
49 | 49 |
50 const Font* GetFont(size_t fontIndex) const; | 50 const Font* GetFont(size_t fontIndex) const; |
51 | 51 |
52 virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE; | 52 virtual Internals::CompositorHelper::ILayerRenderer* Create(const ISceneLayer& layer) ORTHANC_OVERRIDE; |
53 | 53 |
54 public: | 54 public: |
55 OpenGLCompositor(OpenGL::IOpenGLContext& context, | 55 OpenGLCompositor(OpenGL::IOpenGLContext& context); |
56 const Scene2D& scene); | |
57 | 56 |
58 virtual ~OpenGLCompositor(); | 57 virtual ~OpenGLCompositor(); |
59 | 58 |
60 virtual void Refresh() ORTHANC_OVERRIDE; | 59 virtual void Refresh(const Scene2D& scene) ORTHANC_OVERRIDE; |
60 | |
61 virtual void ResetScene() ORTHANC_OVERRIDE | |
62 { | |
63 helper_.reset(new Internals::CompositorHelper(*this)); | |
64 } | |
61 | 65 |
62 void SetFont(size_t index, const GlyphBitmapAlphabet& dict); | 66 void SetFont(size_t index, const GlyphBitmapAlphabet& dict); |
63 | 67 |
64 #if ORTHANC_ENABLE_LOCALE == 1 | 68 #if ORTHANC_ENABLE_LOCALE == 1 |
65 void SetFont(size_t index, | 69 void SetFont(size_t index, |