annotate Platforms/Wasm/wasm-viewport.ts @ 894:f557b18d287f

wasm: error log if canvas GL context can't be created
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 16 Jul 2019 10:51:03 +0200
parents d5579bdc59b5
children 67d0a8da4afe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
1 import wasmApplicationRunner = require('./wasm-application-runner');
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
2 import * as Logger from './logger'
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
3
230
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
4 var isPendingRedraw = false;
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
5
230
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
6 function ScheduleWebViewportRedraw(cppViewportHandle: any) : void
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
7 {
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
8 if (!isPendingRedraw) {
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
9 isPendingRedraw = true;
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
10 Logger.defaultLogger.debug('Scheduling a refresh of the viewport, as its content changed');
230
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
11 window.requestAnimationFrame(function() {
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
12 isPendingRedraw = false;
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
13 WasmViewport.GetFromCppViewport(cppViewportHandle).Redraw();
230
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
14 });
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
15 }
230
7d2631320615 wasm-application.js is now in ts
am@osimis.io
parents: 229
diff changeset
16 }
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
17
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
18 (<any>window).ScheduleWebViewportRedraw = ScheduleWebViewportRedraw;
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
19
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
20 declare function UTF8ToString(any): string;
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
21
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
22 function CreateWasmViewport(htmlCanvasId: string) : any {
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
23 var cppViewportHandle = wasmApplicationRunner.CreateCppViewport();
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
24 var canvasId = UTF8ToString(htmlCanvasId);
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
25 var webViewport = new WasmViewport((<any> window).StoneFrameworkModule, canvasId, cppViewportHandle); // viewports are stored in a static map in WasmViewport -> won't be deleted
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
26 webViewport.Initialize();
314
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
27
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
28 return cppViewportHandle;
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
29 }
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
30
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
31 (<any>window).CreateWasmViewport = CreateWasmViewport;
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
32
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 420
diff changeset
33 export class WasmViewport {
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
34
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
35 private static viewportsMapByCppHandle_ : Map<number, WasmViewport> = new Map<number, WasmViewport>(); // key = the C++ handle
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
36 private static viewportsMapByCanvasId_ : Map<string, WasmViewport> = new Map<string, WasmViewport>(); // key = the canvasId
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
37
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
38 private module_ : any;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
39 private canvasId_ : string;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
40 private htmlCanvas_ : HTMLCanvasElement;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
41 private context_ : CanvasRenderingContext2D;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
42 private imageData_ : any = null;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
43 private renderingBuffer_ : any = null;
454
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
44
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
45 private touchGestureInProgress_: boolean = false;
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
46 private touchCount_: number = 0;
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
47 private touchGestureLastCoordinates_: [number, number][] = []; // last x,y coordinates of each touch
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
48
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
49 private touchZoom_ : any = false;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
50 private touchTranslation_ : any = false;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
51
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
52 private ViewportSetSize : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
53 private ViewportRender : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
54 private ViewportMouseDown : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
55 private ViewportMouseMove : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
56 private ViewportMouseUp : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
57 private ViewportMouseEnter : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
58 private ViewportMouseLeave : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
59 private ViewportMouseWheel : Function;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
60 private ViewportKeyPressed : Function;
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: 454
diff changeset
61 private ViewportTouchStart : Function;
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: 454
diff changeset
62 private ViewportTouchMove : Function;
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: 454
diff changeset
63 private ViewportTouchEnd : Function;
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
64
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
65 private pimpl_ : any; // Private pointer to the underlying WebAssembly C++ object
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
66
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
67 public constructor(module: any, canvasId: string, cppViewport: any) {
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
68
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
69 this.pimpl_ = cppViewport;
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
70 WasmViewport.viewportsMapByCppHandle_[this.pimpl_] = this;
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
71 WasmViewport.viewportsMapByCanvasId_[canvasId] = this;
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
72
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
73 this.module_ = module;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
74 this.canvasId_ = canvasId;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
75 this.htmlCanvas_ = document.getElementById(this.canvasId_) as HTMLCanvasElement;
244
313903066093 cleanup
am@osimis.io
parents: 236
diff changeset
76 if (this.htmlCanvas_ == null) {
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
77 Logger.defaultLogger.error("Can not create WasmViewport, did not find the canvas whose id is '", this.canvasId_, "'");
244
313903066093 cleanup
am@osimis.io
parents: 236
diff changeset
78 }
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
79 this.context_ = this.htmlCanvas_.getContext('2d');
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
80
234
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
81 this.ViewportSetSize = this.module_.cwrap('ViewportSetSize', null, [ 'number', 'number', 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
82 this.ViewportRender = this.module_.cwrap('ViewportRender', null, [ 'number', 'number', 'number', 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
83 this.ViewportMouseDown = this.module_.cwrap('ViewportMouseDown', null, [ 'number', 'number', 'number', 'number', 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
84 this.ViewportMouseMove = this.module_.cwrap('ViewportMouseMove', null, [ 'number', 'number', 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
85 this.ViewportMouseUp = this.module_.cwrap('ViewportMouseUp', null, [ 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
86 this.ViewportMouseEnter = this.module_.cwrap('ViewportMouseEnter', null, [ 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
87 this.ViewportMouseLeave = this.module_.cwrap('ViewportMouseLeave', null, [ 'number' ]);
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
88 this.ViewportMouseWheel = this.module_.cwrap('ViewportMouseWheel', null, [ 'number', 'number', 'number', 'number', 'number' ]);
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
89 this.ViewportKeyPressed = this.module_.cwrap('ViewportKeyPressed', null, [ 'number', 'number', 'string', 'number', 'number' ]);
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: 454
diff changeset
90 this.ViewportTouchStart = this.module_.cwrap('ViewportTouchStart', null, [ 'number', 'number', 'number', 'number', 'number', 'number', 'number' ]);
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: 454
diff changeset
91 this.ViewportTouchMove = this.module_.cwrap('ViewportTouchMove', null, [ 'number', 'number', 'number', 'number', 'number', 'number', 'number' ]);
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: 454
diff changeset
92 this.ViewportTouchEnd = this.module_.cwrap('ViewportTouchEnd', null, [ 'number', 'number', 'number', 'number', 'number', 'number', 'number' ]);
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
93 }
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
94
234
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
95 public GetCppViewport() : number {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
96 return this.pimpl_;
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
97 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
98
234
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
99 public static GetFromCppViewport(cppViewportHandle: number) : WasmViewport {
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
100 if (WasmViewport.viewportsMapByCppHandle_[cppViewportHandle] !== undefined) {
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
101 return WasmViewport.viewportsMapByCppHandle_[cppViewportHandle];
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
102 }
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
103 Logger.defaultLogger.error("WasmViewport not found !");
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
104 return undefined;
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
105 }
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
106
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
107 public static GetFromCanvasId(canvasId: string) : WasmViewport {
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
108 if (WasmViewport.viewportsMapByCanvasId_[canvasId] !== undefined) {
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
109 return WasmViewport.viewportsMapByCanvasId_[canvasId];
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
110 }
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
111 Logger.defaultLogger.error("WasmViewport not found !");
229
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
112 return undefined;
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
113 }
b0ba3b38a23c ScheduleRedraw can handle multiple viewports
am@osimis.io
parents: 228
diff changeset
114
314
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
115 public static ResizeAll() {
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
116 for (let canvasId in WasmViewport.viewportsMapByCanvasId_) {
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
117 WasmViewport.viewportsMapByCanvasId_[canvasId].Resize();
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
118 }
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
119 }
97f16214dc5e cleanup
am@osimis.io
parents: 313
diff changeset
120
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
121 public Redraw() {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
122 if (this.imageData_ === null ||
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
123 this.renderingBuffer_ === null ||
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
124 this.ViewportRender(this.pimpl_,
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
125 this.imageData_.width,
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
126 this.imageData_.height,
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
127 this.renderingBuffer_) == 0) {
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
128 Logger.defaultLogger.error('The rendering has failed');
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
129 } else {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
130 // Create an accessor to the rendering buffer (i.e. create a
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
131 // "window" above the heap of the WASM module), then copy it to
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
132 // the ImageData object
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
133 this.imageData_.data.set(new Uint8ClampedArray(
558
d5579bdc59b5 Fixed wasm viewport Redraw() to use wasmModule.HEAPU8.buffer instead of the deprecated wasmModule.buffer
Benjamin Golinvaux <bgo@osimis.io>
parents: 545
diff changeset
134 this.module_.HEAPU8.buffer,
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
135 this.renderingBuffer_,
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
136 this.imageData_.width * this.imageData_.height * 4));
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
137
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
138 this.context_.putImageData(this.imageData_, 0, 0);
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
139 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
140 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
141
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
142 public Resize() {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
143 if (this.imageData_ != null &&
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
144 (this.imageData_.width != window.innerWidth ||
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
145 this.imageData_.height != window.innerHeight)) {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
146 this.imageData_ = null;
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
147 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
148
420
8bf717c4e497 canvas size is now defined by the parent div size
am@osimis.io
parents: 327
diff changeset
149 // width/height is defined by the parent width/height
8bf717c4e497 canvas size is now defined by the parent div size
am@osimis.io
parents: 327
diff changeset
150 this.htmlCanvas_.width = this.htmlCanvas_.parentElement.offsetWidth;
8bf717c4e497 canvas size is now defined by the parent div size
am@osimis.io
parents: 327
diff changeset
151 this.htmlCanvas_.height = this.htmlCanvas_.parentElement.offsetHeight;
234
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
152
526
548eed46f535 introduced a Logger class that displays timing and source (C++/JS)
Alain Mazy <alain@mazy.be>
parents: 506
diff changeset
153 Logger.defaultLogger.debug("resizing WasmViewport: ", this.htmlCanvas_.width, "x", this.htmlCanvas_.height);
234
9afb50d1ac14 configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents: 231
diff changeset
154
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
155 if (this.imageData_ === null) {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
156 this.imageData_ = this.context_.getImageData(0, 0, this.htmlCanvas_.width, this.htmlCanvas_.height);
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
157 this.ViewportSetSize(this.pimpl_, this.htmlCanvas_.width, this.htmlCanvas_.height);
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
158
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
159 if (this.renderingBuffer_ != null) {
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
160 this.module_._free(this.renderingBuffer_);
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
161 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
162
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
163 this.renderingBuffer_ = this.module_._malloc(this.imageData_.width * this.imageData_.height * 4);
313
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
164 } else {
8bdc6112bc2e initial resize of canvas
am@osimis.io
parents: 244
diff changeset
165 this.ViewportSetSize(this.pimpl_, this.htmlCanvas_.width, this.htmlCanvas_.height);
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
166 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
167
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
168 this.Redraw();
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
169 }
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
170
231
5027cb2feb51 viewport is now part of the Application itself and not global anymore
am@osimis.io
parents: 230
diff changeset
171 public Initialize() {
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
172
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
173 // Force the rendering of the viewport for the first time
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
174 this.Resize();
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
175
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
176 var that : WasmViewport = this;
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
177 // Register an event listener to call the Resize() function
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
178 // each time the window is resized.
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
179 window.addEventListener('resize', function(event) {
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
180 that.Resize();
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
181 }, false);
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
182
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
183 this.htmlCanvas_.addEventListener('contextmenu', function(event) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
184 // Prevent right click on the canvas
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
185 event.preventDefault();
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
186 }, false);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
187
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
188 this.htmlCanvas_.addEventListener('mouseleave', function(event) {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
189 that.ViewportMouseLeave(that.pimpl_);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
190 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
191
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
192 this.htmlCanvas_.addEventListener('mouseenter', function(event) {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
193 that.ViewportMouseEnter(that.pimpl_);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
194 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
195
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
196 this.htmlCanvas_.addEventListener('mousedown', function(event) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
197 var x = event.pageX - this.offsetLeft;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
198 var y = event.pageY - this.offsetTop;
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: 454
diff changeset
199
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: 454
diff changeset
200 that.ViewportMouseDown(that.pimpl_, event.button, x, y, 0 /* TODO detect modifier keys*/);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
201 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
202
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
203 this.htmlCanvas_.addEventListener('mousemove', function(event) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
204 var x = event.pageX - this.offsetLeft;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
205 var y = event.pageY - this.offsetTop;
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
206 that.ViewportMouseMove(that.pimpl_, x, y);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
207 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
208
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
209 this.htmlCanvas_.addEventListener('mouseup', function(event) {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
210 that.ViewportMouseUp(that.pimpl_);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
211 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
212
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
213 window.addEventListener('keydown', function(event) {
327
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
214 var keyChar = event.key;
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
215 var keyCode = event.keyCode
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
216 if (keyChar.length == 1) {
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
217 keyCode = 0; // maps to OrthancStone::KeyboardKeys_Generic
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
218 } else {
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
219 keyChar = null;
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
220 }
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
221 // console.log("key: ", keyCode, keyChar);
8716176ff7f0 added support for arrow keys
am@osimis.io
parents: 314
diff changeset
222 that.ViewportKeyPressed(that.pimpl_, keyCode, keyChar, event.shiftKey, event.ctrlKey, event.altKey);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
223 });
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
224
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
225 this.htmlCanvas_.addEventListener('wheel', function(event) {
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
226 var x = event.pageX - this.offsetLeft;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
227 var y = event.pageY - this.offsetTop;
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
228 that.ViewportMouseWheel(that.pimpl_, event.deltaY, x, y, event.ctrlKey);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
229 event.preventDefault();
545
e1ba16436d59 set events passive again
Alain Mazy <alain@mazy.be>
parents: 544
diff changeset
230 }, {passive: false}); // must not be passive if calling event.preventDefault, ie to cancel scroll or zoom of the whole interface
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
231
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: 454
diff changeset
232 this.htmlCanvas_.addEventListener('touchstart', function(event: TouchEvent) {
453
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
233 // don't propagate events to the whole body (this could zoom the entire page instead of zooming the viewport)
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
234 event.preventDefault();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
235 event.stopPropagation();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
236
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: 454
diff changeset
237 // TODO: find a way to pass the coordinates as an 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: 454
diff changeset
238 var x0 = 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: 454
diff changeset
239 var y0 = 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: 454
diff changeset
240 var x1 = 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: 454
diff changeset
241 var y1 = 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: 454
diff changeset
242 var x2 = 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: 454
diff changeset
243 var y2 = 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: 454
diff changeset
244 if (event.targetTouches.length > 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: 454
diff changeset
245 x0 = event.targetTouches[0].pageX;
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: 454
diff changeset
246 y0 = event.targetTouches[0].pageY;
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: 454
diff changeset
247 }
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: 454
diff changeset
248 if (event.targetTouches.length > 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: 454
diff changeset
249 x1 = event.targetTouches[1].pageX;
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: 454
diff changeset
250 y1 = event.targetTouches[1].pageY;
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: 454
diff changeset
251 }
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: 454
diff changeset
252 if (event.targetTouches.length > 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: 454
diff changeset
253 x2 = event.targetTouches[2].pageX;
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: 454
diff changeset
254 y2 = event.targetTouches[2].pageY;
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: 454
diff changeset
255 }
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: 454
diff changeset
256
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: 454
diff changeset
257 that.ViewportTouchStart(that.pimpl_, event.targetTouches.length, x0, y0, x1, y1, x2, y2);
545
e1ba16436d59 set events passive again
Alain Mazy <alain@mazy.be>
parents: 544
diff changeset
258 }, {passive: false}); // must not be passive if calling event.preventDefault, ie to cancel scroll or zoom of the whole interface
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
259
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
260 this.htmlCanvas_.addEventListener('touchend', function(event) {
453
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
261 // don't propagate events to the whole body (this could zoom the entire page instead of zooming the viewport)
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
262 event.preventDefault();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
263 event.stopPropagation();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
264
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: 454
diff changeset
265 // TODO: find a way to pass the coordinates as an 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: 454
diff changeset
266 var x0 = 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: 454
diff changeset
267 var y0 = 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: 454
diff changeset
268 var x1 = 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: 454
diff changeset
269 var y1 = 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: 454
diff changeset
270 var x2 = 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: 454
diff changeset
271 var y2 = 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: 454
diff changeset
272 if (event.targetTouches.length > 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: 454
diff changeset
273 x0 = event.targetTouches[0].pageX;
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: 454
diff changeset
274 y0 = event.targetTouches[0].pageY;
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: 454
diff changeset
275 }
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: 454
diff changeset
276 if (event.targetTouches.length > 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: 454
diff changeset
277 x1 = event.targetTouches[1].pageX;
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: 454
diff changeset
278 y1 = event.targetTouches[1].pageY;
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: 454
diff changeset
279 }
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: 454
diff changeset
280 if (event.targetTouches.length > 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: 454
diff changeset
281 x2 = event.targetTouches[2].pageX;
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: 454
diff changeset
282 y2 = event.targetTouches[2].pageY;
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: 454
diff changeset
283 }
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: 454
diff changeset
284
3b4df9925db6 added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents: 454
diff changeset
285 that.ViewportTouchEnd(that.pimpl_, event.targetTouches.length, x0, y0, x1, y1, x2, y2);
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
286 });
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
287
454
50229f6eb4cd TS: one touch drag is not equivalent to left mouse drag instead of middle mouse drag
Alain Mazy <alain@mazy.be>
parents: 453
diff changeset
288 this.htmlCanvas_.addEventListener('touchmove', function(event: TouchEvent) {
453
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
289
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
290 // don't propagate events to the whole body (this could zoom the entire page instead of zooming the viewport)
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
291 event.preventDefault();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
292 event.stopPropagation();
59b4afa92dee TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents: 420
diff changeset
293
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: 454
diff changeset
294
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: 454
diff changeset
295 // TODO: find a way to pass the coordinates as an 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: 454
diff changeset
296 var x0 = 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: 454
diff changeset
297 var y0 = 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: 454
diff changeset
298 var x1 = 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: 454
diff changeset
299 var y1 = 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: 454
diff changeset
300 var x2 = 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: 454
diff changeset
301 var y2 = 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: 454
diff changeset
302 if (event.targetTouches.length > 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: 454
diff changeset
303 x0 = event.targetTouches[0].pageX;
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: 454
diff changeset
304 y0 = event.targetTouches[0].pageY;
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: 454
diff changeset
305 }
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: 454
diff changeset
306 if (event.targetTouches.length > 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: 454
diff changeset
307 x1 = event.targetTouches[1].pageX;
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: 454
diff changeset
308 y1 = event.targetTouches[1].pageY;
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: 454
diff changeset
309 }
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: 454
diff changeset
310 if (event.targetTouches.length > 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: 454
diff changeset
311 x2 = event.targetTouches[2].pageX;
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: 454
diff changeset
312 y2 = event.targetTouches[2].pageY;
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: 454
diff changeset
313 }
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: 454
diff changeset
314
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: 454
diff changeset
315 that.ViewportTouchMove(that.pimpl_, event.targetTouches.length, 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: 454
diff changeset
316 return;
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: 454
diff changeset
317
545
e1ba16436d59 set events passive again
Alain Mazy <alain@mazy.be>
parents: 544
diff changeset
318 }, {passive: false}); // must not be passive if calling event.preventDefault, ie to cancel scroll or zoom of the whole interface
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
319 }
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
320
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
321 public ResetTouch() {
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
322 if (this.touchTranslation_ ||
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
323 this.touchZoom_) {
228
210c1ce8e1a6 WasmViewport is no more a singleton
am@osimis.io
parents: 227
diff changeset
324 this.ViewportMouseUp(this.pimpl_);
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
325 }
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
326
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
327 this.touchTranslation_ = false;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
328 this.touchZoom_ = false;
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
329 }
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
330
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
331 public GetTouchTranslation(event) {
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
332 var touch = event.targetTouches[0];
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
333 return [
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
334 touch.pageX,
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
335 touch.pageY
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
336 ];
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
337 }
226
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
338
1fa4c65c7e1b WasmViewport in ts
am@osimis.io
parents:
diff changeset
339 public GetTouchZoom(event) {
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
340 var touch1 = event.targetTouches[0];
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
341 var touch2 = event.targetTouches[1];
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
342 var dx = (touch1.pageX - touch2.pageX);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
343 var dy = (touch1.pageY - touch2.pageY);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
344 var d = Math.sqrt(dx * dx + dy * dy);
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
345 return [
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
346 (touch1.pageX + touch2.pageX) / 2.0,
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
347 (touch1.pageY + touch2.pageY) / 2.0,
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
348 d
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
349 ];
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
350 }
545
e1ba16436d59 set events passive again
Alain Mazy <alain@mazy.be>
parents: 544
diff changeset
351
227
c8f11437a6fd getting ready for multiple viewports
am@osimis.io
parents: 226
diff changeset
352 }