annotate Platforms/WebAssembly/Defaults.cpp @ 229:b0ba3b38a23c am

ScheduleRedraw can handle multiple viewports
author am@osimis.io
date Thu, 14 Jun 2018 16:51:43 +0200
parents 210c1ce8e1a6
children 5027cb2feb51
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
1 #include "Defaults.h"
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
2
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
3 #include "WasmWebService.h"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
4 #include <Framework/dev.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
5 #include "Framework/Widgets/TestCairoWidget.h"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
6 #include <Framework/Viewport/WidgetViewport.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
7 #include <Framework/Widgets/LayerWidget.h>
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
8 #include <algorithm>
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
9
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
10 static unsigned int width_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
11 static unsigned int height_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
12
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
13 /**********************************/
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
14
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
15 static std::auto_ptr<OrthancStone::BasicWasmApplication> application;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
16 static OrthancStone::ChangeObserver changeObserver_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
17 static OrthancStone::StatusBar statusBar_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
18
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
19
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
20 static std::list<std::shared_ptr<OrthancStone::WidgetViewport>> viewports_;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
21
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
22 std::shared_ptr<OrthancStone::WidgetViewport> FindViewportSharedPtr(ViewportHandle viewport) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
23 for (const auto& v : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
24 if (v.get() == viewport) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
25 return v;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
26 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
27 }
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
28 assert(false);
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
29 return std::shared_ptr<OrthancStone::WidgetViewport>();
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
30 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
31
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
32 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
33 extern "C" {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
34 #endif
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
35
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
36 using namespace OrthancStone;
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
37
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
38 // when WASM needs a C++ viewport
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
39 ViewportHandle EMSCRIPTEN_KEEPALIVE CreateCppViewport() {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
40
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
41 std::shared_ptr<OrthancStone::WidgetViewport> viewport(new OrthancStone::WidgetViewport);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
42 printf("viewport %x\n", viewport.get());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
43
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
44 viewports_.push_back(viewport);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
45
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
46 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
47
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
48 viewport->SetStatusBar(statusBar_);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
49 viewport->Register(changeObserver_);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
50
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
51 return viewport.get();
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
52 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
53
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
54 // when WASM does not need a viewport anymore, it should release it
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
55 void EMSCRIPTEN_KEEPALIVE ReleaseCppViewport(ViewportHandle viewport) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
56 viewports_.remove_if([viewport](const std::shared_ptr<OrthancStone::WidgetViewport>& v) { return v.get() == viewport;});
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
57
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
58 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
59 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
60
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
61 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
62
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
63 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
64
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
65 application.reset(CreateUserApplication());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
66
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
67 boost::program_options::options_description options;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
68 application->DeclareStartupOptions(options);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
69 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
70
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
71 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
72 const char* value) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
73 application->SetStartupParameter(keyc, value);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
74 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
75
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
76 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(ViewportHandle viewport) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
77
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
78 printf("StartWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
79
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
80 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
81 boost::program_options::variables_map parameters;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
82 application->GetStartupParameters(parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
83
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
84 BasicWasmApplicationContext& context = dynamic_cast<BasicWasmApplicationContext&>(application->CreateApplicationContext(OrthancStone::WasmWebService::GetInstance(), FindViewportSharedPtr(viewport)));
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
85 application->Initialize(statusBar_, parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
86
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
87 viewport->SetSize(width_, height_);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
88 printf("StartWasmApplication - completed\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
89 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
90
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
91 void EMSCRIPTEN_KEEPALIVE NotifyUpdateContent()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
92 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
93 for (auto viewport : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
94 // TODO Only launch the JavaScript timer if "HasUpdateContent()"
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
95 if (viewport->HasUpdateContent())
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
96 {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
97 viewport->UpdateContent();
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
98 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
99
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
100 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
101
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
102 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
103
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
104
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
105 void EMSCRIPTEN_KEEPALIVE ViewportSetSize(ViewportHandle viewport, unsigned int width, unsigned int height)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
106 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
107 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
108 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
109
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
110 viewport->SetSize(width, height);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
111 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
112
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
113 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport,
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
114 unsigned int width,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
115 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
116 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
117 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
118 changeObserver_.Reset();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
119
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
120 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
121 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
122 height == 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
123 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
124 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
125 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
126
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
127 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
128 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
129
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
130 viewport->Render(surface);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
131
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
132 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
133 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
134 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
136 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
137 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
138 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
139 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
141 p[2] = tmp;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
142
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
143 p += 4;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
144 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
145 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
146
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
147 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
148 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
149
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
150
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
151 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
152 unsigned int rawButton,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
153 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
154 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
155 unsigned int rawModifiers)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
156 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
157 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
158 switch (rawButton)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
159 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
160 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
161 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
162 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
163
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
165 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
166 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
167
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
168 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
169 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
170 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
171
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
172 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
173 return; // Unknown button
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
174 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
175
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
176 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None /* TODO */);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
177 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
178
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
179
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
180 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
181 int deltaY,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
182 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184 int isControl)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
185 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
186 if (deltaY != 0)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
187 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
189 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
190 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
191 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
192
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
193 if (isControl != 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
194 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
195 modifiers = OrthancStone::KeyboardModifiers_Control;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
196 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
197
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
198 viewport->MouseWheel(direction, x, y, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
199 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
200 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
201
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
202
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
203 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
204 int x,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
205 int y)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
206 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
207 viewport->MouseMove(x, y);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
208 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
209
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
210 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
211 const char* key,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
212 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
213 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
214 bool isAltPressed)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
215
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
216 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
217 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
218 if (isShiftPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
219 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
220 }
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
221 if (isControlPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
222 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
223 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
224 if (isAltPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
225 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
226 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
227 printf("key pressed : %c\n", key[0]);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
228 viewport->KeyPressed(key[0], modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
229 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
230
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
231
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
232 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
233 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
234 viewport->MouseUp();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
235 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
236
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
237
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
238 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
239 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
240 viewport->MouseEnter();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
241 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
242
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
243
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
244 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
245 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
246 viewport->MouseLeave();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
247 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
248
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
249
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
250 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
251 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
252 #endif