touch meta
parent
3770cdfde7
commit
afad5a99f8
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
||||||
// COMPILE TIME DEFINITIONS (Generated via gulp)
|
// COMPILE TIME DEFINITIONS (Generated via gulp)
|
||||||
var __DATE__ = "Sun Nov 19 2017 14:40:05 GMT+0100 (CET)";
|
var __DATE__ = "Sun Nov 19 2017 14:51:44 GMT+0100 (CET)";
|
||||||
// END COMPILE TIME DEFINITIONS
|
// END COMPILE TIME DEFINITIONS
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -28211,10 +28211,13 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
|
||||||
|
|
||||||
var leftTouch = null;
|
var leftTouch = null;
|
||||||
var rightTouch = null;
|
var rightTouch = null;
|
||||||
|
var bottomTouch = null;
|
||||||
|
var topTouch = null;
|
||||||
|
|
||||||
var inward = false;
|
var inward = false;
|
||||||
var outward = false;
|
var outward = false;
|
||||||
|
var pinch = false;
|
||||||
|
var zoom = false;
|
||||||
|
|
||||||
if (event.changedTouches.length === 2) {
|
if (event.changedTouches.length === 2) {
|
||||||
if (event.changedTouches[0].pageX < event.changedTouches[1].pageX) {
|
if (event.changedTouches[0].pageX < event.changedTouches[1].pageX) {
|
||||||
|
@ -28224,6 +28227,14 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
|
||||||
leftTouch = event.changedTouches[1];
|
leftTouch = event.changedTouches[1];
|
||||||
rightTouch = event.changedTouches[0];
|
rightTouch = event.changedTouches[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (event.changedTouches[0].pageY < event.changedTouches[1].pageY) {
|
||||||
|
bottomTouch = event.changedTouches[0];
|
||||||
|
topTouch = event.changedTouches[1];
|
||||||
|
} else {
|
||||||
|
bottomTouch = event.changedTouches[1];
|
||||||
|
topTouch = event.changedTouches[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var t = 0; t < event.changedTouches.length; t++) {
|
for (var t = 0; t < event.changedTouches.length; t++) {
|
||||||
|
@ -28267,18 +28278,31 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leftTouch.left && rightTouch.right) {
|
if (leftTouch && leftTouch.left && rightTouch && rightTouch.right) {
|
||||||
outward = true;
|
outward = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leftTouch.right && rightTouch.left) {
|
if (leftTouch && leftTouch.right && rightTouch && rightTouch.left) {
|
||||||
inward = true;
|
inward = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bottomTouch && bottomTouch.up && topTouch && topTouch.down) {
|
||||||
|
pinch = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bottomTouch && bottomTouch.down && topTouch && topTouch.up) {
|
||||||
|
zoom = true;
|
||||||
|
}
|
||||||
|
|
||||||
this.touches.event = event;
|
this.touches.event = event;
|
||||||
|
|
||||||
|
this.touches.meta = {
|
||||||
|
inward : inward,
|
||||||
|
outward : outward,
|
||||||
|
pinch : pinch,
|
||||||
|
zoom : zoom
|
||||||
|
};
|
||||||
|
|
||||||
if (this.sensitivityCounter >= this.touchSensitivity) {
|
if (this.sensitivityCounter >= this.touchSensitivity) {
|
||||||
|
|
||||||
this.sensitivityCounter = 0;
|
this.sensitivityCounter = 0;
|
||||||
|
|
|
@ -613,9 +613,30 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
|
||||||
|
|
||||||
var leftTouch = null;
|
var leftTouch = null;
|
||||||
var rightTouch = null;
|
var rightTouch = null;
|
||||||
|
var bottomTouch = null;
|
||||||
|
var topTouch = null;
|
||||||
|
|
||||||
|
var inward = false;
|
||||||
|
var outward = false;
|
||||||
|
var pinch = false;
|
||||||
|
var zoom = false;
|
||||||
|
|
||||||
if (event.changedTouches.length === 2) {
|
if (event.changedTouches.length === 2) {
|
||||||
|
if (event.changedTouches[0].pageX < event.changedTouches[1].pageX) {
|
||||||
|
leftTouch = event.changedTouches[0];
|
||||||
|
rightTouch = event.changedTouches[1];
|
||||||
|
} else {
|
||||||
|
leftTouch = event.changedTouches[1];
|
||||||
|
rightTouch = event.changedTouches[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.changedTouches[0].pageY < event.changedTouches[1].pageY) {
|
||||||
|
bottomTouch = event.changedTouches[0];
|
||||||
|
topTouch = event.changedTouches[1];
|
||||||
|
} else {
|
||||||
|
bottomTouch = event.changedTouches[1];
|
||||||
|
topTouch = event.changedTouches[0];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var t = 0; t < event.changedTouches.length; t++) {
|
for (var t = 0; t < event.changedTouches.length; t++) {
|
||||||
|
@ -657,14 +678,33 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
|
||||||
this.touches[id].pageX = event.changedTouches[t].pageX;
|
this.touches[id].pageX = event.changedTouches[t].pageX;
|
||||||
this.touches[id].pageY = event.changedTouches[t].pageY;
|
this.touches[id].pageY = event.changedTouches[t].pageY;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (leftTouch && leftTouch.left && rightTouch && rightTouch.right) {
|
||||||
|
outward = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (leftTouch && leftTouch.right && rightTouch && rightTouch.left) {
|
||||||
|
inward = true;
|
||||||
|
}
|
||||||
|
|
||||||
//console.log(this.touches[id]);
|
if (bottomTouch && bottomTouch.up && topTouch && topTouch.down) {
|
||||||
|
pinch = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bottomTouch && bottomTouch.down && topTouch && topTouch.up) {
|
||||||
|
zoom = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.touches.event = event;
|
this.touches.event = event;
|
||||||
|
|
||||||
|
this.touches.meta = {
|
||||||
|
inward : inward,
|
||||||
|
outward : outward,
|
||||||
|
pinch : pinch,
|
||||||
|
zoom : zoom
|
||||||
|
};
|
||||||
|
|
||||||
if (this.sensitivityCounter >= this.touchSensitivity) {
|
if (this.sensitivityCounter >= this.touchSensitivity) {
|
||||||
|
|
||||||
this.sensitivityCounter = 0;
|
this.sensitivityCounter = 0;
|
||||||
|
|
Loading…
Reference in New Issue