Mercurial > hg > orthanc-stone

comparison Framework/Viewport/WebAssemblyViewport.h @ 1308:adf234ecaa00 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:21:54 +0100
parents 257f2c9a02ac
children cbfdba08e039
comparison
equal deleted inserted replaced
1307:8a28a9bf8876 1308:adf234ecaa00
41 private: 41 private:
42 class WasmLock; 42 class WasmLock;
43 43
44 std::string shortCanvasId_; 44 std::string shortCanvasId_;
45 std::string fullCanvasId_; 45 std::string fullCanvasId_;
46 std::auto_ptr<ICompositor> compositor_; 46 std::unique_ptr<ICompositor> compositor_;
47 boost::shared_ptr<ViewportController> controller_; 47 boost::shared_ptr<ViewportController> controller_;
48 std::auto_ptr<IViewportInteractor> interactor_; 48 std::unique_ptr<IViewportInteractor> interactor_;
49 49
50 static EM_BOOL OnRequestAnimationFrame(double time, void *userData); 50 static EM_BOOL OnRequestAnimationFrame(double time, void *userData);
51 51
52 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData); 52 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData);
53 53