comparison Framework/Scene2D/OpenGLCompositor.h @ 947:1091b2adeb5a toa2019081001

Fixed animation frame stopping when returning false + big work on the OpenGL objects to make them lost context-safe + debug code to forcefully tag a context as lost + debug macros
author Benjamin Golinvaux <bgo@osimis.io>
date Sat, 10 Aug 2019 13:07:31 +0200
parents 685c9a2d115f
children d10d2acb8a02 2d8ab34c8c91
comparison
equal deleted inserted replaced
946:dbe3e1e47019 947:1091b2adeb5a
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:
57 57
58 virtual ~OpenGLCompositor(); 58 virtual ~OpenGLCompositor();
59 59
60 virtual void Refresh() ORTHANC_OVERRIDE; 60 virtual void Refresh() ORTHANC_OVERRIDE;
61 61
62 void SetFont(size_t index, 62 void SetFont(size_t index, const GlyphBitmapAlphabet& dict);
63 const GlyphBitmapAlphabet& dict);
64 63
65 #if ORTHANC_ENABLE_LOCALE == 1 64 #if ORTHANC_ENABLE_LOCALE == 1
66 void SetFont(size_t index, 65 void SetFont(size_t index,
67 Orthanc::EmbeddedResources::FileResourceId resource, 66 Orthanc::EmbeddedResources::FileResourceId resource,
68 unsigned int fontSize, 67 unsigned int fontSize,