annotate Platforms/Wasm/Defaults.cpp @ 287:2038d76bf13f am-2

interaction with HTML/JS
author am@osimis.io
date Thu, 30 Aug 2018 11:36:36 +0200
parents 8a86695fcbc3
children 8c8da145fefa
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>
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
9 #include "Applications/Wasm/StartupParametersBuilder.h"
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
10 #include "Platforms/Wasm/IStoneApplicationToWebApplicationAdapter.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
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
17 static std::unique_ptr<OrthancStone::IBasicApplication> application;
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
18 static OrthancStone::IStoneApplicationToWebApplicationAdapter* applicationWebAdapter = NULL;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
19 static std::unique_ptr<OrthancStone::BasicApplicationContext> context;
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
278
8a86695fcbc3 renamings
am@osimis.io
parents: 272
diff changeset
23 static OrthancStone::ViewportContentChangedObserver viewportContentChangedObserver_;
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
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
47 std::shared_ptr<OrthancStone::WidgetViewport> viewport(new OrthancStone::WidgetViewport);
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_);
278
8a86695fcbc3 renamings
am@osimis.io
parents: 272
diff changeset
55 viewport->Register(viewportContentChangedObserver_);
227
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 return viewport.get();
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 // 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
61 void EMSCRIPTEN_KEEPALIVE ReleaseCppViewport(ViewportHandle viewport) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
62 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
63
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
64 printf("There are now %d viewports in C++\n", viewports_.size());
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
65 }
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 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
223
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 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
70
253
8ff70c04c6df IObservable/IObserver now working in WASM too
am@osimis.io
parents: 242
diff changeset
71 application.reset(CreateUserApplication(broker));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
72 applicationWebAdapter = dynamic_cast<OrthancStone::IStoneApplicationToWebApplicationAdapter*>(application.get());
255
65562a28fe05 fixes for WASM
am@osimis.io
parents: 253
diff changeset
73 WasmWebService::SetBroker(broker);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
74
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
75 startupParametersBuilder.Clear();
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
78 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
79 const char* value) {
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
80 startupParametersBuilder.SetStartupParameter(keyc, value);
223
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
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 229
diff changeset
83 void EMSCRIPTEN_KEEPALIVE StartWasmApplication() {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
84
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
85 printf("StartWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
86
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
87 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
88 boost::program_options::variables_map parameters;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
89 boost::program_options::options_description options;
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
90 application->DeclareStartupOptions(options);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
91 startupParametersBuilder.GetStartupParameters(parameters, options);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
92
272
am@osimis.io
parents: 255
diff changeset
93 context.reset(new OrthancStone::BasicApplicationContext());
am@osimis.io
parents: 255
diff changeset
94 context->SetWebService(OrthancStone::WasmWebService::GetInstance());
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
95 application->Initialize(context.get(), statusBar_, parameters);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
96 application->InitializeWasm();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
97
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 229
diff changeset
98 // viewport->SetSize(width_, height_);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
99 printf("StartWasmApplication - completed\n");
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 void EMSCRIPTEN_KEEPALIVE NotifyUpdateContent()
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 for (auto viewport : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
105 // TODO Only launch the JavaScript timer if "HasUpdateContent()"
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
106 if (viewport->HasUpdateContent())
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
107 {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
108 viewport->UpdateContent();
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
109 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
110
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
113 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
114
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
115
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
116 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
117 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
118 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
119 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
120
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
121 viewport->SetSize(width, height);
223
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
124 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport,
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
125 unsigned int width,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
126 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
127 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
128 {
278
8a86695fcbc3 renamings
am@osimis.io
parents: 272
diff changeset
129 viewportContentChangedObserver_.Reset();
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 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
132 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
133 height == 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
134 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
136 }
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 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
139 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
141 viewport->Render(surface);
223
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 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
144 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
145 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
146 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
147 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
148 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
149 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
150 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
151 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
152 p[2] = tmp;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
153
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
154 p += 4;
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 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
157
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
158 return 1;
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
161
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
162 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
163 unsigned int rawButton,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
165 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
166 unsigned int rawModifiers)
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 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
169 switch (rawButton)
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 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
172 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
173 break;
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 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
176 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
177 break;
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 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
180 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
181 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
182
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184 return; // Unknown button
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
187 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None /* TODO */);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
191 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
192 int deltaY,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
193 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
194 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
195 int isControl)
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 if (deltaY != 0)
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 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
200 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
201 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
202 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
203
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
204 if (isControl != 0)
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 modifiers = OrthancStone::KeyboardModifiers_Control;
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 viewport->MouseWheel(direction, x, y, modifiers);
223
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 }
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
214 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
215 int x,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
216 int y)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
217 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
218 viewport->MouseMove(x, y);
223
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 ViewportKeyPressed(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
222 const char* key,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
223 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
224 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
225 bool isAltPressed)
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 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
229 if (isShiftPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
230 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
223
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 if (isControlPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
233 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
234 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
235 if (isAltPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
236 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
237 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
238 printf("key pressed : %c\n", key[0]);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
239 viewport->KeyPressed(key[0], modifiers);
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 ViewportMouseUp(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->MouseUp();
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
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
249 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
250 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
251 viewport->MouseEnter();
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 ViewportMouseLeave(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->MouseLeave();
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
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
260 const char* EMSCRIPTEN_KEEPALIVE SendMessageToStoneApplication(const char* message)
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
261 {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
262 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
263
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
264 if (applicationWebAdapter != NULL) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
265 printf("sending message to C++");
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
266 applicationWebAdapter->HandleMessageFromWeb(output, std::string(message));
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
267 return output.c_str();
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
268 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
269 return "This stone application does not have a Web Adapter";
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
270 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
271
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
272
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
273 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
274 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
275 #endif