hedgewars/uTouch.pas
author nemo
Thu, 17 May 2018 20:04:07 -0400
branch0.9.24
changeset 13393 ae5d6448c5be
parent 11821 d8844d4c67de
child 13642 3d14950641a4
permissions -rw-r--r--
Make wrapping a lua and its sidecar actually work.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5621
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     1
(*
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     2
 * Hedgewars, a free turn based strategy game
6700
e04da46ee43c the most important commit of the year
koda
parents: 6698
diff changeset
     3
 * Copyright (c) 2012 Richard Deurwaarder <xeli@xelification.com>
5621
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     4
 *
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     8
 *
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    12
 * GNU General Public License for more details.
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    13
 *
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    14
 * You should have received a copy of the GNU General Public License
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    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
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    17
 *)
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    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
11821
d8844d4c67de always include uUtils _after_ SysUtils
sheepluva
parents: 11799
diff changeset
    25
uses SysUtils, uUtils, 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
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7246
diff changeset
    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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    34
procedure onTouchDown(x, y: Single; pointerId: TSDL_FingerId);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    35
procedure onTouchMotion(x, y, dx, dy: Single; pointerId: TSDL_FingerId);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    36
procedure onTouchUp(x, y: Single; pointerId: TSDL_FingerId);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    40
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    41
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    42
function updateFinger(x,y,dx,dy: Longword; id: TSDL_FingerId): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    43
procedure deleteFinger(id: TSDL_FingerId);
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    44
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    45
procedure onTouchClick(finger: TTouch_Data);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    49
function findFinger(id: TSDL_FingerId): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    50
procedure aim(finger: TTouch_Data);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    51
function isOnCrosshair(finger: TTouch_Data): boolean;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    52
function isOnCurrentHog(finger: TTouch_Data): boolean;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    53
procedure convertToWorldCoord(var x,y: LongInt; finger: TTouch_Data);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    54
procedure convertToFingerCoord(var x,y: LongInt; oldX, oldY: LongInt);
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    55
function fingerHasMoved(finger: TTouch_Data): boolean;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    56
function calculateDelta(finger1, finger2: TTouch_Data): LongInt;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    57
function getSecondFinger(finger: TTouch_Data): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    58
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
    80
    //Pinch to zoom
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    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
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    85
    aimingCrosshair: boolean;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
    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
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
    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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    92
procedure onTouchDown(x, y: Single; pointerId: TSDL_FingerId);
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
    93
var
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    94
    finger: PTouch_Data;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    97
xr:= round(x * cScreenWidth);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    98
yr:= round(y * cScreenHeight);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
    99
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   100
finger:= addFinger(xr, yr, pointerId);
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   101
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   102
inc(buttonsDown);//inc buttonsDown, if we don't see a button down we'll dec it
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   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
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   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
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   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
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   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
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   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
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   160
    finger^.pressedWidget:= @utilityWidget;
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   161
    moveCursor:= false;
6956
7d9e2669c2f5 enabled grenade timer, needs a button image
Xeli
parents: 6955
diff changeset
   162
    if(CurrentHedgehog <> nil) then
7d9e2669c2f5 enabled grenade timer, needs a button image
Xeli
parents: 6955
diff changeset
   163
        begin
7d9e2669c2f5 enabled grenade timer, needs a button image
Xeli
parents: 6955
diff changeset
   164
        if Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_Timerable <> 0 then
7d9e2669c2f5 enabled grenade timer, needs a button image
Xeli
parents: 6955
diff changeset
   165
            ParseTeamCommand('/timer ' + inttostr((GetCurAmmoEntry(CurrentHedgeHog^)^.Timer div 1000) mod 5 + 1));
7d9e2669c2f5 enabled grenade timer, needs a button image
Xeli
parents: 6955
diff changeset
   166
        end;
6957
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   167
    exit;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   188
    finger, secondFinger: PTouch_Data;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   189
    currentPinchDelta, zoom : Single;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   192
xr:= round(x * cScreenWidth);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   193
yr:= round(y * cScreenHeight);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   194
dxr:= round(dx * cScreenWidth);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   195
dyr:= round(dy * cScreenHeight);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   196
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   197
finger:= updateFinger(xr, yr, dxr, dyr, pointerId);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   198
if finger = nil then
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   215
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   242
xr:= round(x * cScreenWidth);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   243
yr:= round(y * cScreenHeight);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   244
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   245
finger:= updateFinger(xr, yr, 0, 0, pointerId);
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   246
if finger = nil then
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   247
    exit;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   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
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   258
if aimingCrosshair then
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   259
    begin
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   260
    aimingCrosshair:= false;
