diff --git a/components/iphonelazext/examples/iArkanoid/gameengine.pas b/components/iphonelazext/examples/iArkanoid/gameengine.pas
index 405c455a0..05b71ac9c 100644
--- a/components/iphonelazext/examples/iArkanoid/gameengine.pas
+++ b/components/iphonelazext/examples/iArkanoid/gameengine.pas
@@ -29,7 +29,6 @@ type
TBrick = record
bounds : TRect;
- hitRect : TRect;
health : Integer;
flash : Integer;
end;
@@ -39,20 +38,19 @@ type
TArkanoid = class(TObject)
private
fPaddleX : single;
- procedure SetPaddleX(const AValue: single);
protected
- procedure BoundsBack(const HitRect: TRect; var dx, dy: single);
procedure BallMove(var move: TGameItem; atime: single);
procedure ResetPaddle;
+ procedure SetPaddleX(const AValue: single);
public
bricks : array [0..99] of TBrick;
brickCount : Integer;
- balls : array [0..9] of TGameItem;
- ballcount : Integer;
- width : Integer;
- height : Integer;
- PaddleY : single;
- PaddleW : single;
+ balls : array [0..9] of TGameItem;
+ ballcount : Integer;
+ width : Integer;
+ height : Integer;
+ PaddleY : single;
+ PaddleW : single;
constructor Create(awidth, aheight: Integer);
procedure InitBricks;
@@ -95,15 +93,6 @@ begin
fPaddleX := AValue;
end;
-procedure TArkanoid.BoundsBack(const HitRect: TRect; var dx, dy: single);
-var
- my : Integer;
-begin
- my := HitRect.Top + (HitRect.Bottom - HitRect.Top) div 2;
- if abs(my - dy)>5 then dy := -dy
- else dx := -dx;
-end;
-
procedure InitMoveRecord(sx, sy, dx, dy: single; var r: TMoveRecord);
var
diff : single;
@@ -114,7 +103,6 @@ begin
r.dy:=dy;
diff:=dx-sx;
- //todo:
if diff<>0 then begin
r.k:=(dy-sy) / diff;
if r.k<>0 then r.divk:=1/r.k
@@ -200,11 +188,12 @@ var
hitidx : Integer;
hsides : THitSides;
hitsides : THitSides;
- hlen : single ;
+ hlen : single;
hitlen : single;
hpnt : TPoint;
hitpnt : TPoint;
mr : TMoveRecord;
+ br : TRect;
begin
with move do begin
if sticked then Exit;
@@ -252,23 +241,23 @@ begin
dec(bricks[hitidx].health);
end;
- if (cy >= PaddleY-5) and (cx >= PaddleX) and (cx <= PaddleX + PaddleW) and (dy>0) then begin
- t := (cx - PaddleX) / PaddleW;
+ br:=Bounds( Round(PaddleX), Round(PaddleY), Round(PaddleW), 2);
+ if HitRect(br, mr, hpnt, hsides) then begin
+ t := (hpnt.x - PaddleX) / PaddleW;
t:=pi*(1-(t*0.8+0.1));
dx := cos(t)*ballVelocity;
dy := -sin(t)*ballVelocity;
- cy := PaddleY-5;
+ cy := hpnt.y;
+ cx := hpnt.x;
end else if cy > height then begin
ResetPaddle;
Exit;
end;
-
x:=cx;
y:=cy;
end;
end;
-
procedure TArkanoid.ResetPaddle;
var
i : integer;
@@ -297,14 +286,6 @@ begin
height := aheight;
end;
-procedure MakeHitRect(const boundsRect: TRect; var hitRect: TRect);
-begin
- hitRect.left := boundsRect.left - 3;
- hitRect.Top := boundsRect.top - 3;
- hitRect.right := boundsRect.right + 3;
- hitRect.bottom:= boundsRect.bottom+ 3;
-end;
-
procedure TArkanoid.InitBricks;
var
i : Integer;
@@ -319,7 +300,6 @@ begin
for i:=0 to brickCount - 1 do begin
bricks[i].health := random(4)+1;
- MakeHitRect(bricks[i].bounds, bricks[i].hitRect);
bricks[i].flash:=0;
end;
end;
diff --git a/components/iphonelazext/examples/iArkanoid/iArk.lpi b/components/iphonelazext/examples/iArkanoid/iArk.lpi
index e5f3ca252..64244c7e7 100644
--- a/components/iphonelazext/examples/iArkanoid/iArk.lpi
+++ b/components/iphonelazext/examples/iArkanoid/iArk.lpi
@@ -11,9 +11,10 @@
+
-
+
@@ -35,27 +36,35 @@
-
+
-
+
-
-
+
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -66,10 +75,143 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/iphonelazext/examples/iArkanoid/iArk.pas b/components/iphonelazext/examples/iArkanoid/iArk.pas
index bff7302ff..99b50638e 100644
--- a/components/iphonelazext/examples/iArkanoid/iArk.pas
+++ b/components/iphonelazext/examples/iArkanoid/iArk.pas
@@ -160,13 +160,18 @@ end;
function isCoordNearPabble(game: TArkanoid; x, y: single; Border: Integer): Boolean;
var
- p : TPoint;
- r : TRect;
+ p : TPoint;
+ r : TRect;
+ px,py : Integer;
+ pw : Integer;
begin
p.x := Round(x);
p.y := Round(y);
- r := Bounds(Round(game.PaddleX) - Border, Round(game.PaddleY) - Border, Round(game.PaddleW)+Border*2, PaddleHeight + Border*2);
- Result := PtInRect(r, p);
+ px:=Round(game.PaddleX)-Border;
+ pw:=Round(game.PaddleW)+Border*2;
+ py:=Round(game.PaddleY)-Border;
+ r:=Rect(px, py, px+pw, Round(UIScreen.mainScreen.bounds.size.height));
+ Result:=PtInRect(r, p);
end;
procedure MyMainWindow.touchesBegan_withEvent(touches: NSSetPointer; event: UIEvent);
@@ -271,8 +276,6 @@ var
pool : NSAutoreleasePool;
retVal : Integer;
-{$R iArk.res}
-
begin
randomize;
pool := NSAutoreleasePool(NSAutoreleasePool.alloc).init;