Mercurial > hg > orthanc-stone
comparison Samples/WebAssembly/dev.h @ 890:77c96ba899f9
removing OpenGLCompositor::UpdateSize()
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Jul 2019 15:23:13 +0200 |
parents | 2de01660debe |
children | 0aff28f15ea2 |
comparison
equal
deleted
inserted
replaced
888:6e888cf6a48b | 890:77c96ba899f9 |
---|---|
24 #include "../../Framework/OpenGL/WebAssemblyOpenGLContext.h" | 24 #include "../../Framework/OpenGL/WebAssemblyOpenGLContext.h" |
25 #include "../../Framework/Scene2D/OpenGLCompositor.h" | 25 #include "../../Framework/Scene2D/OpenGLCompositor.h" |
26 #include "../../Framework/Scene2D/PanSceneTracker.h" | 26 #include "../../Framework/Scene2D/PanSceneTracker.h" |
27 #include "../../Framework/Scene2D/RotateSceneTracker.h" | 27 #include "../../Framework/Scene2D/RotateSceneTracker.h" |
28 #include "../../Framework/Scene2D/ZoomSceneTracker.h" | 28 #include "../../Framework/Scene2D/ZoomSceneTracker.h" |
29 #include "../../Framework/Scene2DViewport/UndoStack.h" | |
29 #include "../../Framework/Scene2DViewport/ViewportController.h" | 30 #include "../../Framework/Scene2DViewport/ViewportController.h" |
30 | 31 |
31 #include <Core/OrthancException.h> | 32 #include <Core/OrthancException.h> |
32 | 33 |
33 #include <emscripten/html5.h> | 34 #include <emscripten/html5.h> |
35 #include <boost/make_shared.hpp> | |
34 | 36 |
35 static const unsigned int FONT_SIZE = 32; | 37 static const unsigned int FONT_SIZE = 32; |
36 | 38 |
37 namespace OrthancStone | 39 namespace OrthancStone |
38 { | 40 { |
50 | 52 |
51 public: | 53 public: |
52 WebAssemblyViewport(MessageBroker& broker, | 54 WebAssemblyViewport(MessageBroker& broker, |
53 const std::string& canvas) : | 55 const std::string& canvas) : |
54 context_(canvas), | 56 context_(canvas), |
55 controller_(new ViewportController(broker)), | 57 controller_(new ViewportController(boost::make_shared<UndoStack>(), broker)), |
56 compositor_(context_, *controller_->GetScene()) | 58 compositor_(context_, *controller_->GetScene()) |
57 { | 59 { |
58 compositor_.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, | 60 compositor_.SetFont(0, Orthanc::EmbeddedResources::UBUNTU_FONT, |
59 FONT_SIZE, Orthanc::Encoding_Latin1); | 61 FONT_SIZE, Orthanc::Encoding_Latin1); |
60 SetupEvents(canvas); | 62 SetupEvents(canvas); |
71 } | 73 } |
72 | 74 |
73 void UpdateSize() | 75 void UpdateSize() |
74 { | 76 { |
75 context_.UpdateSize(); | 77 context_.UpdateSize(); |
76 compositor_.UpdateSize(); | 78 //compositor_.UpdateSize(); |
77 Refresh(); | 79 Refresh(); |
78 } | 80 } |
79 | 81 |
80 void Refresh() | 82 void Refresh() |
81 { | 83 { |