7022
107651b3c5a0 fix breakage
Xeli
parents: 6962
diff changeset
   261
    ParseTeamCommand('-up');
107651b3c5a0 fix breakage
Xeli
parents: 6962
diff changeset
   262
    ParseTeamCommand('-down');
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   263
    dec(buttonsDown);
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   264
    end;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   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
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   284
        ParseTeamCommand('-attack');
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   285
6957
ab8034208fcd target using the utility button, this fixes bee
Xeli
parents: 6956
diff changeset
   286
    if widget = @utilityWidget then
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   287
        if (CurrentHedgehog <> nil)then
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   288
            if(Ammoz[CurrentHedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NeedTarget <> 0)then
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   289
                begin
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   290
                ParseTeamCommand('put');
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   291
                targetted:= true;
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   292
                end
7105
9007531f813f add a nilcheck
koda
parents: 7087
diff changeset
   293
            else if (CurAmmoGear <> nil) and (CurAmmoGear^.AmmoType = amSwitch) then
6962
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   294
                ParseTeamCommand('switch')
ec308eabe09b implement switch for the touch interface
Xeli
parents: 6961
diff changeset
   295
            else WriteLnToConsole(inttostr(ord(Ammoz[CurrentHedgehog^.CurAmmoType].NameId)) + ' ' + inttostr(ord(sidSwitch)));
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   296
    end;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
11224
24bafdcf1860 - 'Press the target button to mark the target' message is localizable now
antonc27 <antonc27@mail.ru>
parents: 11088
diff changeset
   299
    AddCaption(trmsg[sidPressTarget], cWhiteColor, capgrpAmmoInfo);
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   323
//    timeSinceClick:= 0;//we make an assumption there won't be an 'click' in the first 300 ticks(milliseconds)
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
98be933770e0 use realtick rather than SDL_GetTicks
Xeli
parents: 6685
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   342
    end;
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   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
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   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
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   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
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   357
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   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
11799
bb745219d882 small code cleanup/comment
sheepluva
parents: 11780
diff changeset
   361
// check array size
bb745219d882 small code cleanup/comment
sheepluva
parents: 11780
diff changeset
   362
// note: pointerCount will be incremented later,
bb745219d882 small code cleanup/comment
sheepluva
parents: 11780
diff changeset
   363
// so at this point it's the index of the new entry
bb745219d882 small code cleanup/comment
sheepluva
parents: 11780
diff changeset
   364
if Length(fingers) <= pointerCount then
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   365
    begin
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   366
    setLength(fingers, Length(fingers)*2);
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   367
    for index := Length(fingers) div 2 to (Length(fingers)-1) do
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   368
        fingers[index].id := nilFingerId;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   369
    end;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   370
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   371
xCursor := convertToCursorX(x);
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   372
yCursor := convertToCursorY(y);
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   373
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   374
//on removing fingers, all fingers are moved to the left
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   375
//with dynamic arrays being zero based, the new position of the finger is the old pointerCount
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   376
fingers[pointerCount].id := id;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   377
fingers[pointerCount].historicalX := xCursor;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   378
fingers[pointerCount].historicalY := yCursor;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   379
fingers[pointerCount].x := xCursor;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   380
fingers[pointerCount].y := yCursor;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   381
fingers[pointerCount].dx := 0;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   382
fingers[pointerCount].dy := 0;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   383
fingers[pointerCount].timeSinceDown:= RealTicks;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   384
fingers[pointerCount].pressedWidget:= nil;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   385
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   386
addFinger:= @fingers[pointerCount];
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   387
inc(pointerCount);
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   388
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   389
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   390
function updateFinger(x, y, dx, dy: Longword; id: TSDL_FingerId): PTouch_Data;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   391
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
   392
begin
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   393
finger:= findFinger(id);
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   394
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   395
if finger <> nil then
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   396
    begin
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   397
    finger^.x:= convertToCursorX(x);
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   398
    finger^.y:= convertToCursorY(y);
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   399
    finger^.dx:= dx;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   400
    finger^.dy:= dy;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   401
    end
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   402
else
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   403
    WriteLnToConsole('finger ' + inttostr(id) + ' not found');
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   404
updateFinger:= finger
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   405
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   406
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   407
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
   408
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
   409
    index : Longword;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   410
begin
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   411
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   412
dec(pointerCount);
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   413
for index := 0 to pointerCount do
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   414
    begin
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   415
    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
   416
        begin
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   417
        //put the last finger into the spot of the finger to be removed,
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   418
        //so that all fingers are packed to the far left
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   419
        if pointerCount <> index then
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   420
            begin
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   421
            fingers[index].id := fingers[pointerCount].id;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   422
            fingers[index].x := fingers[pointerCount].x;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   423
            fingers[index].y := fingers[pointerCount].y;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   424
            fingers[index].historicalX := fingers[pointerCount].historicalX;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   425
            fingers[index].historicalY := fingers[pointerCount].historicalY;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   426
            fingers[index].timeSinceDown := fingers[pointerCount].timeSinceDown;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   427
            fingers[index].pressedWidget := fingers[pointerCount].pressedWidget;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   428
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   429
            fingers[pointerCount].id := nilFingerId;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   430
            end
11780
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   431
        else
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   432
            fingers[index].id := nilFingerId;
2f8ffd1e1331 indentation fixes
sheepluva
parents: 11779
diff changeset
   433
        break;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   434
        end;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   435
    end;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   436
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   437
end;
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   438
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   439
procedure NewTurnBeginning;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   440
begin
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   441
targetted:= false;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   442
targetting:= false;
7022
107651b3c5a0 fix breakage
Xeli
parents: 6962
diff changeset
   443
SetUtilityWidgetState(amNothing);
6961
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   444
end;
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   445
d5ac09894a1b hide utilitywidget when changing turns, this also fixes some inconsistency when using targetting weapons
Xeli
parents: 6957
diff changeset
   446
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
   447
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
   448
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
   449
    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
   450
begin
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   451
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
   452
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
   453
    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
   454
        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
   455
        deltaAngle:= CurrentHedgehog^.Gear^.Angle - targetAngle;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   456
        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
   457
            begin
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   458
                if(aimingUp)then
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   459
                    begin
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   460
                    aimingUp:= false;
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   461
                    ParseTeamCommand('-up');
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   462
                    end;
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   463
                if(aimingDown)then
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   464
                    begin
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   465
                    aimingDown:= false;
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   466
                    ParseTeamCommand('-down');
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   467
                    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
   468
            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
   469
        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
   470
            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
   471
            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
   472
                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
   473
                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
   474
                    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
   475
                    aimingUp:= false;
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   476
                    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
   477
                    end;
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   478
                if(aimingDown)then
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   479
                    begin
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   480
                    aimingDown:= true;
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   481
                    ParseTeamCommand('-down');
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   482
                    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
   483
                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
   484
            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
   485
                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
   486
                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
   487
                    begin
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   488
                    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
   489
                    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
   490
                    end;
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   491
                if aimingUp then
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   492
                    begin
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   493
                    aimingUp:= true;
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   494
                    ParseTeamCommand('+up');
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   495
                    end;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   496
                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
   497
            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
   498
        end
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   499
    else
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   500
        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
   501
        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
   502
            begin
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   503
            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
   504
            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
   505
            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
   506
        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
   507
            begin
6919
bf7433e62b9c in uTouch dont use bools to represent keystrokes, but issue ParseCommands
Xeli
parents: 6808
diff changeset
   508
            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
   509
            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
   510
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   511
        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
   512
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
   513
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   514
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
   515
var
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   516
    index: LongWord;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   517
begin
11777
77afc967f38e fix memory corruptions caused by outofbounds-writes in uTouch
sheepluva
parents: 11592
diff changeset
   518
    for index:= 0 to (Length(fingers)-1) do
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   519
        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
   520
            begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   521
            findFinger:= @fingers[index];
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   522
            exit;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   523
            end;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   524
    findFinger:= nil;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   525
end;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   526
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   527
procedure aim(finger: TTouch_Data);
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   528
var
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   529
    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
   530
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
   531
    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
   532
        begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   533
        touchX := 0;//avoid compiler hint
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   534
        touchY := 0;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   535
        hogX := hwRound(CurrentHedgehog^.Gear^.X);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   536
        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
   537
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   538
        convertToWorldCoord(touchX, touchY, finger);
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   539
        deltaX := abs(TouchX-HogX);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   540
        deltaY := TouchY-HogY;
8330
aaefa587e277 update branch with default
koda
parents: 8204
diff changeset
   541
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   542
        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
   543
        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
   544
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
   545
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   546
// These 4 convertToCursor functions convert xy coords from the SDL coordinate system to our CursorPoint coor system:
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   547
// - the SDL coordinate system is proportional to the screen and values are normalized in the onTouch* functions
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   548
// - the CursorPoint coordinate system goes from -cScreenWidth/2 to cScreenWidth/2 on the x axis
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   549
//   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
   550
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
   551
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   552
    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
   553
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   554
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   555
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
   556
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   557
    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
   558
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
   559
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   560
function isOnCrosshair(finger: TTouch_Data): boolean;
5615
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   561
var
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   562
    x, y: LongInt;
5615
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   563
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   564
    x:= 0;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   565
    y:= 0;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   566
    convertToFingerCoord(x, y, CrosshairX, CrosshairY);
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   567
    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
   568
end;
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   569
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   570
function isOnCurrentHog(finger: TTouch_Data): boolean;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   571
var
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   572
    x, y: LongInt;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   573
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   574
    x:= 0;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   575
    y:= 0;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   576
    convertToFingerCoord(x, y, hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y));
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   577
    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
   578
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
   579
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   580
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
   581
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   582
    x := oldX + WorldDx;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   583
    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
   584
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
   585
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   586
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
   587
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   588
    x := finger.x - WorldDx;
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   589
    y := cScreenHeight - finger.y - WorldDy;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   590
