hedgewars: comparison hedgewars/uTouch.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 procedure onTouchDown(x,y: Longword; pointerId: SDL_FingerId);
 var
 finger: PTouch_Finger;
 begin
 finger := addFinger(x,y,pointerId);
 case pointerCount of
 1:
 begin
 moveCursor:= false;
 if bShowAmmoMenu then
 begin
 var
 finger, secondFinger: PTouch_Finger;
 currentPinchDelta, zoom : hwFloat;
 tmpX, tmpY: LongInt;
 begin
 x := x;
 y := y;
 dx := dx;
 dy := dy;
 finger:= findFinger(pointerId);
 tmpX := convertToCursor(cScreenWidth, x);
 tmpY := convertToCursor(cScreenHeight, y);
 if moveCursor then
 begin
 if invertCursor then
 begin
 CursorPoint.X := CursorPoint.X + (finger^.x - tmpX);
 CursorPoint.Y := CursorPoint.Y - (finger^.y - tmpY);
 end
 else
 begin
 CursorPoint.X := CursorPoint.X - (finger^.x - tmpX);
 CursorPoint.Y := CursorPoint.Y + (finger^.y - tmpY);
 end;
 finger^.x := tmpX;
 begin
 secondFinger := getSecondFinger(finger^);
 currentPinchDelta := calculateDelta(finger^, secondFinger^) - pinchSize;
 zoom := currentPinchDelta/cScreenWidth;
 ZoomValue := baseZoomValue - ((hwFloat2Float(zoom) * cMinMaxZoomLevelDelta));
-if ZoomValue < cMaxZoomLevel then ZoomValue := cMaxZoomLevel;
+if ZoomValue < cMaxZoomLevel then
-if ZoomValue > cMinZoomLevel then ZoomValue := cMinZoomLevel;
+ZoomValue := cMaxZoomLevel;
+if ZoomValue > cMinZoomLevel then
+ZoomValue := cMinZoomLevel;
 end;
 end;
 procedure onTouchUp(x,y: Longword; pointerId: SDL_FingerId);
 begin
 x := x;
 y := y;
 aiming:= false;
 stopFiring:= true;
 deleteFinger(pointerId);
 if walkingLeft then
 begin
 ParseCommand('-left', true);
 walkingLeft := false;
 end;
 end;
 end;
 procedure onTouchDoubleClick(finger: Touch_Finger);
 begin
 finger := finger;//avoid compiler hint
 ParseCommand('ljump', true);
 end;
 procedure onTouchClick(finger: Touch_Finger);
 begin
 if (SDL_GetTicks - timeSinceClick < 300) and (DistanceI(finger.X-xTouchClick, finger.Y-yTouchClick) < _30) then
 begin
 onTouchDoubleClick(finger);
 exit;
 end
 else
 begin
 xTouchClick := finger.x;
 yTouchClick := finger.y;
 timeSinceClick := SDL_GetTicks;
 end;
 begin
 //Check array sizes
 if length(fingers) < Integer(pointerCount) then
 begin
 setLength(fingers, length(fingers)*2);
-for index := length(fingers) div 2 to length(fingers) do fingers[index].id := nilFingerId;
+for index := length(fingers) div 2 to length(fingers) do
+fingers[index].id := nilFingerId;
 end;
 xCursor := convertToCursor(cScreenWidth, x);
 yCursor := convertToCursor(cScreenHeight, y);
 begin
 dec(pointerCount);
 for index := 0 to pointerCount do
 begin
 if fingers[index].id = id then
 begin
 //Check for onTouchClick event
