Mercurial > hg > orthanc-stone

comparison Framework/Viewport/WebGLViewport.cpp @ 1318:cbfdba08e039 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1317:8981bfca3457 1318:cbfdba08e039
77 throw; 77 throw;
78 } 78 }
79 } 79 }
80 } 80 }
81 81
82 82 WebGLViewport::WebGLViewport(const std::string& canvasId,
83 WebGLViewport::WebGLViewport(const std::string& canvasId) : 83 boost::weak_ptr<UndoStack> undoStackW) :
84 WebAssemblyViewport(canvasId, NULL), 84 WebAssemblyViewport(canvasId, NULL, undoStackW),
85 context_(GetFullCanvasId()) 85 context_(GetFullCanvasId())
86 { 86 {
87 AcquireCompositor(new OpenGLCompositor(context_)); 87 AcquireCompositor(new OpenGLCompositor(context_));
88 } 88 }
89 89
90 90 WebGLViewport::WebGLViewport(const std::string& canvasId) :
91 WebGLViewport::WebGLViewport(const std::string& canvasId, 91 WebAssemblyViewport(canvasId, NULL, boost::weak_ptr<UndoStack>()),
92 const Scene2D& scene) :
93 WebAssemblyViewport(canvasId, &scene),
94 context_(GetFullCanvasId()) 92 context_(GetFullCanvasId())
95 { 93 {
96 AcquireCompositor(new OpenGLCompositor(context_)); 94 AcquireCompositor(new OpenGLCompositor(context_));
97 } 95 }
98 96
99 97 WebGLViewport::WebGLViewport(const std::string& canvasId,
98 const Scene2D& scene) :
99 WebAssemblyViewport(canvasId, &scene, boost::weak_ptr<UndoStack>()),
100 context_(GetFullCanvasId())
101 {
102 AcquireCompositor(new OpenGLCompositor(context_));
103 }
104
100 WebGLViewport::~WebGLViewport() 105 WebGLViewport::~WebGLViewport()
101 { 106 {
102 // Make sure to delete the compositor before its parent "context_" gets deleted 107 // Make sure to delete the compositor before its parent "context_" gets deleted
103 ClearCompositor(); 108 ClearCompositor();
104 } 109 }