end;
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   591
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   592
//Method to calculate the distance this finger has moved since the downEvent
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   593
function fingerHasMoved(finger: TTouch_Data): boolean;
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   594
begin
6950
f34ff54b0cbd -Fixed FingerHasMoved function, still might need a little tweaking
Xeli
parents: 6949
diff changeset
   595
    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
   596
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   597
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   598
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
   599
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   600
    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
   601
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   602
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   603
// 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
   604
// If the pointer to be ignored is not pointerIds[0] the second must be there
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   605
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
   606
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   607
    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
   608
        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
   609
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   610
        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
   611
end;
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   612
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   613
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
6698
804e9076d136 forgot begin
Xeli
parents: 6695
diff changeset
   614
begin
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   615
    isOnRect:= isOnRect(rect.x, rect.y, rect.w, rect.h, finger);
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   616
end;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   617
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   618
function isOnRect(x,y,w,h: LongInt; finger: TTouch_Data): boolean;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   619
begin
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   620
    isOnRect:= (finger.x > x)   and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   621
               (finger.x < x + w) and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   622
               (cScreenHeight - finger.y > y) and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   623
               (cScreenHeight - finger.y < y + h);
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   624
end;
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   625
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   626
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
   627
begin
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   628
    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
   629
end;
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   630
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   631
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
   632
