Mercurial > hg > orthanc-stone
diff Samples/WebAssembly/BasicScene.cpp @ 754:92c400a09f1b
Merge from default
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 22 May 2019 16:13:46 +0200 |
parents | 6030db24eaea c35e98d22764 |
children | 46403ab629f6 |
line wrap: on
line diff
--- a/Samples/WebAssembly/BasicScene.cpp Wed May 22 16:01:34 2019 +0200 +++ b/Samples/WebAssembly/BasicScene.cpp Wed May 22 16:13:46 2019 +0200 @@ -158,8 +158,7 @@ void SetupEvents(const std::string& canvas); public: - WebAssemblyViewport(MessageBroker& broker, - const std::string& canvas) : + WebAssemblyViewport(const std::string& canvas) : context_(canvas), controller_(make_shared<ViewportController>(broker)), compositor_(context_, *controller_->GetScene()) @@ -381,7 +380,6 @@ std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport1_; std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport2_; std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport3_; -OrthancStone::MessageBroker broker_; EM_BOOL OnWindowResize( int eventType, const EmscriptenUiEvent *uiEvent, void *userData)