Mercurial > hg > orthanc-stone
annotate Platforms/Wasm/wasm-viewport.ts @ 504:7cdb4634846c
Merge
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Tue, 26 Feb 2019 21:15:20 +0100 |
| parents | 50229f6eb4cd 5055031f4a06 |
| children | 801d2697a1b1 |
| 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'); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
420
diff
changeset
|
2 //import stoneFrameworkLoader = require('./stone-framework-loader'); |
|
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
420
diff
changeset
|
3 |
| 230 | 4 var isPendingRedraw = false; |
| 229 | 5 |
| 230 | 6 function ScheduleWebViewportRedraw(cppViewportHandle: any) : void |
| 7 { | |
| 8 if (!isPendingRedraw) { | |
| 9 isPendingRedraw = true; | |
| 10 console.log('Scheduling a refresh of the viewport, as its content changed'); | |
| 11 window.requestAnimationFrame(function() { | |
| 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 | 14 }); |
| 229 | 15 } |
| 230 | 16 } |
| 226 | 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 | 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 |
| 226 | 33 // export declare type InitializationCallback = () => void; |
| 34 | |
| 35 // export declare var StoneFrameworkModule : any; | |
| 36 | |
| 37 //const ASSETS_FOLDER : string = "assets/lib"; | |
| 38 //const WASM_FILENAME : string = "orthanc-framework"; | |
| 229 | 39 |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
420
diff
changeset
|
40 export class WasmViewport { |
| 226 | 41 |
| 313 | 42 private static viewportsMapByCppHandle_ : Map<number, WasmViewport> = new Map<number, WasmViewport>(); // key = the C++ handle |
| 43 private static viewportsMapByCanvasId_ : Map<string, WasmViewport> = new Map<string, WasmViewport>(); // key = the canvasId | |
| 229 | 44 |
| 226 | 45 private module_ : any; |
| 46 private canvasId_ : string; | |
| 47 private htmlCanvas_ : HTMLCanvasElement; | |
| 48 private context_ : CanvasRenderingContext2D; | |
| 49 private imageData_ : any = null; | |
| 50 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
|
51 |
|
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
|
52 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
|
53 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
|
54 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
|
55 |
| 226 | 56 private touchZoom_ : any = false; |
| 57 private touchTranslation_ : any = false; | |
| 58 | |
| 59 private ViewportSetSize : Function; | |
| 60 private ViewportRender : Function; | |
| 61 private ViewportMouseDown : Function; | |
| 62 private ViewportMouseMove : Function; | |
| 63 private ViewportMouseUp : Function; | |
| 64 private ViewportMouseEnter : Function; | |
| 65 private ViewportMouseLeave : Function; | |
| 66 private ViewportMouseWheel : Function; | |
| 67 private ViewportKeyPressed : Function; | |
| 68 | |
| 227 | 69 private pimpl_ : any; // Private pointer to the underlying WebAssembly C++ object |
| 70 | |
|
231
5027cb2feb51
viewport is now part of the Application itself and not global anymore
am@osimis.io
parents:
230
diff
changeset
|
71 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
|
72 |
|
5027cb2feb51
viewport is now part of the Application itself and not global anymore
am@osimis.io
parents:
230
diff
changeset
|
73 this.pimpl_ = cppViewport; |
| 313 | 74 WasmViewport.viewportsMapByCppHandle_[this.pimpl_] = this; |
| 75 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
|
76 |
| 226 | 77 this.module_ = module; |
| 78 this.canvasId_ = canvasId; | |
| 79 this.htmlCanvas_ = document.getElementById(this.canvasId_) as HTMLCanvasElement; | |
| 244 | 80 if (this.htmlCanvas_ == null) { |
| 81 console.log("Can not create WasmViewport, did not find the canvas whose id is '", this.canvasId_, "'"); | |
| 82 } | |
| 226 | 83 this.context_ = this.htmlCanvas_.getContext('2d'); |
| 84 | |
|
234
9afb50d1ac14
configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents:
231
diff
changeset
|
85 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
|
86 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
|
87 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
|
88 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
|
89 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
|
90 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
|
91 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
|
92 this.ViewportMouseWheel = this.module_.cwrap('ViewportMouseWheel', null, [ 'number', 'number', 'number', 'number', 'number' ]); |
| 327 | 93 this.ViewportKeyPressed = this.module_.cwrap('ViewportKeyPressed', null, [ 'number', 'number', 'string', 'number', 'number' ]); |
| 228 | 94 } |
| 95 | |
|
234
9afb50d1ac14
configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents:
231
diff
changeset
|
96 public GetCppViewport() : number { |
| 228 | 97 return this.pimpl_; |
| 226 | 98 } |
| 99 | |
|
234
9afb50d1ac14
configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents:
231
diff
changeset
|
100 public static GetFromCppViewport(cppViewportHandle: number) : WasmViewport { |
| 313 | 101 if (WasmViewport.viewportsMapByCppHandle_[cppViewportHandle] !== undefined) { |
| 102 return WasmViewport.viewportsMapByCppHandle_[cppViewportHandle]; | |
| 103 } | |
| 104 console.log("WasmViewport not found !"); | |
| 105 return undefined; | |
| 106 } | |
| 107 | |
| 108 public static GetFromCanvasId(canvasId: string) : WasmViewport { | |
| 109 if (WasmViewport.viewportsMapByCanvasId_[canvasId] !== undefined) { | |
| 110 return WasmViewport.viewportsMapByCanvasId_[canvasId]; | |
| 229 | 111 } |
| 112 console.log("WasmViewport not found !"); | |
| 113 return undefined; | |
| 114 } | |
| 115 | |
| 314 | 116 public static ResizeAll() { |
| 117 for (let canvasId in WasmViewport.viewportsMapByCanvasId_) { | |
| 118 WasmViewport.viewportsMapByCanvasId_[canvasId].Resize(); | |
| 119 } | |
| 120 } | |
| 121 | |
| 226 | 122 public Redraw() { |
| 123 if (this.imageData_ === null || | |
| 124 this.renderingBuffer_ === null || | |
| 227 | 125 this.ViewportRender(this.pimpl_, |
| 126 this.imageData_.width, | |
| 226 | 127 this.imageData_.height, |
| 128 this.renderingBuffer_) == 0) { | |
| 129 console.log('The rendering has failed'); | |
| 130 } else { | |
| 131 // Create an accessor to the rendering buffer (i.e. create a | |
| 132 // "window" above the heap of the WASM module), then copy it to | |
| 133 // the ImageData object | |
| 134 this.imageData_.data.set(new Uint8ClampedArray( | |
| 135 this.module_.buffer, | |
| 136 this.renderingBuffer_, | |
| 137 this.imageData_.width * this.imageData_.height * 4)); | |
| 138 | |
| 139 this.context_.putImageData(this.imageData_, 0, 0); | |
| 140 } | |
| 141 } | |
| 142 | |
| 143 public Resize() { | |
| 144 if (this.imageData_ != null && | |
| 145 (this.imageData_.width != window.innerWidth || | |
| 146 this.imageData_.height != window.innerHeight)) { | |
| 147 this.imageData_ = null; | |
| 148 } | |
| 149 | |
|
420
8bf717c4e497
canvas size is now defined by the parent div size
am@osimis.io
parents:
327
diff
changeset
|
150 // 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
|
151 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
|
152 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
|
153 |
|
9afb50d1ac14
configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents:
231
diff
changeset
|
154 console.log("resizing WasmViewport: ", this.htmlCanvas_.width, "x", this.htmlCanvas_.height); |
|
9afb50d1ac14
configure WasmViewport size relative to window size through html attributes
am@osimis.io
parents:
231
diff
changeset
|
155 |
| 226 | 156 if (this.imageData_ === null) { |
| 157 this.imageData_ = this.context_.getImageData(0, 0, this.htmlCanvas_.width, this.htmlCanvas_.height); | |
| 228 | 158 this.ViewportSetSize(this.pimpl_, this.htmlCanvas_.width, this.htmlCanvas_.height); |
| 226 | 159 |
| 160 if (this.renderingBuffer_ != null) { | |
| 161 this.module_._free(this.renderingBuffer_); | |
| 162 } | |
| 163 | |
| 164 this.renderingBuffer_ = this.module_._malloc(this.imageData_.width * this.imageData_.height * 4); | |
| 313 | 165 } else { |
| 166 this.ViewportSetSize(this.pimpl_, this.htmlCanvas_.width, this.htmlCanvas_.height); | |
| 226 | 167 } |
| 168 | |
| 169 this.Redraw(); | |
| 170 } | |
| 171 | |
|
231
5027cb2feb51
viewport is now part of the Application itself and not global anymore
am@osimis.io
parents:
230
diff
changeset
|
172 public Initialize() { |
| 227 | 173 |
| 174 // Force the rendering of the viewport for the first time | |
| 175 this.Resize(); | |
| 226 | 176 |
| 228 | 177 var that : WasmViewport = this; |
| 227 | 178 // Register an event listener to call the Resize() function |
| 179 // each time the window is resized. | |
| 228 | 180 window.addEventListener('resize', function(event) { |
| 181 that.Resize(); | |
| 182 }, false); | |
| 226 | 183 |
| 227 | 184 this.htmlCanvas_.addEventListener('contextmenu', function(event) { |
| 185 // Prevent right click on the canvas | |
| 186 event.preventDefault(); | |
| 187 }, false); | |
| 188 | |
| 189 this.htmlCanvas_.addEventListener('mouseleave', function(event) { | |
| 228 | 190 that.ViewportMouseLeave(that.pimpl_); |
| 227 | 191 }); |
| 192 | |
| 193 this.htmlCanvas_.addEventListener('mouseenter', function(event) { | |
| 228 | 194 that.ViewportMouseEnter(that.pimpl_); |
| 227 | 195 }); |
| 196 | |
| 197 this.htmlCanvas_.addEventListener('mousedown', function(event) { | |
| 198 var x = event.pageX - this.offsetLeft; | |
| 199 var y = event.pageY - this.offsetTop; | |
|
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
|
200 that.ViewportMouseDown(that.pimpl_, event.button, x, y, 0 /* TODO detect modifier keys*/); |
| 227 | 201 }); |
| 202 | |
| 203 this.htmlCanvas_.addEventListener('mousemove', function(event) { | |
| 204 var x = event.pageX - this.offsetLeft; | |
| 205 var y = event.pageY - this.offsetTop; | |
| 228 | 206 that.ViewportMouseMove(that.pimpl_, x, y); |
| 227 | 207 }); |
| 208 | |
| 209 this.htmlCanvas_.addEventListener('mouseup', function(event) { | |
| 228 | 210 that.ViewportMouseUp(that.pimpl_); |
| 227 | 211 }); |
| 212 | |
| 213 window.addEventListener('keydown', function(event) { | |
| 327 | 214 var keyChar = event.key; |
| 215 var keyCode = event.keyCode | |
| 216 if (keyChar.length == 1) { | |
| 217 keyCode = 0; // maps to OrthancStone::KeyboardKeys_Generic | |
| 218 } else { | |
| 219 keyChar = null; | |
| 220 } | |
| 221 // console.log("key: ", keyCode, keyChar); | |
| 222 that.ViewportKeyPressed(that.pimpl_, keyCode, keyChar, event.shiftKey, event.ctrlKey, event.altKey); | |
| 227 | 223 }); |
| 226 | 224 |
| 227 | 225 this.htmlCanvas_.addEventListener('wheel', function(event) { |
| 226 var x = event.pageX - this.offsetLeft; | |
| 227 var y = event.pageY - this.offsetTop; | |
| 228 | 228 that.ViewportMouseWheel(that.pimpl_, event.deltaY, x, y, event.ctrlKey); |
| 227 | 229 event.preventDefault(); |
| 230 }); | |
| 231 | |
| 232 this.htmlCanvas_.addEventListener('touchstart', function(event) { | |
|
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 |
| 227 | 237 that.ResetTouch(); |
| 238 }); | |
| 239 | |
| 240 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
|
241 // 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
|
242 event.preventDefault(); |
|
59b4afa92dee
TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents:
420
diff
changeset
|
243 event.stopPropagation(); |
|
59b4afa92dee
TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents:
420
diff
changeset
|
244 |
| 227 | 245 that.ResetTouch(); |
| 246 }); | |
| 247 | |
|
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
|
248 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
|
249 |
|
59b4afa92dee
TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents:
420
diff
changeset
|
250 // 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
|
251 event.preventDefault(); |
|
59b4afa92dee
TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents:
420
diff
changeset
|
252 event.stopPropagation(); |
|
59b4afa92dee
TS: stop propagating touch events to the whole html doc
Alain Mazy <alain@mazy.be>
parents:
420
diff
changeset
|
253 |
|
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
|
254 // if (!that.touchGestureInProgress_) { |
|
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
|
255 // // starting a new gesture |
|
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
|
256 // that.touchCount_ = event.targetTouches.length; |
|
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
|
257 // for (var t = 0; t < event.targetTouches.length; t++) { |
|
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
|
258 // that.touchGestureLastCoordinates_.push([event.targetTouches[t].pageX, event.targetTouches[t].pageY]); |
|
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
|
259 // } |
|
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
|
260 // that.touchGestureInProgress_ = true; |
|
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
|
261 // } else { |
|
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
|
262 // // continuing a gesture |
|
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
|
263 // // TODO: we shall probably forward all touches to the C++ code and let the "interactors/trackers" handle them |
|
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
|
264 |
|
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
|
265 // if (that.touchCount_ == 1) { // consider it's a left mouse drag |
|
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
|
266 |
|
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
|
267 // } |
|
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
|
268 // } |
|
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
|
269 |
|
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
|
270 // TODO: we shall probably forward all touches to the C++ code and let the "interactors/trackers" handle them |
|
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
|
271 |
|
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
|
272 if (that.touchTranslation_.length == 2) { // |
| 227 | 273 var t = that.GetTouchTranslation(event); |
| 228 | 274 that.ViewportMouseMove(that.pimpl_, t[0], t[1]); |
| 227 | 275 } |
| 276 else if (that.touchZoom_.length == 3) { | |
| 226 | 277 var z0 = that.touchZoom_; |
| 227 | 278 var z1 = that.GetTouchZoom(event); |
| 228 | 279 that.ViewportMouseMove(that.pimpl_, z0[0], z0[1] - z0[2] + z1[2]); |
| 227 | 280 } |
| 281 else { | |
| 282 // Realize the gesture event | |
| 283 if (event.targetTouches.length == 1) { | |
| 284 // Exactly one finger inside the canvas => Setup a translation | |
| 285 that.touchTranslation_ = that.GetTouchTranslation(event); | |
| 228 | 286 that.ViewportMouseDown(that.pimpl_, |
|
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
|
287 0 /* left button */, |
| 227 | 288 that.touchTranslation_[0], |
| 289 that.touchTranslation_[1], 0); | |
| 290 } else if (event.targetTouches.length == 2) { | |
| 291 // Exactly 2 fingers inside the canvas => Setup a pinch/zoom | |
| 292 that.touchZoom_ = that.GetTouchZoom(event); | |
| 293 var z0 = that.touchZoom_; | |
| 228 | 294 that.ViewportMouseDown(that.pimpl_, |
| 295 2 /* right button */, | |
| 227 | 296 z0[0], |
| 297 z0[1], 0); | |
| 298 } | |
| 299 } | |
| 300 }); | |
| 301 } | |
| 226 | 302 |
| 303 public ResetTouch() { | |
| 227 | 304 if (this.touchTranslation_ || |
| 305 this.touchZoom_) { | |
| 228 | 306 this.ViewportMouseUp(this.pimpl_); |
| 226 | 307 } |
| 227 | 308 |
| 309 this.touchTranslation_ = false; | |
| 310 this.touchZoom_ = false; | |
|
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
|
311 |
|
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
|
312 // this.touchGestureInProgress_ = 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
|
313 // this.touchCount_ = 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
|
314 // this.touchGestureLastCoordinates_ = []; |
| 227 | 315 } |
| 226 | 316 |
| 317 public GetTouchTranslation(event) { | |
| 227 | 318 var touch = event.targetTouches[0]; |
| 319 return [ | |
| 320 touch.pageX, | |
| 321 touch.pageY | |
| 322 ]; | |
| 323 } | |
| 226 | 324 |
| 325 public GetTouchZoom(event) { | |
| 227 | 326 var touch1 = event.targetTouches[0]; |
| 327 var touch2 = event.targetTouches[1]; | |
| 328 var dx = (touch1.pageX - touch2.pageX); | |
| 329 var dy = (touch1.pageY - touch2.pageY); | |
| 330 var d = Math.sqrt(dx * dx + dy * dy); | |
| 331 return [ | |
| 332 (touch1.pageX + touch2.pageX) / 2.0, | |
| 333 (touch1.pageY + touch2.pageY) / 2.0, | |
| 334 d | |
| 335 ]; | |
| 336 } | |
| 226 | 337 |
| 227 | 338 } |
|
466
5055031f4a06
- Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents:
420
diff
changeset
|
339 |
| 226 | 340 |