Mercurial > hg > orthanc-stone

comparison Samples/WebAssembly/BasicScene.cpp @ 754:92c400a09f1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 22 May 2019 16:13:46 +0200
parents 6030db24eaea c35e98d22764
children 46403ab629f6
comparison
equal deleted inserted replaced
753:a386bbc955dc 754:92c400a09f1b
156 OpenGLCompositor compositor_; 156 OpenGLCompositor compositor_;
157 157
158 void SetupEvents(const std::string& canvas); 158 void SetupEvents(const std::string& canvas);
159 159
160 public: 160 public:
161 WebAssemblyViewport(MessageBroker& broker, 161 WebAssemblyViewport(const std::string& canvas) :
162 const std::string& canvas) :
163 context_(canvas), 162 context_(canvas),
164 controller_(make_shared<ViewportController>(broker)), 163 controller_(make_shared<ViewportController>(broker)),
165 compositor_(context_, *controller_->GetScene()) 164 compositor_(context_, *controller_->GetScene())
166 { 165 {
167 compositor_.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, 166 compositor_.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT,
379 } 378 }
380 379
381 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport1_; 380 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport1_;
382 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport2_; 381 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport2_;
383 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport3_; 382 std::auto_ptr<OrthancStone::WebAssemblyViewport> viewport3_;
384 OrthancStone::MessageBroker broker_;
385 383
386 EM_BOOL OnWindowResize( 384 EM_BOOL OnWindowResize(
387 int eventType, const EmscriptenUiEvent *uiEvent, void *userData) 385 int eventType, const EmscriptenUiEvent *uiEvent, void *userData)
388 { 386 {
389 if (viewport1_.get() != NULL) 387 if (viewport1_.get() != NULL)