-if ((SDL_GetTicks - fingers[index].timeSinceDown) < clickTime) AND
+if ((SDL_GetTicks - fingers[index].timeSinceDown) < clickTime) AND not(fingerHasMoved(fingers[index])) then
-not(fingerHasMoved(fingers[index])) then onTouchClick(fingers[index]);
+onTouchClick(fingers[index]);
 //put the last finger into the spot of the finger to be removed,
 //so that all fingers are packed to the far left
 if  pointerCount <> index then
 begin
 fingers[index].id := fingers[pointerCount].id;
 fingers[index].x := fingers[pointerCount].x;
 fingers[index].y := fingers[pointerCount].y;
 fingers[index].historicalX := fingers[pointerCount].historicalX;
 fingers[index].historicalY := fingers[pointerCount].historicalY;
 fingers[index].timeSinceDown := fingers[pointerCount].timeSinceDown;
 fingers[pointerCount].id := nilFingerId;
 end
 else fingers[index].id := nilFingerId;
 break;
 end;
 end;
 end;
 procedure ProcessTouch;
 begin
 invertCursor := not(bShowAmmoMenu);
 if aiming then
 begin
 if CurrentHedgehog^.Gear <> nil then
 begin
 deltaAngle:= CurrentHedgehog^.Gear^.Angle - targetAngle;
 if (deltaAngle <> 0) and not(movingCrosshair) then
 begin
 ParseCommand('+' + crosshairCommand, true);
 movingCrosshair := true;
 end
 else
 if movingCrosshair then
 begin
 ParseCommand('-' + crosshairCommand, true);
 movingCrosshair:= false;
 end;
 end;
 end
 else if movingCrosshair then
 begin
 ParseCommand('-' + crosshairCommand, true);
 movingCrosshair := false;
 end;
 if stopFiring then
 begin
 ParseCommand('-attack', true);
 stopFiring:= false;
 end;
 if stopRight then
 begin
 stopRight := false;
 ParseCommand('-right', true);
 end;
 if stopLeft then
 begin
 stopLeft := false;
 ParseCommand('-left', true);
 end;
 end;
 function findFinger(id: SDL_FingerId): PTouch_Finger;
 var
 index: LongWord;
 begin
 for index := 0 to High(fingers) do
 if fingers[index].id = id then
 begin
 findFinger := @fingers[index];
 break;
 end;
 end;
 procedure aim(finger: Touch_Finger);
 var
 hogX, hogY, touchX, touchY, deltaX, deltaY, tmpAngle: hwFloat;
 tmpAngle:= DeltaY / Distance(deltaX, deltaY) *_2048;
 targetAngle:= (hwRound(tmpAngle) + 2048) div 2;
 tmp := crosshairCommand;
-if CurrentHedgehog^.Gear^.Angle - targetAngle < 0 then crosshairCommand := 'down'
+if CurrentHedgehog^.Gear^.Angle - targetAngle < 0 then
-else crosshairCommand:= 'up';
+crosshairCommand := 'down'
+else
+crosshairCommand:= 'up';
 if movingCrosshair and (tmp <> crosshairCommand) then
 begin
 ParseCommand('-' + tmp, true);
 movingCrosshair := false;
 end;
 end; //if CurrentHedgehog^.Gear <> nil
 end;
 function convertToCursor(scale: LongInt; xy: LongInt): LongInt;
 // Under the premise that all pointer ids in pointerIds:SDL_FingerId are packed to the far left.
 // If the pointer to be ignored is not pointerIds[0] the second must be there
 function getSecondFinger(finger: Touch_Finger): PTouch_Finger;
 begin
-if fingers[0].id = finger.id then getSecondFinger := @fingers[1]
+if fingers[0].id = finger.id then
-else getSecondFinger := @fingers[0];
+getSecondFinger := @fingers[1]
+else
+getSecondFinger := @fingers[0];
 end;
 procedure printFinger(finger: Touch_Finger);
 begin
 WriteToConsole(Format('id:%d, (%d,%d), (%d,%d), time: %d', [finger.id, finger.x, finger.y, finger.historicalX, finger.historicalY, finger.timeSinceDown]));

changeset 6580	6155187bf599
parent 6344	cba81e10235c
child 6625	2d8c5815292f