annotate Platforms/Wasm/Defaults.cpp @ 1268:9a0a95c0b578

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 31 Jan 2020 17:25:27 +0100
parents 92a043b8e431
children
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"
732
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
5 #include "../../Framework/Deprecated/Widgets/TestCairoWidget.h"
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
6 #include <Framework/Deprecated/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
7 #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
8 #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h>
991
92a043b8e431 removed logs from IObserver constructor
Alain Mazy <alain@mazy.be>
parents: 878
diff changeset
9 #include <Framework/StoneInitialization.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
10 #include <Core/Logging.h>
991
92a043b8e431 removed logs from IObserver constructor
Alain Mazy <alain@mazy.be>
parents: 878
diff changeset
11 #include <sstream>
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
12
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
13 #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
14
223
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 static unsigned int width_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
17 static unsigned int height_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
18
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
19 /**********************************/
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
20
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
21 static std::unique_ptr<OrthancStone::IStoneApplication> application;
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
22 static std::unique_ptr<OrthancStone::WasmPlatformApplicationAdapter> applicationWasmAdapter = NULL;
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
23 static std::unique_ptr<OrthancStone::StoneApplicationContext> context;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
24 static OrthancStone::StartupParametersBuilder startupParametersBuilder;
253
8ff70c04c6df IObservable/IObserver now working in WASM too
am@osimis.io
parents: 242
diff changeset
25 static OrthancStone::MessageBroker broker;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
26
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
27 static OrthancStone::ViewportContentChangedObserver viewportContentChangedObserver_(broker);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
28 static OrthancStone::StatusBar statusBar_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
29
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
30 static std::list<std::shared_ptr<Deprecated::WidgetViewport>> viewports_;
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
31
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
32 std::shared_ptr<Deprecated::WidgetViewport> FindViewportSharedPtr(ViewportHandle viewport) {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
33 for (const auto& v : viewports_) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
34 if (v.get() == viewport) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
35 return v;
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 }
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
38 assert(false);
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
39 return std::shared_ptr<Deprecated::WidgetViewport>();
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
40 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
41
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
42 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
43 extern "C" {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
44 #endif
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
45
877
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
46 #if 0
878
8f7930f589ef comments
Alain Mazy <alain@mazy.be>
parents: 877
diff changeset
47 // rewrite malloc/free in order to monitor allocations. We actually only monitor large allocations (like images ...)
8f7930f589ef comments
Alain Mazy <alain@mazy.be>
parents: 877
diff changeset
48
877
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
49 size_t bigChunksTotalSize = 0;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
50 std::map<void*, size_t> allocatedBigChunks;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
51
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
52 extern void* emscripten_builtin_malloc(size_t bytes);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
53 extern void emscripten_builtin_free(void* mem);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
54
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
55 void * __attribute__((noinline)) malloc(size_t size)
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
56 {
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
57 void *ptr = emscripten_builtin_malloc(size);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
58 if (size > 100000)
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
59 {
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
60 bigChunksTotalSize += size;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
61 printf("++ Allocated %zu bytes, got %p. (%zu MB consumed by big chunks)\n", size, ptr, bigChunksTotalSize/(1024*1024));
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
62 allocatedBigChunks[ptr] = size;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
63 }
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
64 return ptr;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
65 }
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
66
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
67 void __attribute__((noinline)) free(void *ptr)
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
68 {
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
69 emscripten_builtin_free(ptr);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
70
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
71 std::map<void*, size_t>::iterator it = allocatedBigChunks.find(ptr);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
72 if (it != allocatedBigChunks.end())
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
73 {
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
74 bigChunksTotalSize -= it->second;
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
75 printf("-- Freed %zu bytes at %p. (%zu MB consumed by big chunks)\n", it->second, ptr, bigChunksTotalSize/(1024*1024));
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
76 allocatedBigChunks.erase(it);
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
77 }
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
78 }
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
79 #endif // 0
f7e5ee59ba17 debug code to monitor large malloc/free (currently disabled)
Alain Mazy <alain@mazy.be>
parents: 860
diff changeset
80
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
81 using namespace OrthancStone;
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
82
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
83 // when WASM needs a C++ viewport
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
84 ViewportHandle EMSCRIPTEN_KEEPALIVE CreateCppViewport() {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
85
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
86 std::shared_ptr<Deprecated::WidgetViewport> viewport(new Deprecated::WidgetViewport(broker));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
87 printf("viewport %x\n", (int)viewport.get());
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
88
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
89 viewports_.push_back(viewport);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
90
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
91 printf("There are now %lu viewports in C++\n", viewports_.size());
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
92
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
93 viewport->SetStatusBar(statusBar_);
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
94
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
95 viewport->RegisterObserverCallback(
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
96 new Callable<ViewportContentChangedObserver, Deprecated::IViewport::ViewportChangedMessage>
385
6cc3ce74dc05 using message broker in widgets
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
97 (viewportContentChangedObserver_, &ViewportContentChangedObserver::OnViewportChanged));
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
98
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
99 return viewport.get();
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
100 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
101
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
102 // 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
103 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
104 viewports_.remove_if([viewport](const std::shared_ptr<Deprecated::WidgetViewport>& v) { return v.get() == viewport;});
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
105
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
106 printf("There are now %lu viewports in C++\n", viewports_.size());
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
107 }
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
108
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
109 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) {
991
92a043b8e431 removed logs from IObserver constructor
Alain Mazy <alain@mazy.be>
parents: 878
diff changeset
110 printf("Initializing Stone\n");
92a043b8e431 removed logs from IObserver constructor
Alain Mazy <alain@mazy.be>
parents: 878
diff changeset
111 OrthancStone::StoneInitialize();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
112 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
113
253
8ff70c04c6df IObservable/IObserver now working in WASM too
am@osimis.io
parents: 242
diff changeset
114 application.reset(CreateUserApplication(broker));
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
115 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
116 Deprecated::WasmWebService::SetBroker(broker);
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
117 Deprecated::WasmDelayedCallExecutor::SetBroker(broker);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
118
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
119 startupParametersBuilder.Clear();
223
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 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
123 const char* value) {
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
124 startupParametersBuilder.SetStartupParameter(keyc, value);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
125 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
126
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
127 void EMSCRIPTEN_KEEPALIVE StartWasmApplication(const char* baseUri) {
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
128
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
129 printf("StartWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
130
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
131 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
132 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
133 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
134
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
136 boost::program_options::variables_map parameters;
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
137 boost::program_options::options_description options;
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
138 application->DeclareStartupOptions(options);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
139 startupParametersBuilder.GetStartupParameters(parameters, options);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
141 context.reset(new OrthancStone::StoneApplicationContext(broker));
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
142 context->SetOrthancBaseUrl(baseUri);
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
143 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
144 context->SetWebService(Deprecated::WasmWebService::GetInstance());
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
145 context->SetDelayedCallExecutor(Deprecated::WasmDelayedCallExecutor::GetInstance());
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
146 application->Initialize(context.get(), statusBar_, parameters);
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 236
diff changeset
147 application->InitializeWasm();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
148
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 229
diff changeset
149 // viewport->SetSize(width_, height_);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
150 printf("StartWasmApplication - completed\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
151 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
152
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
153 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
154 {
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
155 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
156 }
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
157
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
158 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
159 {
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
160 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
161 }
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
162
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
163 void EMSCRIPTEN_KEEPALIVE WasmDoAnimation()
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
165 for (auto viewport : viewports_) {
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
166 // TODO Only launch the JavaScript timer if "HasAnimation()"
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
167 if (viewport->HasAnimation())
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
168 {
386
e33659decec5 renamed UpdateContent() as DoAnimation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 385
diff changeset
169 viewport->DoAnimation();
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
170 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
171
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
172 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
173
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
174 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
175
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
176
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
177 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
178 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
179 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
180 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
181
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
182 viewport->SetSize(width, height);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
185 int EMSCRIPTEN_KEEPALIVE ViewportRender(ViewportHandle viewport,
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
186 unsigned int width,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
187 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
189 {
278
8a86695fcbc3 renamings
am@osimis.io
parents: 272
diff changeset
190 viewportContentChangedObserver_.Reset();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
191
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
192 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
193 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
194 height == 0)
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 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
197 }
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 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
200 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
201
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 223
diff changeset
202 viewport->Render(surface);
223
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 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
205 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
206 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
207 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
208 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
209 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
210 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
211 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
212 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
213 p[2] = tmp;
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 p += 4;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
216 }
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 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
220 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
221
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
222
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
223 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
224 unsigned int rawButton,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
225 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
226 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
227 unsigned int rawModifiers)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
228 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
229 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
230 switch (rawButton)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
231 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
232 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
233 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
234 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
235
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
236 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
237 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
238 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
239
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
240 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
241 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
242 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
243
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
244 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
245 return; // Unknown button
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
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
248 viewport->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None, std::vector<Deprecated::Touch>());
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
249 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
250
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
251
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
252 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
253 int deltaY,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
254 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
255 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
256 int isControl)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
257 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
258 if (deltaY != 0)
223
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 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
261 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
262 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
263 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
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 if (isControl != 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
266 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
267 modifiers = OrthancStone::KeyboardModifiers_Control;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
268 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
269
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
270 viewport->MouseWheel(direction, x, y, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
271 }
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
274
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
275 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(ViewportHandle viewport,
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
276 int x,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
277 int y)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
278 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
279 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
280 }
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
281
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
282 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
283 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
284 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
285 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
286 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
287 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
288 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
289 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
290 {
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 // 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
292 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
293 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
294 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
295 }
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 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
297 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
298 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
299 }
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 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
301 {
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
302 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
303 }
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
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
305 }
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
306
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 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
308 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
309 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
310 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
311 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
312 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
313 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
314 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
315 {
838
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
316 // 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
317
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
318 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
319 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
320 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
321 }
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
322
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
323 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
324 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
325 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
326 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
327 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
328 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
329 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
330 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
331 {
838
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
332 // 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
333
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
334 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
335 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
336 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
337 }
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
338
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
339 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
340 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
341 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
342 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
343 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
344 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
345 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
346 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
347 {
838
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
348 // 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
349
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 603
diff changeset
350 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
351 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
352 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
353 }
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
354
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
355 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(ViewportHandle viewport,
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
356 int key,
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
357 const char* keyChar,
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
358 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
359 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
360 bool isAltPressed)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
361
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
362 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
363 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
364 if (isShiftPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
365 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
366 }
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
367 if (isControlPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
368 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
369 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
370 if (isAltPressed) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
371 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
372 }
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
373
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
374 char c = 0;
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
375 if (keyChar != NULL && key == OrthancStone::KeyboardKeys_Generic) {
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
376 c = keyChar[0];
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
377 }
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 309
diff changeset
378 viewport->KeyPressed(static_cast<OrthancStone::KeyboardKeys>(key), c, modifiers);
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
379 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
380
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
381
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
382 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
383 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
384 viewport->MouseUp();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
385 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
386
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
387
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
388 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
389 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
390 viewport->MouseEnter();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
391 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
392
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
393
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
394 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave(ViewportHandle viewport)
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
395 {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
396 viewport->MouseLeave();
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
397 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
398
508
7105a0bad250 - Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents: 458
diff changeset
399 const char* EMSCRIPTEN_KEEPALIVE SendSerializedMessageToStoneApplication(const char* message)
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
400 {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
401 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
402
838
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
403 //printf("SendSerializedMessageToStoneApplication\n");
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
404 //printf("%s", message);
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
405
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
406 if (applicationWasmAdapter.get() != NULL) {
508
7105a0bad250 - Added HandleSerializedMessage to IStoneApplication (empty impl)
Benjamin Golinvaux <bgo@osimis.io>
parents: 458
diff changeset
407 applicationWasmAdapter->HandleSerializedMessageFromWeb(output, std::string(message));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
408 return output.c_str();
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
409 }
838
997290c7d537 removed some logs
Alain Mazy <alain@mazy.be>
parents: 726
diff changeset
410 printf("This Stone application does not have a Web Adapter, unable to send messages");
307
be2660b6e40a wip: commands + status update
am@osimis.io
parents: 288
diff changeset
411 return NULL;
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
412 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 278
diff changeset
413
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
414 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
415 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
416 #endif