Skip to content

Commit e021ddf

Browse files
committed
failing #2 still ongoing
1 parent f881216 commit e021ddf

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

src/mouse.js

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,36 @@ function onContext(e){
88
e.stopPropagation();
99
}
1010

11+
function get_pointers_Firefox(e,t_id){
12+
let pointer_x,pointer_y
13+
if(defined(e.offsetX)){
14+
pointer_x = e.offsetX
15+
pointer_y = e.offsetY
16+
}else if(defined(e.layerX))
17+
{
18+
pointer_x = e.layerX
19+
pointer_y = e.layerY
20+
}else if(e.touches.length>0){
21+
pointer_x = e.touches[t_id].pageX
22+
pointer_y = e.touches[t_id].pageY
23+
}else{
24+
pointer_x = state.offset.x
25+
pointer_y = state.offset.y
26+
}
27+
return [pointer_x,pointer_y]
28+
}
29+
function get_pointers_default(e,t_id){
30+
let pointer_x = defined(e.offsetX)?e.offsetX: ((e.touches.length>0)?(e.touches[t_id].pageX):state.offset.x)
31+
let pointer_y = defined(e.offsetY)?e.offsetY: ((e.touches.length>0)?(e.touches[t_id].pageY):state.offset.y)
32+
return [pointer_x,pointer_y]
33+
}
34+
1135
function onMousePan(e){
1236
const is_vertex = e.target.classList.contains("vertex")
1337
let pointe_1 = defined(e.buttons)?(e.buttons == 1):(e.touches.length == 1)
1438
let pointer_2 = defined(e.buttons)?(e.buttons == 2):(e.touches.length == 2)
1539
let t_id = pointer_2?1:0
16-
let pointer_x = defined(e.offsetX)?e.offsetX: ((e.touches.length>0)?(e.touches[t_id].pageX):state.offset.x)
17-
let pointer_y = defined(e.offsetY)?e.offsetY: ((e.touches.length>0)?(e.touches[t_id].pageY):state.offset.y)
40+
let [pointer_x,pointer_y] = get_pointers_default(e,t_id)
1841
let vdx = pointer_x - state.offset.x;
1942
let vdy = pointer_y - state.offset.y;
2043
//console.log(`tx:${vdx},ty:${vdy} px:${e.touches[0].PageX},py:${e.touches[0].PageY}`)

0 commit comments

Comments
 (0)