Mercurial > hg > orthanc-stone
diff Framework/Viewport/WebGLViewport.cpp @ 1318:cbfdba08e039 broker
removed SDL code in wasm + added undostack CTOR in Wasm viewport + build fix + ORTHANC_OVERRIDE
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Tue, 17 Mar 2020 08:40:13 +0100 |
parents | 0ca50d275b9a |
children | ab81ee8fce1f |
line wrap: on
line diff
--- a/Framework/Viewport/WebGLViewport.cpp Tue Mar 17 08:37:12 2020 +0100 +++ b/Framework/Viewport/WebGLViewport.cpp Tue Mar 17 08:40:13 2020 +0100 @@ -79,24 +79,29 @@ } } - - WebGLViewport::WebGLViewport(const std::string& canvasId) : - WebAssemblyViewport(canvasId, NULL), + WebGLViewport::WebGLViewport(const std::string& canvasId, + boost::weak_ptr<UndoStack> undoStackW) : + WebAssemblyViewport(canvasId, NULL, undoStackW), context_(GetFullCanvasId()) { AcquireCompositor(new OpenGLCompositor(context_)); } - - WebGLViewport::WebGLViewport(const std::string& canvasId, - const Scene2D& scene) : - WebAssemblyViewport(canvasId, &scene), + WebGLViewport::WebGLViewport(const std::string& canvasId) : + WebAssemblyViewport(canvasId, NULL, boost::weak_ptr<UndoStack>()), context_(GetFullCanvasId()) { AcquireCompositor(new OpenGLCompositor(context_)); } - + WebGLViewport::WebGLViewport(const std::string& canvasId, + const Scene2D& scene) : + WebAssemblyViewport(canvasId, &scene, boost::weak_ptr<UndoStack>()), + context_(GetFullCanvasId()) + { + AcquireCompositor(new OpenGLCompositor(context_)); + } + WebGLViewport::~WebGLViewport() { // Make sure to delete the compositor before its parent "context_" gets deleted