hedgewars/uTouch.pas
author Xeli
Sat, 24 Mar 2012 15:52:07 +0100
changeset 6812 929b467c7277
parent 6808 e9c45f3c5b9c
child 6919 bf7433e62b9c
permissions -rw-r--r--
fixed some typo's. LUA_LIBRARY now points to the right name, regardless of the host machine. Running cmake after a bad attempt (ie forgot to add paths to PATH) now works rather than having to clean the cache
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
ea796c83ea47 added licenses
Xeli
parents: 5619
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
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
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
    25
uses sysutils, uConsole, uVariables, SDLh, uFloat, uConsts, uCommands, uIO, GLUnit, uTypes;
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;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    29
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
    30
procedure ProcessTouch;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    31
procedure onTouchDown(x,y: Longword; pointerId: TSDL_FingerId);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    32
procedure onTouchMotion(x,y: Longword; dx,dy: LongInt; pointerId: TSDL_FingerId);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    33
procedure onTouchUp(x,y: Longword; pointerId: TSDL_FingerId);
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
    34
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
    35
function convertToCursorY(y: LongInt): LongInt;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
    36
function convertToCursorDeltaX(x: LongInt): LongInt;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
    37
function convertToCursorDeltaY(y: LongInt): LongInt;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    38
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    39
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
    40
procedure deleteFinger(id: TSDL_FingerId);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    41
procedure onTouchClick(finger: TTouch_Data);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    42
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
    43
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
    44
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    45
function findFinger(id: TSDL_FingerId): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    46
procedure aim(finger: TTouch_Data);
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    47
function isOnCrosshair(finger: TTouch_Data): boolean;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    48
function isOnCurrentHog(finger: TTouch_Data): boolean;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    49
procedure convertToWorldCoord(var x,y: LongInt; finger: TTouch_Data);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    50
procedure convertToFingerCoord(var x,y: LongInt; oldX, oldY: LongInt);
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    51
function fingerHasMoved(finger: TTouch_Data): boolean;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    52
function calculateDelta(finger1, finger2: TTouch_Data): LongInt;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    53
function getSecondFinger(finger: TTouch_Data): PTouch_Data;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    54
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    55
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
    56
function isOnWidget(widget: TOnScreenWidget; finger: TTouch_Data): boolean;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    57
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
    58
implementation
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    59
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    60
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
    61
    clickTime = 200;
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
    62
    longClickTime = 400;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    63
    nilFingerId = High(TSDL_FingerId);
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
    64
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    65
var
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    66
    pointerCount : Longword;
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    67
    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
    68
    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
    69
    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
    70
88f43becefe3 added low jump, you can low-jump by double tapping the right or left side of the screen
Xeli
parents: 5615
diff changeset
    71
    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
    72
    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
    73
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    74
    //Pinch to zoom 
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
    75
    pinchSize : LongInt;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    76
    baseZoomValue: GLFloat;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    77
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
    78
    //aiming
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    79
    aimingCrosshair: boolean;
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
    80
    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
    81
    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
    82
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
    83
    buttonsDown: Longword;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
    84
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    85
procedure onTouchDown(x,y: Longword; pointerId: TSDL_FingerId);
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
    86
var 
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
    87
    finger: PTouch_Data;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
    88
begin
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6654
diff changeset
    89
{$IFDEF USE_TOUCH_INTERFACE}
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
    90
finger := addFinger(x,y,pointerId);
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    91
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    92
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
    93
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
    94
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
    95
