cybafelo
/
r3-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix zoom etc

beta.r3js.org
-=yb4f310 2017-11-19 19:43:53 +01:00
parent 14b25ee7b6
commit 2d5014abb7
3 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/game-lib-min.js vendored
View File

File diff suppressed because one or more lines are too long

40
build/game-lib.js
View File

@ -1,5 +1,5 @@
// COMPILE TIME DEFINITIONS (Generated via gulp)
var __DATE__ = "Sun Nov 19 2017 17:31:12 GMT+0100 (CET)";
var __DATE__ = "Sun Nov 19 2017 19:43:14 GMT+0100 (CET)";
// END COMPILE TIME DEFINITIONS
/**
@ -28221,26 +28221,6 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
var pinch = false;
var zoom = false;
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++) {
id = event.changedTouches[t].identifier;
@ -28282,6 +28262,24 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
}
}
if (event.changedTouches.length === 2) {
if (event.changedTouches[0].pageX < event.changedTouches[1].pageX) {
leftTouch = this.touches[event.changedTouches[0].identifier];
rightTouch = this.touches[event.changedTouches[1].identifier];
} else {
leftTouch = this.touches[event.changedTouches[1].identifier];
rightTouch = this.touches[event.changedTouches[0].identifier];
}
if (event.changedTouches[0].pageY < event.changedTouches[1].pageY) {
bottomTouch = this.touches[event.changedTouches[0].identifier];
topTouch = this.touches[event.changedTouches[1].identifier];
} else {
bottomTouch = this.touches[event.changedTouches[1].identifier];
topTouch = this.touches[event.changedTouches[0].identifier];
}
}
if (leftTouch && leftTouch.left && rightTouch && rightTouch.right) {
outward = true;
}

38
src/game-lib-system-input.js
View File

@ -621,26 +621,6 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
var pinch = false;
var zoom = false;
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++) {
id = event.changedTouches[t].identifier;
@ -682,6 +662,24 @@ GameLib.System.Input.prototype.onTouchMove = function (event) {
}
}
if (event.changedTouches.length === 2) {
if (event.changedTouches[0].pageX < event.changedTouches[1].pageX) {
leftTouch = this.touches[event.changedTouches[0].identifier];
rightTouch = this.touches[event.changedTouches[1].identifier];
} else {
leftTouch = this.touches[event.changedTouches[1].identifier];
rightTouch = this.touches[event.changedTouches[0].identifier];
}
if (event.changedTouches[0].pageY < event.changedTouches[1].pageY) {
bottomTouch = this.touches[event.changedTouches[0].identifier];
topTouch = this.touches[event.changedTouches[1].identifier];
} else {
bottomTouch = this.touches[event.changedTouches[1].identifier];
topTouch = this.touches[event.changedTouches[0].identifier];
}
}
if (leftTouch && leftTouch.left && rightTouch && rightTouch.right) {
outward = true;
}