Mercurial > hg > orthanc-stone
comparison Samples/WebAssembly/BasicScene.cpp @ 892:50cd372e2460
fix OpenGL context for fonts
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 11 Jul 2019 09:18:55 +0200 |
parents | 0aff28f15ea2 |
children | 9c2f6d6b9f4a |
comparison
equal
deleted
inserted
replaced
891:0aff28f15ea2 | 892:50cd372e2460 |
---|---|
84 l->SetAngle(20.0 / 180.0 * M_PI); | 84 l->SetAngle(20.0 / 180.0 * M_PI); |
85 scene.SetLayer(13, l.release()); | 85 scene.SetLayer(13, l.release()); |
86 } | 86 } |
87 | 87 |
88 // Some lines | 88 // Some lines |
89 if (1) | |
89 { | 90 { |
90 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); | 91 std::auto_ptr<PolylineSceneLayer> layer(new PolylineSceneLayer); |
91 | 92 |
92 layer->SetThickness(1); | 93 layer->SetThickness(1); |
93 | 94 |
185 FONT_SIZE, Orthanc::Encoding_Latin1); | 186 FONT_SIZE, Orthanc::Encoding_Latin1); |
186 viewport2_->GetCompositor().SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, | 187 viewport2_->GetCompositor().SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, |
187 FONT_SIZE, Orthanc::Encoding_Latin1); | 188 FONT_SIZE, Orthanc::Encoding_Latin1); |
188 viewport3_->GetCompositor().SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, | 189 viewport3_->GetCompositor().SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, |
189 FONT_SIZE, Orthanc::Encoding_Latin1); | 190 FONT_SIZE, Orthanc::Encoding_Latin1); |
190 | 191 |
191 controller1_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport1_)); | 192 controller1_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport1_)); |
192 controller2_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport2_)); | 193 controller2_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport2_)); |
193 controller3_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport3_)); | 194 controller3_.reset(new OrthancStone::ViewportController(boost::make_shared<OrthancStone::UndoStack>(), broker_, *viewport3_)); |
194 | 195 |
196 controller1_->FitContent(viewport1_->GetCanvasWidth(), viewport1_->GetCanvasHeight()); | |
197 controller2_->FitContent(viewport2_->GetCanvasWidth(), viewport2_->GetCanvasHeight()); | |
198 controller3_->FitContent(viewport3_->GetCanvasWidth(), viewport3_->GetCanvasHeight()); | |
199 | |
200 viewport1_->Refresh(); | |
201 viewport2_->Refresh(); | |
202 viewport3_->Refresh(); | |
203 | |
195 SetupEvents("mycanvas1", controller1_); | 204 SetupEvents("mycanvas1", controller1_); |
196 SetupEvents("mycanvas2", controller2_); | 205 SetupEvents("mycanvas2", controller2_); |
197 SetupEvents("mycanvas3", controller3_); | 206 SetupEvents("mycanvas3", controller3_); |
198 | 207 |
199 emscripten_set_resize_callback("#window", NULL, false, OnWindowResize); | 208 emscripten_set_resize_callback("#window", NULL, false, OnWindowResize); |