begin
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    96
    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
    97
    aim(finger^);
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
    98
    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
    99
    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
   100
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
   101
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   102
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
   103
    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
   104
    spaceKey:= true;
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
    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
   106
    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
   107
    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
   108
    end;
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   109
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
   110
    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
   111
    leftKey:= true;
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
   112
    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
   113
    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
   114
    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
   115
    end;
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   116
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
   117
    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
   118
    rightKey:= true;
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
   119
    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
   120
    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
   121
    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
   122
    end;
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   123
if isOnWidget(arrowUp, finger^) then
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   124
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   125
    upKey:= true;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   126
    moveCursor:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   127
    finger^.pressedWidget:= @arrowUp;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   128
    exit;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   129
    end;
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   130
if isOnWidget(arrowDown, finger^) then
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   131
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   132
    downKey:= true;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   133
    moveCursor:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   134
    finger^.pressedWidget:= @arrowDown;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   135
    exit;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   136
    end;
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   137
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   138
if isOnWidget(pauseButton, finger^) then
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   139
    begin
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   140
    isPaused:= not isPaused;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   141
    moveCursor:= false;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   142
    finger^.pressedWidget:= @pauseButton;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   143
    exit;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   144
    end;
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   145
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   146
if isOnWidget(utilityWidget, finger^) then
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   147
    begin
6808
e9c45f3c5b9c unbreak engine
Xeli
parents: 6806
diff changeset
   148
    //ParseCommand('/timer ' + inttostr((CurrentHedgeHog^.CurWeapon^.Timer div 1000 + 1) mod 5));
6806
cdfb6c7099e5 first part of the utilitywidget (grenade timer/swap hogs) code
Xeli
parents: 6723
diff changeset
   149
    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
   150
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
   151
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
   152
    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
   153
    moveCursor:= true;
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
   154
    if pointerCount = 2 then
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   155
        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
   156
        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
   157
        pinchSize := calculateDelta(finger^, getSecondFinger(finger^)^);
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
   158
        baseZoomValue := ZoomValue
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
   159
    end;
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
   160
end;
6676
21cf35a570a7 add keywords for landscape ammomenu and touch interface
koda
parents: 6654
diff changeset
   161
{$ENDIF}
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   162
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   163
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   164
procedure onTouchMotion(x,y: Longword;dx,dy: LongInt; pointerId: TSDL_FingerId);
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   165
var
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   166
    finger, secondFinger: PTouch_Data;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   167
    currentPinchDelta, zoom : single;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   168
begin
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   169
finger:= updateFinger(x,y,dx,dy,pointerId);
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   170
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   171
if moveCursor then
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   172
    begin
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   173
        if invertCursor then
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   174
        begin
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   175
            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
   176
            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
   177
        end
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   178
    else
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   179
        begin
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   180
            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
   181
            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
   182
        end;
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   183
        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
   184
    end;
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   185
    
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   186
if aimingCrosshair then 
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   187
    begin
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   188
        aim(finger^);
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   189
        exit
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   190
    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
   191
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
   192
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
   193
    begin
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   194
       secondFinger := getSecondFinger(finger^);
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   195
       currentPinchDelta := calculateDelta(finger^, secondFinger^) - pinchSize;
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   196
       zoom := currentPinchDelta/cScreenWidth;
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   197
       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
   198
       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
   199
           ZoomValue := cMaxZoomLevel;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   200
       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
   201
           ZoomValue := cMinZoomLevel;
5828
667fb58d7f18 Changed firebutton, parameters in uTouch might need to be tweaked some more
Xeli
parents: 5733
diff changeset
   202
    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
   203
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   204
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   205
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   206
procedure onTouchUp(x,y: Longword; pointerId: TSDL_FingerId);
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   207
var
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   208
    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
   209
    widget: POnScreenWidget;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   210
begin
6707
07c8704b6b08 one more USE_TOUCH_INTERFACE
koda
parents: 6705
diff changeset
   211
{$IFDEF USE_TOUCH_INTERFACE}
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   212
x := x;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   213
y := y;
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   214
finger:= updateFinger(x,y,0,0,pointerId);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   215
//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
   216
if not(fingerHasMoved(finger^)) 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
   217
    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
   218
        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
   219
    else
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
   220
        onTouchLongClick(finger^);
5605
31bd6e30df02 Added a hook to uGame which now allows uTouch to take action outside of SDL_Finger* events
Xeli
parents: 5599
diff changeset
   221
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   222
if aimingCrosshair then
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   223
    begin
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   224
    aimingCrosshair:= false;
