[RDY] Touch support for pinch zoom and move map #1260
Conversation
There was a problem hiding this comment.
Thanks @mugmuggy. I don't have a device to test on, but it reads well short of a few minor style issues.
CorsixTH/Lua/game_ui.lua
Outdated
| if numfingers == 2 then | ||
| -- calculate magnitude of pinch | ||
| local mag = math.abs(dDist) | ||
| if mag > 0.002 then |
There was a problem hiding this comment.
Make 0.002 (mulitgesture_sensitivity_cutoff?) a variable (constant) defined near the top of the class. Let's avoid magic numbers.
CorsixTH/Lua/game_ui.lua
Outdated
| local mag = math.abs(dDist) | ||
| if mag > 0.002 then | ||
| -- pinch action - constant needs to be tweaked | ||
| self.current_momentum.z = self.current_momentum.z + dDist * 100 |
There was a problem hiding this comment.
100 is another magic number, so put it in a variable too.
CorsixTH/Lua/game_ui.lua
Outdated
| @@ -649,6 +682,10 @@ function GameUI:onTick() | |||
| self.current_momentum.z = self.current_momentum.z * self.momentum | |||
| self.app.world:adjustZoom(self.current_momentum.z) | |||
| end | |||
| if self.multigesturemove.x ~= 0.0 then | |||
There was a problem hiding this comment.
condition isn't necessary, just set them to 0.
CorsixTH/Lua/game_ui.lua
Outdated
| @@ -600,6 +601,38 @@ function GameUI:onMouseUp(code, x, y) | |||
| return UI.onMouseUp(self, code, x, y) | |||
| end | |||
|
|
|||
| function GameUI:onMultiGesture(numfingers, dTheta, dDist, x, y) | |||
There was a problem hiding this comment.
Please add documentation to new functions.
mugmuggy
force-pushed
the
multigesture
branch
from
1304b70
to
a6425f2
Compare
mugmuggy
changed the title
TheCycoONE
changed the title
|
I'd still like to see this one tested more before it lands. I'll see if I can get my hands on any devices. I think @wolfy1339 has one? |
|
I can't seem to generate those events on my linux chromebook, both the touchscreen and the touchpad only make normal mouse events. @wolfy1339 testing even with the razer blade would be helpful. |
|
Just tested it |
TheCycoONE
changed the title
I have access to a convertable device that I have tested quickly at this stage addressing touch controls.
Both pinch zoom and move map which is working mostly okay with this code.
What I don't have is a device specifically like that mentioned in #593 which may have this behave entirely different or interfere generally with use so would be nice to get this tested elsewhere.