annotate Platforms/Wasm/Defaults.cpp @ 504:7cdb4634846c

Merge
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 26 Feb 2019 21:15:20 +0100
parents 26b90b110719
children 3b4df9925db6
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"
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
4 #include "WasmDelayedCallExecutor.h"
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
5 #include <Framework/dev.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
6 #include "Framework/Widgets/TestCairoWidget.h"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
7 #include <Framework/Viewport/WidgetViewport.h>
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
8 #include <algorithm>
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
9 #include "Applications/Wasm/StartupParametersBuilder.h"
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
10 #include "Platforms/Wasm/WasmPlatformApplicationAdapter.h"
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
11
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
12 static unsigned int width_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
13 static unsigned int height_ = 0;
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 /**********************************/
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
16
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
17 static std::unique_ptr<OrthancStone::IStoneApplication> application;
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
18 static std::unique_ptr<OrthancStone::WasmPlatformApplicationAdapter> applicationWasmAdapter = NULL;
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
19 static std::unique_ptr<OrthancStone::StoneApplicationContext> context;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
20 static OrthancStone::StartupParametersBuilder startupParametersBuilder;
253
8ff70c04c6df IObservable/IObserver now working in WASM too
am@osimis.io
parents: 242
diff changeset
21 static OrthancStone::MessageBroker broker;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
22
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
23 static OrthancStone::ViewportContentChangedObserver viewportContentChangedObserver_(broker);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
24 static OrthancStone::StatusBar statusBar_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
25
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
26 static std::list<std::shared_ptr<OrthancStone::WidgetViewport>> viewports_;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
27
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
28 std::shared_ptr<OrthancStone::WidgetViewport> FindViewportSharedPtr(ViewportHandle viewport) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
29 for (const auto& v : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
30 if (v.get() == viewport) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
31 return v;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
32 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
33 }
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
34 assert(false);
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
35 return std::shared_ptr<OrthancStone::WidgetViewport>();
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
36 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
37
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
38 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
39 extern "C" {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
40 #endif
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
41
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
42 using namespace OrthancStone;
227
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 // when WASM needs a C++ viewport
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
45 ViewportHandle EMSCRIPTEN_KEEPALIVE CreateCppViewport() {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
46
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
47 std::shared_ptr<OrthancStone::WidgetViewport> viewport(new OrthancStone::WidgetViewport(broker));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
48 printf("viewport %x\n", (int)viewport.get());
227
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 viewports_.push_back(viewport);
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 printf("There are now %d viewports in C++\n", viewports_.size());
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 viewport->SetStatusBar(statusBar_);
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
55
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
56 viewport->RegisterObserverCallback(
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
57 new Callable<ViewportContentChangedObserver, IViewport::ViewportChangedMessage>
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
58 (viewportContentChangedObserver_, &ViewportContentChangedObserver::OnViewportChanged));
227
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 return viewport.get();
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
61 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
62
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
63 // 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
64 void EMSCRIPTEN_KEEPALIVE ReleaseCppViewport(ViewportHandle viewport) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
65 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
66
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
67 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
68 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
69
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
70 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
71
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
72 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
73
253
8ff70c04c6df IObservable/IObserver now working in WASM too
am@osimis.io
parents: 242
diff changeset
74 application.reset(CreateUserApplication(broker));
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
75 applicationWasmAdapter.reset(CreateWasmApplicationAdapter(broker, application.get()));
255
65562a28fe05 fixes for WASM
am@osimis.io
parents: 253
diff changeset
76 WasmWebService::SetBroker(broker);
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
77 WasmDelayedCallExecutor::SetBroker(broker);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
78
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
79 startupParametersBuilder.Clear();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
80 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
81
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
82 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
83 const char* value) {
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
84 startupParametersBuilder.SetStartupParameter(keyc, value);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
85 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
86
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
87 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(const char* baseUri) {
223
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 printf("StartWasmApplication\n");
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 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
92 boost::program_options::variables_map parameters;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
93 boost::program_options::options_description options;
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
94 application->DeclareStartupOptions(options);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
95 startupParametersBuilder.GetStartupParameters(parameters, options);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
96
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
97 context.reset(new OrthancStone::StoneApplicationContext(broker));
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
98 context->SetOrthancBaseUrl(baseUri);
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
99 printf("Base URL to Orthanc API: [%s]\n", baseUri);
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
100 context->SetWebService(OrthancStone::WasmWebService::GetInstance());
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
101 context->SetDelayedCallExecutor(OrthancStone::WasmDelayedCallExecutor::GetInstance());
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
102 application->Initialize(context.get(), statusBar_, parameters);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
103 application->InitializeWasm();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
104
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 229
diff changeset
105 // viewport->SetSize(width_, height_);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
106 printf("StartWasmApplication - completed\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
107 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
108
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
109 void EMSCRIPTEN_KEEPALIVE WasmDoAnimation()
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
110 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
111 for (auto viewport : viewports_) {
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
112 // TODO Only launch the JavaScript timer if "HasAnimation()"
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
113 if (viewport->HasAnimation())
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
114 {
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
115 viewport->DoAnimation();
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
116 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
117
223
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
120 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
121
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
122
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
123 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
124 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
125 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
126 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
127
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
128 viewport->SetSize(width, height);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
129 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
130
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
131 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport,
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
132 unsigned int width,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
133 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
134 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 {
278
8a86695fcbc3 renamings
am@osimis.io
parents: 272
diff changeset
136 viewportContentChangedObserver_.Reset();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
137
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
138 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
139 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140 height == 0)
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 return 1;
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 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
146 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
147
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
148 viewport->Render(surface);
223
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 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
151 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
152 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
153 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
154 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
155 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
156 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
157 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
158 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
159 p[2] = tmp;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
160
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
161 p += 4;
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 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
165 return 1;
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
168
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
169 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
170 unsigned int rawButton,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
171 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
172 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
173 unsigned int rawModifiers)
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 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
176 switch (rawButton)
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 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
179 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
180 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
181
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
182 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
185
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
186 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
187 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
189
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
190 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
191 return; // Unknown button
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
194 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None /* TODO */);
223
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
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 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
199 int deltaY,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
200 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
201 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
202 int isControl)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
203 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
204 if (deltaY != 0)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
205 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
206 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
207 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
208 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
209 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
210
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
211 if (isControl != 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
212 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
213 modifiers = OrthancStone::KeyboardModifiers_Control;
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 viewport->MouseWheel(direction, x, y, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
217 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
218 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
219
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 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
222 int x,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
223 int y)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
224 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
225 viewport->MouseMove(x, y);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
226 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
227
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
228 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(ViewportHandle viewport,
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
229 int key,
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
230 const char* keyChar,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
231 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
232 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
233 bool isAltPressed)
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 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
236 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
237 if (isShiftPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
238 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
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 if (isControlPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
241 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
242 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
243 if (isAltPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
244 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
245 }
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
246
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
247 char c = 0;
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
248 if (keyChar != NULL && key == OrthancStone::KeyboardKeys_Generic) {
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
249 c = keyChar[0];
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
250 }
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
251 viewport->KeyPressed(static_cast<OrthancStone::KeyboardKeys>(key), c, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
252 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
253
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
254
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
255 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
256 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
257 viewport->MouseUp();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
258 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
259
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
260
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
261 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
262 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
263 viewport->MouseEnter();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
264 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
265
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
266
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
267 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
268 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
269 viewport->MouseLeave();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
270 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
271
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
272 const char* EMSCRIPTEN_KEEPALIVE SendMessageToStoneApplication(const char* message)
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
273 {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
274 static std::string output; // we don't want the string to be deallocated when we return to JS code so we always use the same string (this is fine since JS is single-thread)
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
275
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
276 printf("SendMessageToStoneApplication\n");
309
14ef1227120f web services: better handling of failures
am@osimis.io
parents: 307
diff changeset
277 printf("%s", message);
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
278
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
279 if (applicationWasmAdapter.get() != NULL) {
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
280 printf("sending message to C++\n");
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
281 applicationWasmAdapter->HandleMessageFromWeb(output, std::string(message));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
282 return output.c_str();
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
283 }
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
284 printf("This stone application does not have a Web Adapter");
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
285 return NULL;
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
286 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
287
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
288
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
289 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
290 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
291 #endif