6705
d2e95dcf2bb0 stop the crosshair from twitching when it's not supposed to move + fix aimingUp/Down booleans
Xeli
parents: 6704
diff changeset
   225
    upKey:= false;
d2e95dcf2bb0 stop the crosshair from twitching when it's not supposed to move + fix aimingUp/Down booleans
Xeli
parents: 6704
diff changeset
   226
    downKey:= false;
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   227
    dec(buttonsDown);
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   228
    end;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   229
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
   230
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
   231
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
   232
    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
   233
    dec(buttonsDown);
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
   234
    
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
   235
    if widget = @arrowLeft 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
   236
        leftKey:= 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
   237
    
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
   238
    if widget = @arrowRight 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
   239
        rightKey:= 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
   240
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
   241
    if widget = @arrowUp 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
   242
        upKey:= false;
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   243
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
   244
    if widget = @arrowDown 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
   245
        downKey:= 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
   246
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
   247
    if widget = @fireButton 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
   248
        spaceKey:= false;
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   249
    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
   250
 
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
   251
deleteFinger(pointerId);
6707
07c8704b6b08 one more USE_TOUCH_INTERFACE
koda
parents: 6705
diff changeset
   252
{$ENDIF}
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   253
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   254
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   255
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
   256
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   257
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
   258
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
   259
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
   260
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
   261
begin
6716
c9e873cf2b08 two more this time
koda
parents: 6714
diff changeset
   262
{$IFDEF USE_TOUCH_INTERFACE}
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   263
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
   264
    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
   265
    ParseCommand('ljump', (CurrentTeam <> nil) and not(CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel=0));
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
   266
    if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) 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
   267
        ParseCommand('gencmd R', true);
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
   268
    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
   269
    end;
6716
c9e873cf2b08 two more this time
koda
parents: 6714
diff changeset
   270
{$ENDIF}
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
   271
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
   272
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   273
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
   274
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
   275
//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
   276
//    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
   277
//    onTouchDoubleClick(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
   278
//    timeSinceClick:= 0;//we make an assumption there won't be an 'click' in the first 300 ticks(milliseconds) 
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
   279
//    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
   280
//    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
   281
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   282
xTouchClick:= finger.x;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   283
yTouchClick:= finger.y;
6687
98be933770e0 use realtick rather than SDL_GetTicks
Xeli
parents: 6685
diff changeset
   284
timeSinceClick:= RealTicks;
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   285
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
   286
