annotate Platforms/WebAssembly/Defaults.cpp @ 223:d30a10d574ec am

refactoring continued - not working
author am@osimis.io
date Thu, 14 Jun 2018 10:57:02 +0200
parents 84844649a8fd
children c8f11437a6fd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
222
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
1 #include "Defaults.h"
84844649a8fd continued: reusable applications
am@osimis.io
parents:
diff changeset
2
223
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
3 #include "WasmWebService.h"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
4 #include <Framework/dev.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
5 #include "Framework/Widgets/TestCairoWidget.h"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
6 #include <Framework/Viewport/WidgetViewport.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
7 #include <Framework/Widgets/LayerWidget.h>
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
8
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
9 static unsigned int width_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
10 static unsigned int height_ = 0;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
11
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
12 /**********************************/
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
13
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
14 static std::auto_ptr<OrthancStone::BasicWasmApplication> application;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
15 static std::shared_ptr<OrthancStone::WidgetViewport> viewport_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
16 static OrthancStone::ChangeObserver changeObserver_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
17 static OrthancStone::StatusBar statusBar_;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
18
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
19
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
20 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
21 extern "C" {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
22 #endif
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
23
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
24 using namespace OrthancStone;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
25
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
26 void EMSCRIPTEN_KEEPALIVE CreateWasmApplication() {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
27
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
28 printf("CreateWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
29 viewport_.reset(new OrthancStone::WidgetViewport);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
30 viewport_->SetStatusBar(statusBar_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
31 viewport_->Register(changeObserver_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
32
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
33
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
34 application.reset(CreateUserApplication());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
35
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
36 boost::program_options::options_description options;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
37 application->DeclareStartupOptions(options);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
38 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
39
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
40 void EMSCRIPTEN_KEEPALIVE SetStartupParameter(const char* keyc,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
41 const char* value) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
42 application->SetStartupParameter(keyc, value);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
43 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
44
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
45 void EMSCRIPTEN_KEEPALIVE StartWasmApplication() {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
46
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
47 printf("StartWasmApplication\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
48
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
49 // recreate a command line from uri arguments and parse it
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
50 boost::program_options::variables_map parameters;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
51 application->GetStartupParameters(parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
52
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
53 BasicWasmApplicationContext& context = dynamic_cast<BasicWasmApplicationContext&>(application->CreateApplicationContext(OrthancStone::WasmWebService::GetInstance(), viewport_));;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
54 application->Initialize(statusBar_, parameters);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
55
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
56 viewport_->SetSize(width_, height_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
57 printf("StartWasmApplication - completed\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
58 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
59
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
60 // void EMSCRIPTEN_KEEPALIVE ViewportUpdate(const char* _instanceId) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
61 // printf("updating viewport content, Instance = [%s]\n", instanceId.c_str());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
62
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
63 // layerSource->LoadFrame(instanceId, 0);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
64 // printf("frame loaded\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
65 // instanceWidget->UpdateContent();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
66
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
67 // printf("update should be done\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
68 // }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
69
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
70 // void EMSCRIPTEN_KEEPALIVE ViewportStart()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
71 // {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
72
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
73 // viewport_.reset(new OrthancStone::WidgetViewport);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
74 // viewport_->SetStatusBar(statusBar_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
75 // viewport_->Register(changeObserver_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
76 // instanceWidget.reset(new OrthancStone::LayerWidget);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
77 // layerSource = new OrthancStone::OrthancFrameLayerSource(OrthancStone::WasmWebService::GetInstance());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
78
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
79 // if (!instanceId.empty())
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
80 // {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
81 // layerSource->LoadFrame(instanceId, 0);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
82 // } else {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
83 // printf("No instance provided so far\n");
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
84 // }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
85
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
86 // instanceWidget->AddLayer(layerSource);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
87
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
88 // {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
89 // OrthancStone::RenderStyle s;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
90 // //s.drawGrid_ = true;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
91 // s.alpha_ = 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
92 // s.windowing_ = OrthancStone::ImageWindowing_Bone;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
93 // instanceWidget->SetLayerStyle(0, s);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
94 // }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
95
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
96 // viewport_->SetCentralWidget(instanceWidget.release());
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
97 // viewport_->SetSize(width_, height_);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
98
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
99
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
100 // }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
101
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
102 void EMSCRIPTEN_KEEPALIVE NotifyUpdateContent()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
103 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
104 // TODO Only launch the JavaScript timer if "HasUpdateContent()"
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
105 if (viewport_.get() != NULL &&
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
106 viewport_->HasUpdateContent())
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
107 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
108 viewport_->UpdateContent();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
109 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
110
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
111 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
112
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
113
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
114 void EMSCRIPTEN_KEEPALIVE ViewportSetSize(unsigned int width, unsigned int height)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
115 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
116 width_ = width;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
117 height_ = height;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
118
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
119 if (viewport_.get() != NULL)
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 viewport_->SetSize(width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
122 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
123 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
124
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
125 int EMSCRIPTEN_KEEPALIVE ViewportRender(unsigned int width,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
126 unsigned int height,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
127 uint8_t* data)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
128 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
129 changeObserver_.Reset();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
130
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
131 //printf("ViewportRender called %dx%d\n", width, height);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
132 if (width == 0 ||
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
133 height == 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
134 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
135 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
136 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
137
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
138 Orthanc::ImageAccessor surface;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
139 surface.AssignWritable(Orthanc::PixelFormat_BGRA32, width, height, 4 * width, data);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
140
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
141 if (viewport_.get() != NULL)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
142 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
143 viewport_->Render(surface);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
144 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
145
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
146 // Convert from BGRA32 memory layout (only color mode supported by
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
147 // Cairo, which corresponds to CAIRO_FORMAT_ARGB32) to RGBA32 (as
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
148 // expected by HTML5 canvas). This simply amounts to swapping the
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
149 // B and R channels.
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
150 uint8_t* p = data;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
151 for (unsigned int y = 0; y < height; y++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
152 for (unsigned int x = 0; x < width; x++) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
153 uint8_t tmp = p[0];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
154 p[0] = p[2];
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
155 p[2] = tmp;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
156
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
157 p += 4;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
158 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
159 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
160
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
161 return 1;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
162 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
163
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
164
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
165 void EMSCRIPTEN_KEEPALIVE ViewportMouseDown(unsigned int rawButton,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
166 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
167 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
168 unsigned int rawModifiers)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
169 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
170 OrthancStone::MouseButton button;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
171 switch (rawButton)
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 case 0:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
174 button = OrthancStone::MouseButton_Left;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
175 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
176
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
177 case 1:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
178 button = OrthancStone::MouseButton_Middle;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
179 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
180
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
181 case 2:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
182 button = OrthancStone::MouseButton_Right;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
183 break;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
184
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
185 default:
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
186 return; // Unknown button
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
187 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
188
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
189 if (viewport_.get() != NULL)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
190 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
191 viewport_->MouseDown(button, x, y, OrthancStone::KeyboardModifiers_None /* TODO */);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
192 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
193 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
194
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 void EMSCRIPTEN_KEEPALIVE ViewportMouseWheel(int deltaY,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
197 int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
198 int y,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
199 int isControl)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
200 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
201 if (viewport_.get() != NULL &&
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
202 deltaY != 0)
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 OrthancStone::MouseWheelDirection direction = (deltaY < 0 ?
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
205 OrthancStone::MouseWheelDirection_Up :
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
206 OrthancStone::MouseWheelDirection_Down);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
207 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
208
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
209 if (isControl != 0)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
210 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
211 modifiers = OrthancStone::KeyboardModifiers_Control;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
212 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
213
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
214 viewport_->MouseWheel(direction, x, y, modifiers);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
215 }
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 void EMSCRIPTEN_KEEPALIVE ViewportMouseMove(int x,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
220 int y)
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 if (viewport_.get() != NULL)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
223 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
224 viewport_->MouseMove(x, y);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
225 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
226 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
227
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
228 void EMSCRIPTEN_KEEPALIVE ViewportKeyPressed(const char* key,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
229 bool isShiftPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
230 bool isControlPressed,
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
231 bool isAltPressed)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
232
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
233 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
234 if (viewport_.get() != NULL)
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 OrthancStone::KeyboardModifiers modifiers = OrthancStone::KeyboardModifiers_None;
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
237 if (isShiftPressed) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
238 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Shift);
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 if (isControlPressed) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
241 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Control);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
242 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
243 if (isAltPressed) {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
244 modifiers = static_cast<OrthancStone::KeyboardModifiers>(modifiers + OrthancStone::KeyboardModifiers_Alt);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
245 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
246 printf("key pressed : %c\n", key[0]);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
247 viewport_->KeyPressed(key[0], modifiers);
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
248 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
249 }
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
252 void EMSCRIPTEN_KEEPALIVE ViewportMouseUp()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
253 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
254 if (viewport_.get() != NULL)
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
255 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
256 viewport_->MouseUp();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
257 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
258 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
259
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
260
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
261 void EMSCRIPTEN_KEEPALIVE ViewportMouseEnter()
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
262 {
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
263 if (viewport_.get() != NULL)
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 viewport_->MouseEnter();
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 }
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
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
270 void EMSCRIPTEN_KEEPALIVE ViewportMouseLeave()
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 if (viewport_.get() != NULL)
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 viewport_->MouseLeave();
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
275 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
276 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
277
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
278
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
279 #ifdef __cplusplus
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
280 }
d30a10d574ec refactoring continued - not working
am@osimis.io
parents: 222
diff changeset
281 #endif