annotate Platforms/WebAssembly/Defaults.cpp @ 228:210c1ce8e1a6 am

WasmViewport is no more a singleton
author am@osimis.io
date Thu, 14 Jun 2018 15:06:29 +0200
parents c8f11437a6fd
children b0ba3b38a23c
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 assert(false);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
28 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
29 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
30
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
31 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
32 extern "C" {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
33 #endif
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
34
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
35 using namespace OrthancStone;
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
36
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
37 // when WASM needs a C++ viewport
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
38 ViewportHandle EMSCRIPTEN_KEEPALIVE CreateCppViewport() {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
39
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
40 std::shared_ptr<OrthancStone::WidgetViewport> viewport(new OrthancStone::WidgetViewport);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
41 printf("viewport %x\n", viewport.get());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
42
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
43 viewports_.push_back(viewport);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
44
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
45 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
46
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
47 viewport->SetStatusBar(statusBar_);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
48 viewport->Register(changeObserver_);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
49
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
50 return viewport.get();
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
51 }
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 // 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
54 void EMSCRIPTEN_KEEPALIVE ReleaseCppViewport(ViewportHandle viewport) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
55 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
56
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
57 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
58 }
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 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
61
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
62 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
63
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
64 application.reset(CreateUserApplication());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
65
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
66 boost::program_options::options_description options;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
67 application->DeclareStartupOptions(options);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
68 }
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 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
71 const char* value) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
72 application->SetStartupParameter(keyc, value);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
73 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
74
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
75 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(ViewportHandle viewport) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
76
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
77 printf("StartWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
78
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
79 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
80 boost::program_options::variables_map parameters;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
81 application->GetStartupParameters(parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
82
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
83 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
84 application->Initialize(statusBar_, parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
85
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
86 viewport->SetSize(width_, height_);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
87 printf("StartWasmApplication - completed\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
88 }
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 void EMSCRIPTEN_KEEPALIVE NotifyUpdateContent()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
91 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
92 for (auto viewport : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
93 // TODO Only launch the JavaScript timer if "HasUpdateContent()"
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
94 if (viewport->HasUpdateContent())
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
95 {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
96 viewport->UpdateContent();
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
97 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
98
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
99 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
104 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
105 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
106 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
107 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
108
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
109 viewport->SetSize(width, height);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
110 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
111
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
112 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport,
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
113 unsigned int width,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
114 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
115 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
116 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
117 changeObserver_.Reset();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
118
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
119 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
120 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
121 height == 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
122 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
123 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
124 }
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 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
127 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
128
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
129 viewport->Render(surface);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
130
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
131 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
132 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
133 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
134 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
136 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
137 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
138 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
139 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140 p[2] = tmp;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
141
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
142 p += 4;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
143 }
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 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
147 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
150 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
151 unsigned int rawButton,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
152 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
153 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
154 unsigned int rawModifiers)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
155 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
156 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
157 switch (rawButton)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
158 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
159 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
160 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
161 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
162
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
163 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
165 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
166
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
167 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
168 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
169 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
170
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
171 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
172 return; // Unknown button
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
173 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
174
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
175 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None /* TODO */);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
176 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
179 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
180 int deltaY,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
181 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
182 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 int isControl)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
185 if (deltaY != 0)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
186 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
187 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
189 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
190 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
191
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
192 if (isControl != 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
193 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
194 modifiers = OrthancStone::KeyboardModifiers_Control;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
195 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
196
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
197 viewport->MouseWheel(direction, x, y, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
198 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
202 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
203 int x,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
204 int y)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
205 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
206 viewport->MouseMove(x, y);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
207 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
208
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
209 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
210 const char* key,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
211 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
212 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
213 bool isAltPressed)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
214
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
215 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
216 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
217 if (isShiftPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
218 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
219 }
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
220 if (isControlPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
221 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
222 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
223 if (isAltPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
224 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
225 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
226 printf("key pressed : %c\n", key[0]);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
227 viewport->KeyPressed(key[0], modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
228 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
231 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
232 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
233 viewport->MouseUp();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
234 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
237 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
238 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
239 viewport->MouseEnter();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
240 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
243 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
244 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
245 viewport->MouseLeave();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
246 }
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 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
250 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
251 #endif