if bShowAmmoMenu then
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
   287
    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
   288
    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
   289
        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
   290
        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
   291
        CursorPoint.Y:= finger.y;
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
   292
        doPut(CursorPoint.X, CursorPoint.Y, 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
   293
        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
   294
    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
   295
        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
   296
    exit;
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   297
    end;
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   298
6716
c9e873cf2b08 two more this time
koda
parents: 6714
diff changeset
   299
{$IFDEF USE_TOUCH_INTERFACE}
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   300
if isOnCurrentHog(finger) or isOnWidget(AMWidget, finger) then
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   301
    begin
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   302
    bShowAmmoMenu := true;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   303
    exit;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   304
    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
   305
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   306
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
   307
    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
   308
    ParseCommand('hjump', (CurrentTeam <> nil) and not(CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel=0));
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
    if (CurrentTeam <> nil) and (not CurrentTeam^.ExtDriven) and (ReadyTimeLeft > 1) 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
   310
        ParseCommand('gencmd R', true);
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
   311
    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
   312
    end;
6716
c9e873cf2b08 two more this time
koda
parents: 6714
diff changeset
   313
{$ENDIF}
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   314
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   315
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   316
function addFinger(x,y: Longword; id: TSDL_FingerId): PTouch_Data;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   317
var 
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   318
    xCursor, yCursor, index : LongInt;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   319
begin
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   320
    //Check array sizes
6228
1b7d4d7d162b added lines to avoid compiler hints, is this really the way we want to do it though? ;/
Xeli
parents: 6029
diff changeset
   321
    if length(fingers) < Integer(pointerCount) then 
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   322
    begin
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   323
        setLength(fingers, length(fingers)*2);
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   324
        for index := length(fingers) div 2 to length(fingers) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   325
            fingers[index].id := nilFingerId;
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   326
    end;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   327
    
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   328
    
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   329
    xCursor := convertToCursorX(x);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   330
    yCursor := convertToCursorY(y);
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   331
    
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   332
    //on removing fingers, all fingers are moved to the left
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   333
    //with dynamic arrays being zero based, the new position of the finger is the old pointerCount
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   334
    fingers[pointerCount].id := id;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   335
    fingers[pointerCount].historicalX := xCursor;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   336
    fingers[pointerCount].historicalY := yCursor;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   337
    fingers[pointerCount].x := xCursor;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   338
    fingers[pointerCount].y := yCursor;
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   339
    fingers[pointerCount].dx := 0;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   340
    fingers[pointerCount].dy := 0;
6687
98be933770e0 use realtick rather than SDL_GetTicks
Xeli
parents: 6685
diff changeset
   341
    fingers[pointerCount].timeSinceDown:= RealTicks;
6701
58a43c2064ad the onScreenwidgets are multitouch now, frequently (alternating) tapping left and right still causes it to bug though, but you have to try hard to duplicate it, works ok for now
Xeli
parents: 6700
diff changeset
   342
    fingers[pointerCount].pressedWidget:= nil;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   343
 
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   344
    addFinger:= @fingers[pointerCount];
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   345
    inc(pointerCount);
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   346
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   347
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   348
function updateFinger(x,y,dx,dy: Longword; id: TSDL_FingerId): PTouch_Data;
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   349
begin
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   350
   updateFinger:= findFinger(id);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   351
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   352
   updateFinger^.x:= convertToCursorX(x);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   353
   updateFinger^.y:= convertToCursorY(y);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   354
   updateFinger^.dx:= convertToCursorDeltaX(dx);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   355
   updateFinger^.dy:= convertToCursorDeltaY(dy);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   356
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   357
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   358
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
   359
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
   360
    index : Longword;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   361
begin
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   362
    
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   363
    dec(pointerCount);
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   364
    for index := 0 to pointerCount do
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   365
    begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   366
        if fingers[index].id = id then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   367
        begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   368
 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   369
            //put the last finger into the spot of the finger to be removed, 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   370
            //so that all fingers are packed to the far left
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   371
            if  pointerCount <> index then
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   372
                begin
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   373
                fingers[index].id := fingers[pointerCount].id;    
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   374
                fingers[index].x := fingers[pointerCount].x;    
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   375
                fingers[index].y := fingers[pointerCount].y;    
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   376
                fingers[index].historicalX := fingers[pointerCount].historicalX;    
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   377
                fingers[index].historicalY := fingers[pointerCount].historicalY;    
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   378
                fingers[index].timeSinceDown := fingers[pointerCount].timeSinceDown;
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   379
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   380
                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
   381
            end
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   382
        else fingers[index].id := nilFingerId;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   383
            break;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   384
        end;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   385
    end;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   386
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   387
end;
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   388
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
   389
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
   390
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
   391
    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
   392
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
   393
invertCursor := not(bShowAmmoMenu);
6705
d2e95dcf2bb0 stop the crosshair from twitching when it's not supposed to move + fix aimingUp/Down booleans
Xeli
parents: 6704
diff changeset
   394
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
   395
    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
   396
        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
   397
        deltaAngle:= CurrentHedgehog^.Gear^.Angle - targetAngle;
6705
d2e95dcf2bb0 stop the crosshair from twitching when it's not supposed to move + fix aimingUp/Down booleans
Xeli
parents: 6704
diff changeset
   398
        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
   399
            begin
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   400
                upKey:= false;
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
   401
                aimingUp:= false;
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   402
                downKey:= false;
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
   403
                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
   404
            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
   405
        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
   406
            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
   407
            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
   408
                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
   409
                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
   410
                    begin
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   411
                    upKey:= false;
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
   412
                    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
   413
                    end;
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   414
                downKey:= true;
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
   415
                aimingDown:= true;
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
   416
                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
   417
            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
   418
                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
   419
                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
   420
                    begin
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   421
                    downKey:= false;
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
   422
                    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
   423
                    end;
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   424
                upKey:= true;
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
   425
                aimingUp:= true;
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
   426
                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
   427
            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
   428
        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
   429
    else  
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   430
        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
   431
        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
   432
            begin
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   433
            upKey:= false;
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
   434
            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
   435
            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
   436
        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
   437
            begin
6654
120e95c10532 use the way actions are initiated the same way as koda implemented with PascalExports, using boolean values such as upKey and enterKey, this prevents the user from being able to control the AI
Xeli
parents: 6651
diff changeset
   438
            upKey:= false;
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
   439
            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
   440
            end;
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   441
        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
   442
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
   443
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   444
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
   445
var
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   446
    index: LongWord;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   447
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   448
    for index := 0 to High(fingers) do
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   449
        if fingers[index].id = id then 
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   450
            begin
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   451
            findFinger := @fingers[index];
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   452
            break;
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   453
            end;
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   454
end;
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   455
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   456
procedure aim(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
   457
var 
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   458
    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
   459
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
   460
    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
   461
        begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   462
        touchX := 0;//avoid compiler hint
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   463
        touchY := 0;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   464
        hogX := hwRound(CurrentHedgehog^.Gear^.X);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   465
        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
   466
5609
9d66611e4d0a Introduced a Touch_Finger type to replace the arrays with coords, makes cleaner code
Xeli
parents: 5605
diff changeset
   467
        convertToWorldCoord(touchX, touchY, finger);
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   468
        deltaX := abs(TouchX-HogX);
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   469
        deltaY := TouchY-HogY;
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
   470
        
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   471
        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
   472
        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
   473
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
   474
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   475
// These 4 convertToCursor functions convert xy coords from the SDL coordinate system to our CursorPoint coor system:
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   476
// - the SDL coordinate system goes from 0 to 32768 on the x axis and 0 to 32768 on the y axis, (0,0) being top left;
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   477
// - 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
   478
//   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
   479
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
   480
begin
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   481
    convertToCursorX := round((x/32768)*cScreenWidth) - (cScreenWidth shr 1);
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   482
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   483
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   484
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
   485
begin
6625
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   486
    convertToCursorY := cScreenHeight - round((y/32768)*cScreenHeight)
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   487
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   488
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   489
function convertToCursorDeltaX(x: LongInt): LongInt;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   490
begin
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   491
    convertToCursorDeltaX := round(x/32768*cScreenWidth)
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   492
end;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   493
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   494
function convertToCursorDeltaY(y: LongInt): LongInt;
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   495
begin
2d8c5815292f some refactoring + you can now tap on the ammo menu to select a weapon
Xeli
parents: 6580
diff changeset
   496
    convertToCursorDeltaY := round(y/32768*cScreenHeight)
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
   497
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
   498
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   499
function isOnCrosshair(finger: TTouch_Data): boolean;
5615
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   500
var
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   501
    x,y : LongInt;
5615
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   502
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   503
    x := 0;//avoid compiler hint
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   504
    y := 0;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   505
    convertToFingerCoord(x, y, CrosshairX, CrosshairY);
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   506
  isOnCrosshair:= sqrt(sqr(finger.x-x) + sqr(finger.y-y)) < 50;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   507
//    isOnCrosshair:= isOnRect(x-24, y-24, 48, 48, finger);
5615
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   508
end;
104f69e798bb changed aiming to be triggered when touching the crosshair
Xeli
parents: 5609
diff changeset
   509
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   510
function isOnCurrentHog(finger: TTouch_Data): boolean;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   511
var
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   512
    x,y : LongInt;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   513
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   514
    x := 0;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   515
    y := 0;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   516
    convertToFingerCoord(x,y, hwRound(CurrentHedgehog^.Gear^.X), hwRound(CurrentHedgehog^.Gear^.Y));
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   517
    isOnCurrentHog := sqrt(sqr(finger.X-x) + sqr(finger.Y-y)) < 50;
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
   518
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
   519
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   520
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
   521
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   522
    x := oldX + WorldDx;
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   523
    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
   524
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
   525
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   526
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
   527
begin
2e4b90f33a83 aiming fixed, inverted cursor on ammo menu, added equal and isZero function to uFloat, changed the way ammo menu opens, you must now click on the hog rather than anywhere on the screen
Xeli
parents: 5595
diff changeset
   528
//if x <> nil then 
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   529
    x := finger.x-WorldDx;
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
//if y <> nil then 
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   531
    y := (cScreenHeight - finger.y)-WorldDy;
5595
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   532
end;
480d451152a5 open ammo when clicking the current hog
Xeli
parents: 5589
diff changeset
   533
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   534
//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
   535
function fingerHasMoved(finger: TTouch_Data): boolean;
5589
b95d10c82f7f Now able to select a weapon
Xeli
parents: 5579
diff changeset
   536
begin
6704
77c93096d055 change power() to sqr
Xeli
parents: 6703
diff changeset
   537
    fingerHasMoved := trunc(sqrt(sqr(finger.X-finger.historicalX) + sqr(finger.y-finger.historicalY))) > 330;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   538
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   539
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   540
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
   541
begin
6702
37c56511df0c remove all hwFloat calculations
Xeli
parents: 6701
diff changeset
   542
    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
   543
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   544
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   545
// 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
   546
// 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
   547
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
   548
begin
6580
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   549
    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
   550
        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
   551
    else
6155187bf599 A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents: 6344
diff changeset
   552
        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
   553
end;
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   554
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   555
function isOnRect(rect: TSDL_Rect; finger: TTouch_Data): boolean;
6698
804e9076d136 forgot begin
Xeli
parents: 6695
diff changeset
   556
begin
6703
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   557
    isOnRect:= isOnRect(rect.x, rect.y, rect.w, rect.h, finger);
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   558
end;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   559
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   560
function isOnRect(x,y,w,h: LongInt; finger: TTouch_Data): boolean;
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   561
begin
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   562
    isOnRect:= (finger.x > x)   and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   563
               (finger.x < x + w) and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   564
               (cScreenHeight - finger.y > y) and
abe2abfe9de2 fix crosshair aiming
Xeli
parents: 6702
diff changeset
   565
               (cScreenHeight - finger.y < y + h);
6640
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   566
end;
813a173cd677 the buttons actually work now!
Xeli
parents: 6625
diff changeset
   567
6723
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   568
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
   569
begin
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   570
    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
   571
end;
b77e2d4d664b check if the widget is shown before checking if the finger is on the widget
Xeli
parents: 6716
diff changeset
   572
6693
b6a69c0bc541 carried out some cosmetic TODOs in uTouch
koda
parents: 6687
diff changeset
   573
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
   574
begin
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   575
    WriteToConsole(Format('id:%d, (%d,%d), (%d,%d), time: %d', [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
   576
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   577
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   578
procedure initModule;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   579
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
   580
    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
   581
    //uRenderCoordScaleX, uRenderCoordScaleY: Longword;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   582
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
   583
    buttonsDown:= 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
   584
5733
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   585
    setLength(fingers, 4);
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   586
    for index := 0 to High(fingers) do 
5ab22736bdb6 Fixed a major bug (related to pointers) which also solves the stuttering when zooming in and out
Xeli
parents: 5621
diff changeset
   587
        fingers[index].id := nilFingerId;
5579
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   588
end;
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   589
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   590
begin
3176ee8a9d94 uTouch, has cursor move, zoom and click or tap to open the ammo menu
Xeli
parents:
diff changeset
   591
end.