begin
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   633
    WriteLnToConsole(Format('id: %d, x: %d y: %d (rel x: %d rel y: %d), time: %d',
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   634
                            [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
   635
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   636
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   637
procedure initModule;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   638
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
   639
    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
   640
    //uRenderCoordScaleX, uRenderCoordScaleY: Longword;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   641
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
   642
    buttonsDown:= 0;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   643
    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
   644
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   645
    setLength(fingers, 4);
11777
77afc967f38e fix memory corruptions caused by outofbounds-writes in uTouch
sheepluva
parents: 11592
diff changeset
   646
    for index := 0 to (Length(fingers)-1) do
11778
d8a9be46dede koda told me to put the finger in
sheepluva
parents: 11777
diff changeset
   647
        fingers[index].id := nilFingerId;
7185
92a045156255 Android: first attempt at using the density call from java
Xeli
parents: 7105
diff changeset
   648
9377
48ab6dea8d2f remove old and unused getScreenDPI code
koda
parents: 8204
diff changeset
   649
    rectSize:= baseRectSize;
9379
1bcfcaf0926e update the touch interface to the new SDL2 API
koda
parents: 9377
diff changeset
   650
    halfRectSize:= baseRectSize shr 1;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   651
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   652
7850
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7246
diff changeset
   653
procedure freeModule;
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7246
diff changeset
   654
begin
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7246
diff changeset
   655
end;
fcbb024090a4 cleanup in initEverything and freeEverything
koda
parents: 7246
diff changeset
   656
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   657
begin
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   658
end.