Mercurial > hg > orthanc-stone
annotate Platforms/Wasm/Defaults.cpp @ 838:997290c7d537 am-dev
removed some logs
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Thu, 06 Jun 2019 10:50:54 +0200 |
| parents | 4f2416d519b4 |
| children | 238693c3bc51 |
| rev | line source |
|---|---|
| 222 | 1 #include "Defaults.h" |
| 2 | |
| 223 | 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 | 5 #include <Framework/dev.h> |
| 6 #include "Framework/Widgets/TestCairoWidget.h" | |
| 7 #include <Framework/Viewport/WidgetViewport.h> | |
|
603
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
8 #include <Applications/Wasm/StartupParametersBuilder.h> |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
9 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h> |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
10 #include <Core/Logging.h> |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
11 |
| 228 | 12 #include <algorithm> |
|
603
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
13 |
| 223 | 14 |
| 15 static unsigned int width_ = 0; | |
| 16 static unsigned int height_ = 0; | |
| 17 | |
| 18 /**********************************/ | |
| 19 | |
| 288 | 20 static std::unique_ptr<OrthancStone::IStoneApplication> application; |
| 307 | 21 static std::unique_ptr<OrthancStone::WasmPlatformApplicationAdapter> applicationWasmAdapter = NULL; |
| 288 | 22 static std::unique_ptr<OrthancStone::StoneApplicationContext> context; |
| 242 | 23 static OrthancStone::StartupParametersBuilder startupParametersBuilder; |
| 253 | 24 static OrthancStone::MessageBroker broker; |
| 242 | 25 |
|
385
6cc3ce74dc05
using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
26 static OrthancStone::ViewportContentChangedObserver viewportContentChangedObserver_(broker); |
| 223 | 27 static OrthancStone::StatusBar statusBar_; |
| 28 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
29 static std::list<std::shared_ptr<Deprecated::WidgetViewport>> viewports_; |
| 227 | 30 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
31 std::shared_ptr<Deprecated::WidgetViewport> FindViewportSharedPtr(ViewportHandle viewport) { |
| 228 | 32 for (const auto& v : viewports_) { |
| 33 if (v.get() == viewport) { | |
| 34 return v; | |
| 35 } | |
| 36 } | |
| 229 | 37 assert(false); |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
38 return std::shared_ptr<Deprecated::WidgetViewport>(); |
| 228 | 39 } |
| 40 | |
| 223 | 41 #ifdef __cplusplus |
| 42 extern "C" { | |
| 43 #endif | |
| 44 | |
| 45 using namespace OrthancStone; | |
| 227 | 46 |
| 47 // when WASM needs a C++ viewport | |
| 48 ViewportHandle EMSCRIPTEN_KEEPALIVE CreateCppViewport() { | |
| 49 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
50 std::shared_ptr<Deprecated::WidgetViewport> viewport(new Deprecated::WidgetViewport(broker)); |
| 287 | 51 printf("viewport %x\n", (int)viewport.get()); |
| 227 | 52 |
| 53 viewports_.push_back(viewport); | |
| 54 | |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
55 printf("There are now %lu viewports in C++\n", viewports_.size()); |
| 227 | 56 |
| 57 viewport->SetStatusBar(statusBar_); | |
|
385
6cc3ce74dc05
using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
58 |
|
6cc3ce74dc05
using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
59 viewport->RegisterObserverCallback( |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
60 new Callable<ViewportContentChangedObserver, Deprecated::IViewport::ViewportChangedMessage> |
|
385
6cc3ce74dc05
using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
327
diff
changeset
|
61 (viewportContentChangedObserver_, &ViewportContentChangedObserver::OnViewportChanged)); |
| 227 | 62 |
| 63 return viewport.get(); | |
| 64 } | |
| 65 | |
| 66 // when WASM does not need a viewport anymore, it should release it | |
| 67 void EMSCRIPTEN_KEEPALIVE ReleaseCppViewport(ViewportHandle viewport) { | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
68 viewports_.remove_if([viewport](const std::shared_ptr<Deprecated::WidgetViewport>& v) { return v.get() == viewport;}); |
| 227 | 69 |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
70 printf("There are now %lu viewports in C++\n", viewports_.size()); |
| 227 | 71 } |
| 72 | |
| 73 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) { | |
| 223 | 74 |
| 75 printf("CreateWasmApplication\n"); | |
| 76 | |
| 253 | 77 application.reset(CreateUserApplication(broker)); |
| 307 | 78 applicationWasmAdapter.reset(CreateWasmApplicationAdapter(broker, application.get())); |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
79 Deprecated::WasmWebService::SetBroker(broker); |
|
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
80 Deprecated::WasmDelayedCallExecutor::SetBroker(broker); |
| 223 | 81 |
| 242 | 82 startupParametersBuilder.Clear(); |
| 223 | 83 } |
| 84 | |
| 85 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc, | |
| 86 const char* value) { | |
| 242 | 87 startupParametersBuilder.SetStartupParameter(keyc, value); |
| 223 | 88 } |
| 89 | |
| 418 | 90 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(const char* baseUri) { |
| 223 | 91 |
| 92 printf("StartWasmApplication\n"); | |
| 93 | |
|
603
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
94 Orthanc::Logging::SetErrorWarnInfoTraceLoggingFunctions( |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
95 stone_console_error, stone_console_warning, |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
96 stone_console_info, stone_console_trace); |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
97 |
| 223 | 98 // recreate a command line from uri arguments and parse it |
| 99 boost::program_options::variables_map parameters; | |
| 242 | 100 boost::program_options::options_description options; |
| 101 application->DeclareStartupOptions(options); | |
| 102 startupParametersBuilder.GetStartupParameters(parameters, options); | |
| 223 | 103 |
| 418 | 104 context.reset(new OrthancStone::StoneApplicationContext(broker)); |
| 105 context->SetOrthancBaseUrl(baseUri); | |
| 106 printf("Base URL to Orthanc API: [%s]\n", baseUri); | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
107 context->SetWebService(Deprecated::WasmWebService::GetInstance()); |
|
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
108 context->SetDelayedCallExecutor(Deprecated::WasmDelayedCallExecutor::GetInstance()); |
| 242 | 109 application->Initialize(context.get(), statusBar_, parameters); |
| 110 application->InitializeWasm(); | |
| 223 | 111 |
|
231
5027cb2feb51
viewport is now part of the Application itself and not global anymore
am@osimis.io
parents:
229
diff
changeset
|
112 // viewport->SetSize(width_, height_); |
| 223 | 113 printf("StartWasmApplication - completed\n"); |
| 114 } | |
| 115 | |
|
603
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
116 bool EMSCRIPTEN_KEEPALIVE WasmIsTraceLevelEnabled() |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
117 { |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
118 return Orthanc::Logging::IsTraceLevelEnabled(); |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
119 } |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
120 |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
121 bool EMSCRIPTEN_KEEPALIVE WasmIsInfoLevelEnabled() |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
122 { |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
123 return Orthanc::Logging::IsInfoLevelEnabled(); |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
124 } |
|
70992b38aa8a
new routable logging system in STDIO mode + flag support (with no value) in StartupParametersBuilder + 80 col indent
Benjamin Golinvaux <bgo@osimis.io>
parents:
535
diff
changeset
|
125 |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
385
diff
changeset
|
126 void EMSCRIPTEN_KEEPALIVE WasmDoAnimation() |
| 223 | 127 { |
| 228 | 128 for (auto viewport : viewports_) { |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
385
diff
changeset
|
129 // TODO Only launch the JavaScript timer if "HasAnimation()" |
|
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
385
diff
changeset
|
130 if (viewport->HasAnimation()) |
| 228 | 131 { |
|
386
e33659decec5
renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
385
diff
changeset
|
132 viewport->DoAnimation(); |
| 228 | 133 } |
| 134 | |
| 223 | 135 } |
| 136 | |
| 137 } | |
| 138 | |
| 139 | |
| 228 | 140 void EMSCRIPTEN_KEEPALIVE ViewportSetSize(ViewportHandle viewport, unsigned int width, unsigned int height) |
| 223 | 141 { |
| 142 width_ = width; | |
| 143 height_ = height; | |
| 144 | |
| 228 | 145 viewport->SetSize(width, height); |
| 223 | 146 } |
| 147 | |
| 228 | 148 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport, |
| 227 | 149 unsigned int width, |
| 223 | 150 unsigned int height, |
| 151 uint8_t* data) | |
| 152 { | |
| 278 | 153 viewportContentChangedObserver_.Reset(); |
| 223 | 154 |
| 155 //printf("ViewportRender called %dx%d\n", width, height); | |
| 156 if (width == 0 || | |
| 157 height == 0) | |
| 158 { | |
| 159 return 1; | |
| 160 } | |
| 161 | |
| 162 Orthanc::ImageAccessor surface; | |
| 163 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data); | |
| 164 | |
| 227 | 165 viewport->Render(surface); |
| 223 | 166 |
| 167 // Convert from BGRA32 memory layout (only color mode supported by | |
| 168 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as | |
| 169 // expected by HTML5 canvas). This simply amounts to swapping the | |
| 170 // B and R channels. | |
| 171 uint8_t* p = data; | |
| 172 for (unsigned int y = 0; y < height; y++) { | |
| 173 for (unsigned int x = 0; x < width; x++) { | |
| 174 uint8_t tmp = p[0]; | |
| 175 p[0] = p[2]; | |
| 176 p[2] = tmp; | |
| 177 | |
| 178 p += 4; | |
| 179 } | |
| 180 } | |
| 181 | |
| 182 return 1; | |
| 183 } | |
| 184 | |
| 185 | |
| 228 | 186 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport, |
| 187 unsigned int rawButton, | |
| 223 | 188 int x, |
| 189 int y, | |
| 190 unsigned int rawModifiers) | |
| 191 { | |
| 192 OrthancStone::MouseButton button; | |
| 193 switch (rawButton) | |
| 194 { | |
| 195 case 0: | |
| 196 button = OrthancStone::MouseButton_Left; | |
| 197 break; | |
| 198 | |
| 199 case 1: | |
| 200 button = OrthancStone::MouseButton_Middle; | |
| 201 break; | |
| 202 | |
| 203 case 2: | |
| 204 button = OrthancStone::MouseButton_Right; | |
| 205 break; | |
| 206 | |
| 207 default: | |
| 208 return; // Unknown button | |
| 209 } | |
| 210 | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
211 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None, std::vector<Deprecated::Touch>()); |
| 223 | 212 } |
| 213 | |
| 214 | |
| 228 | 215 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport, |
| 216 int deltaY, | |
| 223 | 217 int x, |
| 218 int y, | |
| 219 int isControl) | |
| 220 { | |
| 228 | 221 if (deltaY != 0) |
| 223 | 222 { |
| 223 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ? | |
| 224 OrthancStone::MouseWheelDirection_Up : | |
| 225 OrthancStone::MouseWheelDirection_Down); | |
| 226 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None; | |
| 227 | |
| 228 if (isControl != 0) | |
| 229 { | |
| 230 modifiers = OrthancStone::KeyboardModifiers_Control; | |
| 231 } | |
| 232 | |
| 228 | 233 viewport->MouseWheel(direction, x, y, modifiers); |
| 223 | 234 } |
| 235 } | |
| 236 | |
| 237 | |
| 228 | 238 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport, |
| 239 int x, | |
| 223 | 240 int y) |
| 241 { | |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
242 viewport->MouseMove(x, y, std::vector<Deprecated::Touch>()); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
243 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
244 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
245 void GetTouchVector(std::vector<Deprecated::Touch>& output, |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
246 int touchCount, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
247 float x0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
248 float y0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
249 float x1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
250 float y1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
251 float x2, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
252 float y2) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
253 { |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
254 // TODO: it might be nice to try to pass all the x0,y0 coordinates as arrays but that's not so easy to pass array between JS and C++ |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
255 if (touchCount > 0) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
256 { |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
257 output.push_back(Deprecated::Touch(x0, y0)); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
258 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
259 if (touchCount > 1) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
260 { |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
261 output.push_back(Deprecated::Touch(x1, y1)); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
262 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
263 if (touchCount > 2) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
264 { |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
265 output.push_back(Deprecated::Touch(x2, y2)); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
266 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
267 |
| 223 | 268 } |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
269 |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
270 void EMSCRIPTEN_KEEPALIVE ViewportTouchStart(ViewportHandle viewport, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
271 int touchCount, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
272 float x0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
273 float y0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
274 float x1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
275 float y1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
276 float x2, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
277 float y2) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
278 { |
| 838 | 279 // printf("touch start with %d touches\n", touchCount); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
280 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
281 std::vector<Deprecated::Touch> touches; |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
282 GetTouchVector(touches, touchCount, x0, y0, x1, y1, x2, y2); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
283 viewport->TouchStart(touches); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
284 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
285 |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
286 void EMSCRIPTEN_KEEPALIVE ViewportTouchMove(ViewportHandle viewport, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
287 int touchCount, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
288 float x0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
289 float y0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
290 float x1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
291 float y1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
292 float x2, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
293 float y2) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
294 { |
| 838 | 295 // printf("touch move with %d touches\n", touchCount); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
296 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
297 std::vector<Deprecated::Touch> touches; |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
298 GetTouchVector(touches, touchCount, x0, y0, x1, y1, x2, y2); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
299 viewport->TouchMove(touches); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
300 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
301 |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
302 void EMSCRIPTEN_KEEPALIVE ViewportTouchEnd(ViewportHandle viewport, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
303 int touchCount, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
304 float x0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
305 float y0, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
306 float x1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
307 float y1, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
308 float x2, |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
309 float y2) |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
310 { |
| 838 | 311 // printf("touch end with %d touches remaining\n", touchCount); |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
312 |
|
726
4f2416d519b4
moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
603
diff
changeset
|
313 std::vector<Deprecated::Touch> touches; |
|
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
314 GetTouchVector(touches, touchCount, x0, y0, x1, y1, x2, y2); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
315 viewport->TouchEnd(touches); |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
316 } |
|
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
431
diff
changeset
|
317 |
| 228 | 318 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(ViewportHandle viewport, |
| 327 | 319 int key, |
| 320 const char* keyChar, | |
| 223 | 321 bool isShiftPressed, |
| 322 bool isControlPressed, | |
| 323 bool isAltPressed) | |
| 324 | |
| 325 { | |
| 228 | 326 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None; |
| 327 if (isShiftPressed) { | |
| 328 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift); | |
| 223 | 329 } |
| 228 | 330 if (isControlPressed) { |
| 331 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control); | |
| 332 } | |
| 333 if (isAltPressed) { | |
| 334 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt); | |
| 335 } | |
| 327 | 336 |
| 337 char c = 0; | |
| 338 if (keyChar != NULL && key == OrthancStone::KeyboardKeys_Generic) { | |
| 339 c = keyChar[0]; | |
| 340 } | |
| 341 viewport->KeyPressed(static_cast<OrthancStone::KeyboardKeys>(key), c, modifiers); | |
| 223 | 342 } |
| 343 | |
| 344 | |
| 228 | 345 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp(ViewportHandle viewport) |
| 223 | 346 { |
| 228 | 347 viewport->MouseUp(); |
| 223 | 348 } |
| 349 | |
| 350 | |
| 228 | 351 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport) |
| 223 | 352 { |
| 228 | 353 viewport->MouseEnter(); |
| 223 | 354 } |
| 355 | |
| 356 | |
| 228 | 357 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave(ViewportHandle viewport) |
| 223 | 358 { |
| 228 | 359 viewport->MouseLeave(); |
| 223 | 360 } |
| 361 | |
|
508
7105a0bad250
- Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents:
458
diff
changeset
|
362 const char* EMSCRIPTEN_KEEPALIVE SendSerializedMessageToStoneApplication(const char* message) |
| 287 | 363 { |
| 364 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) | |
| 365 | |
| 838 | 366 //printf("SendSerializedMessageToStoneApplication\n"); |
| 367 //printf("%s", message); | |
| 307 | 368 |
| 369 if (applicationWasmAdapter.get() != NULL) { | |
|
508
7105a0bad250
- Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents:
458
diff
changeset
|
370 applicationWasmAdapter->HandleSerializedMessageFromWeb(output, std::string(message)); |
| 287 | 371 return output.c_str(); |
| 372 } | |
| 838 | 373 printf("This Stone application does not have a Web Adapter, unable to send messages"); |
| 307 | 374 return NULL; |
| 287 | 375 } |
| 376 | |
| 223 | 377 #ifdef __cplusplus |
| 378 } | |
| 379 #endif |