Mercurial > hg > orthanc-stone

comparison Framework/Viewport/WebAssemblyViewport.h @ 1346:df8bf351c23f broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The flag that allows the WebAssemblyViewport to **not** register the mouse events in the canvas (in case they are handled by other means) is now correctly passed down from the factory method.
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 06 Apr 2020 16:57:56 +0200
parents 5b731e176236
children 1b8e37770d78
comparison
equal deleted inserted replaced
1345:0d6a01ffa1dd 1346:df8bf351c23f
51 std::string shortCanvasId_; 51 std::string shortCanvasId_;
52 std::string fullCanvasId_; 52 std::string fullCanvasId_;
53 std::unique_ptr<ICompositor> compositor_; 53 std::unique_ptr<ICompositor> compositor_;
54 std::unique_ptr<ViewportController> controller_; 54 std::unique_ptr<ViewportController> controller_;
55 std::unique_ptr<IViewportInteractor> interactor_; 55 std::unique_ptr<IViewportInteractor> interactor_;
56 bool enableEmscriptenEvents_; 56 bool enableEmscriptenMouseEvents_;
57 57
58 static EM_BOOL OnRequestAnimationFrame(double time, void *userData); 58 static EM_BOOL OnRequestAnimationFrame(double time, void *userData);
59 59
60 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData); 60 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData);
61 61
88 /** 88 /**
89 The second argument is temporary and should be deleted once the migration 89 The second argument is temporary and should be deleted once the migration
90 to interactors is finished. 90 to interactors is finished.
91 */ 91 */
92 WebAssemblyViewport(const std::string& canvasId, 92 WebAssemblyViewport(const std::string& canvasId,
93 bool enableEmscriptenEvents = true); 93 bool enableEmscriptenMouseEvents = true);
94 94
95 void PostConstructor(); 95 void PostConstructor();
96 96
97 public: 97 public:
98 virtual ILock* Lock() ORTHANC_OVERRIDE; 98 virtual ILock* Lock() ORTHANC_OVERRIDE;