Mercurial > hg > orthanc-stone
diff Framework/Viewport/WebGLViewport.h @ 1331:ab81ee8fce1f broker
- Viewport is not passed and stored as a shared_ptr instead
of raw reference.
- ViewportController can now be injected with an undo
stack (not a ctor param anymore, as a preparation for the
move of the undo stack to an interactor)
- Added (temp) flag to disable emscripten events registration
in the WebAssemblyViewport (because legacy client code
deals with them directly)
- Added emscripten_clear_timeout in ~WebGLViewportsRegistry
- Removed GenericToolbox::HoldingRef whose responsibility is
better served with proper callback un-registration.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 30 Mar 2020 14:23:46 +0200 |
parents | cbfdba08e039 |
children | df8bf351c23f |
line wrap: on
line diff
--- a/Framework/Viewport/WebGLViewport.h Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Viewport/WebGLViewport.h Mon Mar 30 14:23:46 2020 +0200 @@ -31,6 +31,8 @@ private: OpenGL::WebAssemblyOpenGLContext context_; + WebGLViewport(const std::string& canvasId); + protected: virtual void Paint(ICompositor& compositor, ViewportController& controller) ORTHANC_OVERRIDE; @@ -38,13 +40,7 @@ virtual void UpdateSize(ICompositor& compositor) ORTHANC_OVERRIDE; public: - WebGLViewport(const std::string& canvasId); - - WebGLViewport(const std::string& canvasId, - boost::weak_ptr<UndoStack> undoStackW); - - WebGLViewport(const std::string& canvasId, - const Scene2D& scene); + static boost::shared_ptr<WebGLViewport> Create(const std::string& canvasId); virtual ~WebGLViewport();