author | antonc27 <antonc27@mail.ru> |
Thu, 15 Oct 2015 21:58:30 +0200 | |
branch | ios-revival |
changeset 11214 | 22f2e072d31e |
parent 11088 | 378882cc9148 |
child 11228 | 24bafdcf1860 |
permissions | -rw-r--r-- |
5621 | 1 |
(* |
2 |
* Hedgewars, a free turn based strategy game |
|
6700 | 3 |
* Copyright (c) 2012 Richard Deurwaarder <xeli@xelification.com> |
5621 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
9521
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
5621 | 17 |
*) |
18 |
||
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
19 |
{$INCLUDE "options.inc"} |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
20 |
|
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
21 |
unit uTouch; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
22 |
|
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
23 |
interface |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
24 |
|
8204 | 25 |
uses SysUtils, uConsole, uVariables, SDLh, uFloat, uConsts, uCommands, GLUnit, uTypes, uCaptions, uAmmos, uWorld; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
26 |
|
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
27 |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
28 |
procedure initModule; |
7850 | 29 |
procedure freeModule; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
30 |
|
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
31 |
procedure ProcessTouch; |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
32 |
procedure NewTurnBeginning; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
33 |
|
9379 | 34 |
procedure onTouchDown(x, y: Single; pointerId: TSDL_FingerId); |
35 |
procedure onTouchMotion(x, y, dx, dy: Single; pointerId: TSDL_FingerId); |
|
36 |
procedure onTouchUp(x, y: Single; pointerId: TSDL_FingerId); |
|
37 |
||
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
38 |
function convertToCursorX(x: LongInt): LongInt; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
39 |
function convertToCursorY(y: LongInt): LongInt; |
9379 | 40 |
|
6693 | 41 |
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data; |
42 |
function updateFinger(x,y,dx,dy: Longword; id: TSDL_FingerId): PTouch_Data; |
|
43 |
procedure deleteFinger(id: TSDL_FingerId); |
|
9379 | 44 |
|
6693 | 45 |
procedure onTouchClick(finger: TTouch_Data); |
46 |
procedure onTouchDoubleClick(finger: TTouch_Data); |
|
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
47 |
procedure onTouchLongClick(finger: TTouch_Data); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
48 |
|
6693 | 49 |
function findFinger(id: TSDL_FingerId): PTouch_Data; |
50 |
procedure aim(finger: TTouch_Data); |
|
51 |
function isOnCrosshair(finger: TTouch_Data): boolean; |
|
52 |
function isOnCurrentHog(finger: TTouch_Data): boolean; |
|
6702 | 53 |
procedure convertToWorldCoord(var x,y: LongInt; finger: TTouch_Data); |
54 |
procedure convertToFingerCoord(var x,y: LongInt; oldX, oldY: LongInt); |
|
6693 | 55 |
function fingerHasMoved(finger: TTouch_Data): boolean; |
6702 | 56 |
function calculateDelta(finger1, finger2: TTouch_Data): LongInt; |
6693 | 57 |
function getSecondFinger(finger: TTouch_Data): PTouch_Data; |
58 |
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean; |
|
6703 | 59 |
function isOnRect(x,y,w,h: LongInt; finger: TTouch_Data): boolean; |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
60 |
function isOnWidget(widget: TOnScreenWidget; finger: TTouch_Data): boolean; |
6693 | 61 |
procedure printFinger(finger: TTouch_Data); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
62 |
implementation |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
63 |
|
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
64 |
const |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
65 |
clickTime = 200; |
11088
378882cc9148
- Fix for uTouch.pas:365: 34: Identifier not found "nilFingerId"
antonc27 <antonc27@mail.ru>
parents:
10108
diff
changeset
|
66 |
nilFingerId = High(TSDL_FingerId); |
7185
92a045156255
Android: first attempt at using the density call from java
Xeli
parents:
7105
diff
changeset
|
67 |
baseRectSize = 96; |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
68 |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
69 |
var |
7185
92a045156255
Android: first attempt at using the density call from java
Xeli
parents:
7105
diff
changeset
|
70 |
rectSize, halfRectSize: LongInt; |
92a045156255
Android: first attempt at using the density call from java
Xeli
parents:
7105
diff
changeset
|
71 |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
72 |
pointerCount : Longword; |
6693 | 73 |
fingers: array of TTouch_Data; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
74 |
moveCursor : boolean; |
5617
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
75 |
invertCursor : boolean; |
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
76 |
|
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
77 |
xTouchClick,yTouchClick : LongInt; |
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
78 |
timeSinceClick : Longword; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
79 |
|
8330 | 80 |
//Pinch to zoom |
6702 | 81 |
pinchSize : LongInt; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
82 |
baseZoomValue: GLFloat; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
83 |
|
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
84 |
//aiming |
6703 | 85 |
aimingCrosshair: boolean; |
8330 | 86 |
aimingUp, aimingDown: boolean; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
87 |
targetAngle: LongInt; |
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
88 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
89 |
buttonsDown: Longword; |
6957 | 90 |
targetting, targetted: boolean; //true when targetting an airstrike or the like |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
91 |
|
9379 | 92 |
procedure onTouchDown(x, y: Single; pointerId: TSDL_FingerId); |
8330 | 93 |
var |
6693 | 94 |
finger: PTouch_Data; |
9379 | 95 |
xr, yr: LongWord; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
96 |
begin |
9379 | 97 |
xr:= round(x * cScreenWidth); |
98 |
yr:= round(y * cScreenHeight); |
|
99 |
||
100 |
finger:= addFinger(xr, yr, pointerId); |
|
6703 | 101 |
|
102 |
inc(buttonsDown);//inc buttonsDown, if we don't see a button down we'll dec it |
|
103 |
||
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
104 |
if isOnCrosshair(finger^) then |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
105 |
begin |
6703 | 106 |
aimingCrosshair:= true; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
107 |
aim(finger^); |
6703 | 108 |
moveCursor:= false; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
109 |
exit; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
110 |
end; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
111 |
|
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
112 |
if isOnWidget(fireButton, finger^) then |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
113 |
begin |
6957 | 114 |
ParseTeamCommand('+attack'); |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
115 |
moveCursor:= false; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
116 |
finger^.pressedWidget:= @fireButton; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
117 |
exit; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
118 |
end; |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
119 |
if isOnWidget(arrowLeft, finger^) then |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
120 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
121 |
ParseTeamCommand('+left'); |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
122 |
moveCursor:= false; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
123 |
finger^.pressedWidget:= @arrowLeft; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
124 |
exit; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
125 |
end; |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
126 |
if isOnWidget(arrowRight, finger^) then |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
127 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
128 |
ParseTeamCommand('+right'); |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
129 |
moveCursor:= false; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
130 |
finger^.pressedWidget:= @arrowRight; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
131 |
exit; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
132 |
end; |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
133 |
if isOnWidget(arrowUp, finger^) then |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
134 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
135 |
ParseTeamCommand('+up'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
136 |
aimingUp:= true; |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
137 |
moveCursor:= false; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
138 |
finger^.pressedWidget:= @arrowUp; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
139 |
exit; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
140 |
end; |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
141 |
if isOnWidget(arrowDown, finger^) then |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
142 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
143 |
ParseTeamCommand('+down'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
144 |
aimingDown:= true; |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
145 |
moveCursor:= false; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
146 |
finger^.pressedWidget:= @arrowDown; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
147 |
exit; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
148 |
end; |
6640 | 149 |
|
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
150 |
if isOnWidget(pauseButton, finger^) then |
6806
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
151 |
begin |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
152 |
isPaused:= not isPaused; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
153 |
moveCursor:= false; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
154 |
finger^.pressedWidget:= @pauseButton; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
155 |
exit; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
156 |
end; |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
157 |
|
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
158 |
if isOnWidget(utilityWidget, finger^) then |
cdfb6c7099e5
first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents:
6723
diff
changeset
|
159 |
begin |
6957 | 160 |
finger^.pressedWidget:= @utilityWidget; |
161 |
moveCursor:= false; |
|
6956 | 162 |
if(CurrentHedgehog <> nil) then |
163 |
begin |
|
164 |
if Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Timerable <> 0 then |
|
165 |
ParseTeamCommand('/timer ' + inttostr((GetCurAmmoEntry(CurrentHedgeHog^)^.Timer div 1000) mod 5 + 1)); |
|
166 |
end; |
|
6957 | 167 |
exit; |
8330 | 168 |
end; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
169 |
dec(buttonsDown);//no buttonsDown, undo the inc() above |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
170 |
if buttonsDown = 0 then |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
171 |
begin |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
172 |
moveCursor:= true; |
6951
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
173 |
case pointerCount of |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
174 |
1: |
6957 | 175 |
targetting:= not(targetted) and (CurrentHedgehog <> nil) and (Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0); |
6951
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
176 |
2: |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
177 |
begin |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
178 |
moveCursor:= false; |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
179 |
pinchSize := calculateDelta(finger^, getSecondFinger(finger^)^); |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
180 |
baseZoomValue := ZoomValue |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
181 |
end; |
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
182 |
end; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
183 |
end; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
184 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
185 |
|
9379 | 186 |
procedure onTouchMotion(x, y, dx, dy: Single; pointerId: TSDL_FingerId); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
187 |
var |
6693 | 188 |
finger, secondFinger: PTouch_Data; |
9379 | 189 |
currentPinchDelta, zoom : Single; |
190 |
xr, yr, dxr, dyr: LongWord; |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
191 |
begin |
9379 | 192 |
xr:= round(x * cScreenWidth); |
193 |
yr:= round(y * cScreenHeight); |
|
194 |
dxr:= round(dx * cScreenWidth); |
|
195 |
dyr:= round(dy * cScreenHeight); |
|
196 |
||
197 |
finger:= updateFinger(xr, yr, dxr, dyr, pointerId); |
|
198 |
if finger = nil then |
|
199 |
exit; |
|
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
200 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
201 |
if moveCursor then |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
202 |
begin |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
203 |
if invertCursor then |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
204 |
begin |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
205 |
CursorPoint.X := CursorPoint.X - finger^.dx; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
206 |
CursorPoint.Y := CursorPoint.Y + finger^.dy; |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
207 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
208 |
else |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
209 |
begin |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
210 |
CursorPoint.X := CursorPoint.X + finger^.dx; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
211 |
CursorPoint.Y := CursorPoint.Y - finger^.dy; |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
212 |
end; |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
213 |
exit //todo change into switch rather than ugly ifs |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
214 |
end; |
8330 | 215 |
|
216 |
if aimingCrosshair then |
|
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
217 |
begin |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
218 |
aim(finger^); |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
219 |
exit |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
220 |
end; |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
221 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
222 |
if (buttonsDown = 0) and (pointerCount = 2) then |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
223 |
begin |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
224 |
secondFinger := getSecondFinger(finger^); |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
225 |
currentPinchDelta := calculateDelta(finger^, secondFinger^) - pinchSize; |
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
226 |
zoom := currentPinchDelta/cScreenWidth; |
6702 | 227 |
ZoomValue := baseZoomValue - (zoom * cMinMaxZoomLevelDelta); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
228 |
if ZoomValue < cMaxZoomLevel then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
229 |
ZoomValue := cMaxZoomLevel; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
230 |
if ZoomValue > cMinZoomLevel then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
231 |
ZoomValue := cMinZoomLevel; |
5828
667fb58d7f18
Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents:
5733
diff
changeset
|
232 |
end; |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
233 |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
234 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
235 |
|
9379 | 236 |
procedure onTouchUp(x,y: Single; pointerId: TSDL_FingerId); |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
237 |
var |
6693 | 238 |
finger: PTouch_Data; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
239 |
widget: POnScreenWidget; |
9379 | 240 |
xr, yr: LongWord; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
241 |
begin |
9379 | 242 |
xr:= round(x * cScreenWidth); |
243 |
yr:= round(y * cScreenHeight); |
|
244 |
||
245 |
finger:= updateFinger(xr, yr, 0, 0, pointerId); |
|
246 |
if finger = nil then |
|
247 |
exit; |
|
248 |
||
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
249 |
//Check for onTouchClick event |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
250 |
if not(fingerHasMoved(finger^)) then |
6950
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
251 |
begin |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
252 |
if (RealTicks - finger^.timeSinceDown) < clickTime then |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
253 |
onTouchClick(finger^) |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
254 |
else |
9379 | 255 |
onTouchLongClick(finger^); |
6950
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
256 |
end; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
257 |
|
6703 | 258 |
if aimingCrosshair then |
259 |
begin |
|
260 |
aimingCrosshair:= false; |
|
7022 | 261 |
ParseTeamCommand('-up'); |
262 |
ParseTeamCommand('-down'); |
|
6703 | 263 |
dec(buttonsDown); |
264 |
end; |
|
265 |
||
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
266 |
widget:= finger^.pressedWidget; |
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
267 |
if (buttonsDown > 0) and (widget <> nil) then |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
268 |
begin |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
269 |
dec(buttonsDown); |
8330 | 270 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
271 |
if widget = @arrowLeft then |
6949
615cc50903c8
remove last boolean keys references and using only ParseCommand in uTouch now
Xeli
parents:
6919
diff
changeset
|
272 |
ParseTeamCommand('-left'); |
8330 | 273 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
274 |
if widget = @arrowRight then |
6949
615cc50903c8
remove last boolean keys references and using only ParseCommand in uTouch now
Xeli
parents:
6919
diff
changeset
|
275 |
ParseTeamCommand('-right'); |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
276 |
|
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
277 |
if widget = @arrowUp then |
6949
615cc50903c8
remove last boolean keys references and using only ParseCommand in uTouch now
Xeli
parents:
6919
diff
changeset
|
278 |
ParseTeamCommand('-up'); |
6640 | 279 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
280 |
if widget = @arrowDown then |
6949
615cc50903c8
remove last boolean keys references and using only ParseCommand in uTouch now
Xeli
parents:
6919
diff
changeset
|
281 |
ParseTeamCommand('-down'); |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
282 |
|
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
283 |
if widget = @fireButton then |
6957 | 284 |
ParseTeamCommand('-attack'); |
8330 | 285 |
|
6957 | 286 |
if widget = @utilityWidget then |
6962 | 287 |
if (CurrentHedgehog <> nil)then |
288 |
if(Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0)then |
|
289 |
begin |
|
290 |
ParseTeamCommand('put'); |
|
291 |
targetted:= true; |
|
292 |
end |
|
7105 | 293 |
else if (CurAmmoGear <> nil) and (CurAmmoGear^.AmmoType = amSwitch) then |
6962 | 294 |
ParseTeamCommand('switch') |
295 |
else WriteLnToConsole(inttostr(ord(Ammoz[CurrentHedgehog^.CurAmmoType].NameId)) + ' ' + inttostr(ord(sidSwitch))); |
|
6640 | 296 |
end; |
8330 | 297 |
|
6951
a37e470c8694
- changed targetting, to launch an airstrike move the cursor/pointer to a location and then press the firebutton
Xeli
parents:
6950
diff
changeset
|
298 |
if targetting then |
6957 | 299 |
AddCaption('Press the target button to mark the target', cWhiteColor, capgrpAmmoInfo); |
8330 | 300 |
|
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
301 |
deleteFinger(pointerId); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
302 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
303 |
|
6693 | 304 |
procedure onTouchDoubleClick(finger: TTouch_Data); |
5617
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
305 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
306 |
finger := finger;//avoid compiler hint |
5617
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
307 |
end; |
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
308 |
|
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
309 |
procedure onTouchLongClick(finger: TTouch_Data); |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
310 |
begin |
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
311 |
if isOnWidget(jumpWidget, finger) then |
6950
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
312 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
313 |
ParseTeamCommand('ljump'); |
6950
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
314 |
exit; |
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
315 |
end; |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
316 |
end; |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
317 |
|
6693 | 318 |
procedure onTouchClick(finger: TTouch_Data); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
319 |
begin |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
320 |
//if (RealTicks - timeSinceClick < 300) and (sqrt(sqr(finger.X-xTouchClick) + sqr(finger.Y-yTouchClick)) < 30) then |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
321 |
// begin |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
322 |
// onTouchDoubleClick(finger); |
8330 | 323 |
// timeSinceClick:= 0;//we make an assumption there won't be an 'click' in the first 300 ticks(milliseconds) |
324 |
// exit; |
|
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
325 |
// end; |
5617
88f43becefe3
added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents:
5615
diff
changeset
|
326 |
|
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
327 |
xTouchClick:= finger.x; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
328 |
yTouchClick:= finger.y; |
6687 | 329 |
timeSinceClick:= RealTicks; |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
330 |
|
6648
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
331 |
if bShowAmmoMenu then |
8330 | 332 |
begin |
6683
75a1d84ac606
small refactoring to touch screen buttons, use a record to store values, added 'offset' fields to adjust active button area
koda
parents:
6676
diff
changeset
|
333 |
if isOnRect(AmmoRect, finger) then |
6648
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
334 |
begin |
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
335 |
CursorPoint.X:= finger.x; |
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
336 |
CursorPoint.Y:= finger.y; |
8330 | 337 |
ParseTeamCommand('put'); |
6648
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
338 |
end |
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
339 |
else |
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
340 |
bShowAmmoMenu:= false; |
025473a2c420
prevent the cursor from being shown on the mobile version, and close the menu on tap when the tap is not on the ammo menu
Xeli
parents:
6640
diff
changeset
|
341 |
exit; |
5589 | 342 |
end; |
343 |
||
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
344 |
if isOnCurrentHog(finger) or isOnWidget(AMWidget, finger) then |
5595 | 345 |
begin |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
346 |
bShowAmmoMenu := true; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
347 |
exit; |
5595 | 348 |
end; |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
349 |
|
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
350 |
if isOnWidget(jumpWidget, finger) then |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
351 |
begin |
8330 | 352 |
ParseTeamCommand('hjump'); |
6712
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
353 |
exit; |
c582869fbe7f
changed jumping, on x button tap is high jump, on longpress + release is low jump (read: it only does a low jump when you release)
Xeli
parents:
6707
diff
changeset
|
354 |
end; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
355 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
356 |
|
6693 | 357 |
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data; |
8330 | 358 |
var |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
359 |
xCursor, yCursor, index : LongInt; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
360 |
begin |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
361 |
//Check array sizes |
9379 | 362 |
if length(fingers) < pointerCount then |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
363 |
begin |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
364 |
setLength(fingers, length(fingers)*2); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
365 |
for index := length(fingers) div 2 to length(fingers) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
366 |
fingers[index].id := nilFingerId; |
5589 | 367 |
end; |
8330 | 368 |
|
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
369 |
xCursor := convertToCursorX(x); |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
370 |
yCursor := convertToCursorY(y); |
8330 | 371 |
|
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
372 |
//on removing fingers, all fingers are moved to the left |
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
373 |
//with dynamic arrays being zero based, the new position of the finger is the old pointerCount |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
374 |
fingers[pointerCount].id := id; |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
375 |
fingers[pointerCount].historicalX := xCursor; |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
376 |
fingers[pointerCount].historicalY := yCursor; |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
377 |
fingers[pointerCount].x := xCursor; |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
378 |
fingers[pointerCount].y := yCursor; |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
379 |
fingers[pointerCount].dx := 0; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
380 |
fingers[pointerCount].dy := 0; |
6687 | 381 |
fingers[pointerCount].timeSinceDown:= RealTicks; |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
382 |
fingers[pointerCount].pressedWidget:= nil; |
8330 | 383 |
|
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
384 |
addFinger:= @fingers[pointerCount]; |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
385 |
inc(pointerCount); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
386 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
387 |
|
9379 | 388 |
function updateFinger(x, y, dx, dy: Longword; id: TSDL_FingerId): PTouch_Data; |
389 |
var finger : PTouch_Data; |
|
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
390 |
begin |
9379 | 391 |
finger:= findFinger(id); |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
392 |
|
9379 | 393 |
if finger <> nil then |
394 |
begin |
|
395 |
finger^.x:= convertToCursorX(x); |
|
396 |
finger^.y:= convertToCursorY(y); |
|
397 |
finger^.dx:= dx; |
|
398 |
finger^.dy:= dy; |
|
399 |
end |
|
400 |
else |
|
401 |
WriteLnToConsole('finger ' + inttostr(id) + ' not found'); |
|
402 |
updateFinger:= finger |
|
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
403 |
end; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
404 |
|
6693 | 405 |
procedure deleteFinger(id: TSDL_FingerId); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
406 |
var |
6228
1b7d4d7d162b
added lines to avoid compiler hints, is this really the way we want to do it though? ;/
Xeli
parents:
6029
diff
changeset
|
407 |
index : Longword; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
408 |
begin |
8330 | 409 |
|
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
410 |
dec(pointerCount); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
411 |
for index := 0 to pointerCount do |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
412 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
413 |
if fingers[index].id = id then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
414 |
begin |
8330 | 415 |
|
416 |
//put the last finger into the spot of the finger to be removed, |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
417 |
//so that all fingers are packed to the far left |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
418 |
if pointerCount <> index then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
419 |
begin |
8330 | 420 |
fingers[index].id := fingers[pointerCount].id; |
421 |
fingers[index].x := fingers[pointerCount].x; |
|
422 |
fingers[index].y := fingers[pointerCount].y; |
|
423 |
fingers[index].historicalX := fingers[pointerCount].historicalX; |
|
424 |
fingers[index].historicalY := fingers[pointerCount].historicalY; |
|
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
425 |
fingers[index].timeSinceDown := fingers[pointerCount].timeSinceDown; |
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
426 |
|
9379 | 427 |
fingers[pointerCount].id := 0; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
428 |
end |
9379 | 429 |
else fingers[index].id := 0; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
430 |
break; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
431 |
end; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
432 |
end; |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
433 |
|
5589 | 434 |
end; |
435 |
||
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
436 |
procedure NewTurnBeginning; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
437 |
begin |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
438 |
targetted:= false; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
439 |
targetting:= false; |
7022 | 440 |
SetUtilityWidgetState(amNothing); |
6961
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
441 |
end; |
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
442 |
|
d5ac09894a1b
hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents:
6957
diff
changeset
|
443 |
|
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
444 |
procedure ProcessTouch; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
445 |
var |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
446 |
deltaAngle: LongInt; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
447 |
begin |
8330 | 448 |
invertCursor := not(bShowAmmoMenu or targetting); |
6705
d2e95dcf2bb0
stop the crosshair from twitching when it's not supposed to move + fix aimingUp/Down booleans
Xeli
parents:
6704
diff
changeset
|
449 |
if aimingCrosshair then |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
450 |
if CurrentHedgehog^.Gear <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
451 |
begin |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
452 |
deltaAngle:= CurrentHedgehog^.Gear^.Angle - targetAngle; |
8330 | 453 |
if (deltaAngle > -5) and (deltaAngle < 5) then |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
454 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
455 |
if(aimingUp)then |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
456 |
begin |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
457 |
aimingUp:= false; |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
458 |
ParseTeamCommand('-up'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
459 |
end; |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
460 |
if(aimingDown)then |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
461 |
begin |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
462 |
aimingDown:= false; |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
463 |
ParseTeamCommand('-down'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
464 |
end |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
465 |
end |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
466 |
else |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
467 |
begin |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
468 |
if (deltaAngle < 0) then |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
469 |
begin |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
470 |
if aimingUp then |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
471 |
begin |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
472 |
aimingUp:= false; |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
473 |
ParseTeamCommand('-up'); |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
474 |
end; |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
475 |
if(aimingDown)then |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
476 |
begin |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
477 |
aimingDown:= true; |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
478 |
ParseTeamCommand('-down'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
479 |
end |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
480 |
end |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
481 |
else |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
482 |
begin |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
483 |
if aimingDown then |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
484 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
485 |
ParseTeamCommand('-down'); |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
486 |
aimingDown:= false; |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
487 |
end; |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
488 |
if aimingUp then |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
489 |
begin |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
490 |
aimingUp:= true; |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
491 |
ParseTeamCommand('+up'); |
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
492 |
end; |
8330 | 493 |
end; |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
494 |
end; |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
495 |
end |
8330 | 496 |
else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
497 |
begin |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
498 |
if aimingUp then |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
499 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
500 |
ParseTeamCommand('-up'); |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
501 |
aimingUp:= false; |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
502 |
end; |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
503 |
if aimingDown then |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
504 |
begin |
6919
bf7433e62b9c
in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents:
6808
diff
changeset
|
505 |
ParseTeamCommand('-down'); |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
506 |
aimingDown:= false; |
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
507 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
508 |
end; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
509 |
end; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
510 |
|
6693 | 511 |
function findFinger(id: TSDL_FingerId): PTouch_Data; |
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
512 |
var |
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
513 |
index: LongWord; |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
514 |
begin |
9379 | 515 |
for index:= 0 to length(fingers) do |
8330 | 516 |
if fingers[index].id = id then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
517 |
begin |
9379 | 518 |
findFinger:= @fingers[index]; |
519 |
exit; |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
520 |
end; |
9379 | 521 |
findFinger:= nil; |
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
522 |
end; |
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
523 |
|
6693 | 524 |
procedure aim(finger: TTouch_Data); |
8330 | 525 |
var |
6702 | 526 |
hogX, hogY, touchX, touchY, deltaX, deltaY: LongInt; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
527 |
begin |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
528 |
if CurrentHedgehog^.Gear <> nil then |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
529 |
begin |
6702 | 530 |
touchX := 0;//avoid compiler hint |
531 |
touchY := 0; |
|
532 |
hogX := hwRound(CurrentHedgehog^.Gear^.X); |
|
533 |
hogY := hwRound(CurrentHedgehog^.Gear^.Y); |
|
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
534 |
|
5609
9d66611e4d0a
Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents:
5605
diff
changeset
|
535 |
convertToWorldCoord(touchX, touchY, finger); |
6702 | 536 |
deltaX := abs(TouchX-HogX); |
537 |
deltaY := TouchY-HogY; |
|
8330 | 538 |
|
6703 | 539 |
targetAngle:= (Round(DeltaY / sqrt(sqr(deltaX) + sqr(deltaY)) * 2048) + 2048) div 2; |
6651
4103354b7599
fixed aiming by touching the crosshair, made it compatible with the aiming buttons and disabled camera movement when touching buttons + some formatting fixes
Xeli
parents:
6648
diff
changeset
|
540 |
end; //if CurrentHedgehog^.Gear <> nil |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
541 |
end; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
542 |
|
6693 | 543 |
// These 4 convertToCursor functions convert xy coords from the SDL coordinate system to our CursorPoint coor system: |
9379 | 544 |
// - the SDL coordinate system is proportional to the screen and values are normalized in the onTouch* functions |
6693 | 545 |
// - the CursorPoint coordinate system goes from -cScreenWidth/2 to cScreenWidth/2 on the x axis |
546 |
// and 0 to cScreenHeight on the x axis, (-cScreenWidth, cScreenHeight) being top left. |
|
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
547 |
function convertToCursorX(x: LongInt): LongInt; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
548 |
begin |
9379 | 549 |
convertToCursorX:= x - cScreenWidth shr 1; |
6625
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
550 |
end; |
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
551 |
|
2d8c5815292f
some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents:
6580
diff
changeset
|
552 |
function convertToCursorY(y: LongInt): LongInt; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
553 |
begin |
9379 | 554 |
convertToCursorY:= cScreenHeight - y; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
555 |
end; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
556 |
|
6693 | 557 |
function isOnCrosshair(finger: TTouch_Data): boolean; |
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5609
diff
changeset
|
558 |
var |
9379 | 559 |
x, y: LongInt; |
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5609
diff
changeset
|
560 |
begin |
9379 | 561 |
x:= 0; |
562 |
y:= 0; |
|
6702 | 563 |
convertToFingerCoord(x, y, CrosshairX, CrosshairY); |
9379 | 564 |
isOnCrosshair:= isOnRect(x - HalfRectSize, y - HalfRectSize, RectSize, RectSize, finger); |
5615
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5609
diff
changeset
|
565 |
end; |
104f69e798bb
changed aiming to be triggered when touching the crosshair
Xeli
parents:
5609
diff
changeset
|
566 |
|
6693 | 567 |
function isOnCurrentHog(finger: TTouch_Data): boolean; |
5595 | 568 |
var |
9379 | 569 |
x, y: LongInt; |
5595 | 570 |
begin |
9379 | 571 |
x:= 0; |
572 |
y:= 0; |
|
573 |
convertToFingerCoord(x, y, hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y)); |
|
574 |
isOnCurrentHog:= isOnRect(x - HalfRectSize, y - HalfRectSize, RectSize, RectSize, finger); |
|
5938
c186c454779d
isOnCurrentHog and isOnCrosshair now look at the distance relative to the screen rather than world coords, this means that zooming out doesn't make it harder to touch the hog or crosshair
Xeli
parents:
5828
diff
changeset
|
575 |
end; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
576 |
|
9379 | 577 |
procedure convertToFingerCoord(var x, y : LongInt; oldX, oldY: LongInt); |
5938
c186c454779d
isOnCurrentHog and isOnCrosshair now look at the distance relative to the screen rather than world coords, this means that zooming out doesn't make it harder to touch the hog or crosshair
Xeli
parents:
5828
diff
changeset
|
578 |
begin |
6702 | 579 |
x := oldX + WorldDx; |
9379 | 580 |
y := cScreenHeight - oldY - WorldDy; |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
581 |
end; |
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
582 |
|
6702 | 583 |
procedure convertToWorldCoord(var x,y: LongInt; finger: TTouch_Data); |
5599
2e4b90f33a83
aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents:
5595
diff
changeset
|
584 |
begin |
9379 | 585 |
x := finger.x - WorldDx; |
586 |
y := cScreenHeight - finger.y - WorldDy; |
|
5595 | 587 |
end; |
588 |
||
5589 | 589 |
//Method to calculate the distance this finger has moved since the downEvent |
6693 | 590 |
function fingerHasMoved(finger: TTouch_Data): boolean; |
5589 | 591 |
begin |
6950
f34ff54b0cbd
-Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents:
6949
diff
changeset
|
592 |
fingerHasMoved := trunc(sqrt(sqr(finger.X-finger.historicalX) + sqr(finger.y-finger.historicalY))) > 30; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
593 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
594 |
|
6702 | 595 |
function calculateDelta(finger1, finger2: TTouch_Data): LongInt; inline; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
596 |
begin |
6702 | 597 |
calculateDelta := Round(sqrt(sqr(finger2.x-finger1.x) + sqr(finger2.y-finger1.y))); |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
598 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
599 |
|
6693 | 600 |
// Under the premise that all pointer ids in pointerIds:TSDL_FingerId are packed to the far left. |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
601 |
// If the pointer to be ignored is not pointerIds[0] the second must be there |
6693 | 602 |
function getSecondFinger(finger: TTouch_Data): PTouch_Data; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
603 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
604 |
if fingers[0].id = finger.id then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
605 |
getSecondFinger := @fingers[1] |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
606 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6344
diff
changeset
|
607 |
getSecondFinger := @fingers[0]; |
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
608 |
end; |
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
609 |
|
6693 | 610 |
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean; |
6698 | 611 |
begin |
6703 | 612 |
isOnRect:= isOnRect(rect.x, rect.y, rect.w, rect.h, finger); |
613 |
end; |
|
614 |
||
615 |
function isOnRect(x,y,w,h: LongInt; finger: TTouch_Data): boolean; |
|
616 |
begin |
|
617 |
isOnRect:= (finger.x > x) and |
|
618 |
(finger.x < x + w) and |
|
619 |
(cScreenHeight - finger.y > y) and |
|
620 |
(cScreenHeight - finger.y < y + h); |
|
6640 | 621 |
end; |
622 |
||
6723
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
623 |
function isOnWidget(widget: TOnScreenWidget; finger: TTouch_Data): boolean; |
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
624 |
begin |
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
625 |
isOnWidget:= widget.show and isOnRect(widget.active, finger); |
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
626 |
end; |
b77e2d4d664b
check if the widget is shown before checking if the finger is on the widget
Xeli
parents:
6716
diff
changeset
|
627 |
|
6693 | 628 |
procedure printFinger(finger: TTouch_Data); |
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
629 |
begin |
9379 | 630 |
WriteLnToConsole(Format('id: %d, x: %d y: %d (rel x: %d rel y: %d), time: %d', |
631 |
[finger.id, finger.x, finger.y, finger.historicalX, finger.historicalY, finger.timeSinceDown])); |
|
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
632 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
633 |
|
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
634 |
procedure initModule; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
635 |
var |
6228
1b7d4d7d162b
added lines to avoid compiler hints, is this really the way we want to do it though? ;/
Xeli
parents:
6029
diff
changeset
|
636 |
index: Longword; |
1b7d4d7d162b
added lines to avoid compiler hints, is this really the way we want to do it though? ;/
Xeli
parents:
6029
diff
changeset
|
637 |
//uRenderCoordScaleX, uRenderCoordScaleY: Longword; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
638 |
begin |
6701
58a43c2064ad
the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents:
6700
diff
changeset
|
639 |
buttonsDown:= 0; |
9379 | 640 |
pointerCount:= 0; |
5605
31bd6e30df02
Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents:
5599
diff
changeset
|
641 |
|
5733
5ab22736bdb6
Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents:
5621
diff
changeset
|
642 |
setLength(fingers, 4); |
9379 | 643 |
for index := 0 to length(fingers) do |
644 |
fingers[index].id := 0; |
|
7185
92a045156255
Android: first attempt at using the density call from java
Xeli
parents:
7105
diff
changeset
|
645 |
|
9377 | 646 |
rectSize:= baseRectSize; |
9379 | 647 |
halfRectSize:= baseRectSize shr 1; |
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
648 |
end; |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
649 |
|
7850 | 650 |
procedure freeModule; |
651 |
begin |
|
652 |
end; |
|
653 |
||
5579
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
654 |
begin |
3176ee8a9d94
uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff
changeset
|
655 |
end. |