Changeset 167 for trunk

Timestamp:

Nov 23, 2017, 9:57:48 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Generate map only once on application start.
• Modified: Use const function parameter modifier in Geometry unit.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (1 diff)
• Packages/Common/UGeometry.pas (modified) (20 diffs)
• UGame.pas (modified) (6 diffs)
• UMap.pas (modified) (1 diff)

trunk/Forms/UFormNew.pas

@@ -103 +103 @@
 
 uses
-  UFormPlayer, UCore;
+  UFormPlayer;
 
 resourcestring

trunk/Packages/Common/UGeometry.pas

@@ -20 +20 @@
     P1: TPoint;
     P2: TPoint;
-    function Create(P1, P2: TPoint): TLine;
+    function Create(const P1, P2: TPoint): TLine;
     function GetMiddle: TPoint;
     function GetAngle: Double;
@@ -26 +26 @@
     function ToRect: TRect;
     function DotProduct: Double;
-    procedure Rotate(Angle: Double);
-    class operator Equal(A, B: TLine): Boolean;
+    procedure Rotate(const Angle: Double);
+    class operator Equal(const A, B: TLine): Boolean;
     property Distance: Double read GetDistance write SetDistance;
   end;
@@ -35 +35 @@
   TPolygon = record
     Points: TPointArray;
-    function IsPointInside(P: TPoint): Boolean;
-    function Create(Points: TPointArray): TPolygon; overload;
-    function Create(Rect: TRect): TPolygon; overload;
-    procedure AddPoint(P: TPoint);
+    function IsPointInside(const P: TPoint): Boolean;
+    function Create(const Points: TPointArray): TPolygon; overload;
+    function Create(const Rect: TRect): TPolygon; overload;
+    procedure AddPoint(const P: TPoint);
     procedure Clear;
-    procedure CutLine(Vector: TLine; PointInside: TPoint);
-  end;
-
-function Distance(P1, P2: TPoint): Integer;
+    procedure CutLine(const Vector: TLine; const PointInside: TPoint);
+  end;
+
+function Distance(const P1, P2: TPoint): Integer;
 function Dot(const P1, P2: TPoint): Double;
 function AddPoint(const P1, P2: TPoint): TPoint;
 function SubPoint(const P1, P2: TPoint): TPoint;
 function PointToLineDistance(const P, V, W: TPoint): Integer;
-function ComparePoint(P1, P2: TPoint): Boolean;
-function RotatePoint(Center, P: TPoint; Angle: Double): TPoint;
-function RotatePoints(Center: TPoint; P: TPointArray; Angle: Double): TPointArray;
-function LineIntersect(LineA, LineB: TLine; out Intersection: TPoint): Boolean;
-function ArcTan2Point(Point: TPoint): Float;
-function ArcTanPoint(Point: TPoint): Float;
-function RectEquals(A, B: TRect): Boolean;
-function RectEnlarge(Rect: TRect; Value: Integer): TRect;
-function ShiftRect(ARect: TRect; Delta: TPoint): TRect;
-function PointsToRect(P1, P2: TPoint): TRect;
-function PointInRect(P: TPoint; aRect: TRect): Boolean;
-function HalfDistancePoint(P1, P2: TPoint): TPoint;
-function NormalizeAngle(Angle: Double): Double;
+function ComparePoint(const P1, P2: TPoint): Boolean;
+function RotatePoint(const Center, P: TPoint; Angle: Double): TPoint;
+function RotatePoints(const Center: TPoint; P: TPointArray; Angle: Double): TPointArray;
+function LineIntersect(const LineA, LineB: TLine; out Intersection: TPoint): Boolean;
+function ArcTan2Point(const Point: TPoint): Float;
+function ArcTanPoint(const Point: TPoint): Float;
+function RectEquals(const A, B: TRect): Boolean;
+function RectEnlarge(const Rect: TRect; Value: Integer): TRect;
+function ShiftRect(const ARect: TRect; Delta: TPoint): TRect;
+function PointsToRect(const P1, P2: TPoint): TRect;
+function PointInRect(const P: TPoint; aRect: TRect): Boolean;
+function HalfDistancePoint(const P1, P2: TPoint): TPoint;
+function NormalizeAngle(const Angle: Double): Double;
 function SubAngle(A1, A2: Double): Double;
 
 implementation
 
-function Distance(P1, P2: TPoint): Integer;
+function Distance(const P1, P2: TPoint): Integer;
 begin
   Result := Trunc(Sqrt(Sqr(P2.X - P1.X) + Sqr(P2.Y - P1.Y)));
@@ -116 +116 @@
 end;
 
-function ComparePoint(P1, P2: TPoint): Boolean;
+function ComparePoint(const P1, P2: TPoint): Boolean;
 begin
   Result := (P1.X = P2.X) and (P1.Y = P2.Y);
 end;
 
-function RotatePoint(Center, P: TPoint; Angle: Double): TPoint;
-begin
-  P := Point(P.X - Center.X, P.Y - Center.Y);
-  Result := Point(Center.X + Round(P.X * Cos(Angle) - P.Y * Sin(Angle)),
-    Center.Y + Round(P.X * Sin(Angle) + P.Y * Cos(Angle)));
-end;
-
-function RotatePoints(Center: TPoint; P: TPointArray; Angle: Double): TPointArray;
+function RotatePoint(const Center, P: TPoint; Angle: Double): TPoint;
+var
+  D: TPoint;
+begin
+  D := Point(P.X - Center.X, P.Y - Center.Y);
+  Result := Point(Center.X + Round(D.X * Cos(Angle) - D.Y * Sin(Angle)),
+    Center.Y + Round(D.X * Sin(Angle) + D.Y * Cos(Angle)));
+end;
+
+function RotatePoints(const Center: TPoint; P: TPointArray; Angle: Double): TPointArray;
 var
   I: Integer;
@@ -137 +139 @@
 end;
 
-function LineIntersect(LineA, LineB: TLine; out Intersection: TPoint): Boolean;
+function LineIntersect(const LineA, LineB: TLine; out Intersection: TPoint): Boolean;
 Var
   LDetLineA, LDetLineB, LDetDivInv: Double;
@@ -143 +145 @@
   D: Integer;
 begin
-  if (LineA.P1 = LineA.P2) or (LineB.P1 = LineB.P2) then begin
+  if ComparePoint(LineA.P1, LineA.P2) or ComparePoint(LineB.P1, LineB.P2) then begin
     Result := False;
     Exit;
@@ -166 +168 @@
 end;
 
-function ArcTan2Point(Point: TPoint): Float;
+function ArcTan2Point(const Point: TPoint): Float;
 begin
   Result := ArcTan2(Point.Y, Point.X);
 end;
 
-function ArcTanPoint(Point: TPoint): Float;
+function ArcTanPoint(const Point: TPoint): Float;
 begin
   if Point.Y = 0 then Result := Infinity
@@ -177 +179 @@
 end;
 
-function RectEquals(A, B: TRect): Boolean;
+function RectEquals(const A, B: TRect): Boolean;
 begin
   Result := (A.Left = B.Left) and (A.Top = B.Top) and
@@ -183 +185 @@
 end;
 
-function RectEnlarge(Rect: TRect; Value: Integer): TRect;
+function RectEnlarge(const Rect: TRect; Value: Integer): TRect;
 begin
   Result.Left := Rect.Left - Value;
@@ -191 +193 @@
 end;
 
-function ShiftRect(ARect: TRect; Delta: TPoint): TRect;
+function ShiftRect(const ARect: TRect; Delta: TPoint): TRect;
 begin
   Result := Rect(ARect.Left + Delta.X, ARect.Top + Delta.Y,
@@ -197 +199 @@
 end;
 
-function PointsToRect(P1, P2: TPoint): TRect;
+function PointsToRect(const P1, P2: TPoint): TRect;
 begin
   if P1.X < P2.X then Result.Left := P1.X else Result.Left := P2.X;
@@ -205 +207 @@
 end;
 
-function PointInRect(P: TPoint; aRect: TRect): Boolean;
+function PointInRect(const P: TPoint; aRect: TRect): Boolean;
 begin
   Result := (P.X >= aRect.Left) and (P.X <= aRect.Right) and
@@ -211 +213 @@
 end;
 
-function HalfDistancePoint(P1, P2: TPoint): TPoint;
+function HalfDistancePoint(const P1, P2: TPoint): TPoint;
 begin
   Result := Point(P1.X + (P2.X - P1.X) div 2, P1.Y + (P2.Y - P1.Y) div 2)
 end;
 
-function NormalizeAngle(Angle: Double): Double;
+function NormalizeAngle(const Angle: Double): Double;
 begin
   if Angle < 0 then Result := Angle + (Trunc(Angle / (2 * Pi)) + 1) * (2 * Pi)
@@ -233 +235 @@
 { TPolygon }
 
-function TPolygon.IsPointInside(P: TPoint): Boolean;
+function TPolygon.IsPointInside(const P: TPoint): Boolean;
 var
   I, J: Integer;
@@ -273 +275 @@
 
 
-function TPolygon.Create(Points: TPointArray): TPolygon;
+function TPolygon.Create(const Points: TPointArray): TPolygon;
 var
   I: Integer;
@@ -282 +284 @@
 end;
 
-function TPolygon.Create(Rect: TRect): TPolygon;
+function TPolygon.Create(const Rect: TRect): TPolygon;
 begin
   SetLength(Result.Points, 4);
@@ -291 +293 @@
 end;
 
-procedure TPolygon.AddPoint(P: TPoint);
+procedure TPolygon.AddPoint(const P: TPoint);
 begin
   SetLength(Points, Length(Points) + 1);
@@ -302 +304 @@
 end;
 
-procedure TPolygon.CutLine(Vector: TLine; PointInside: TPoint);
+procedure TPolygon.CutLine(const Vector: TLine; const PointInside: TPoint);
 var
   I: Integer;
@@ -367 +369 @@
 end;
 
-function TLine.Create(P1, P2: TPoint): TLine;
+function TLine.Create(const P1, P2: TPoint): TLine;
 begin
   Result.P1 := P1;
@@ -401 +403 @@
 end;
 
-procedure TLine.Rotate(Angle: Double);
+procedure TLine.Rotate(const Angle: Double);
 begin
   P2 := RotatePoint(P1, P2, Angle);
 end;
 
-class operator TLine.Equal(A, B: TLine): Boolean;
-begin
-  Result := (A.P1 = B.P1) and (A.P2 = B.P2);
-end;
-
+class operator TLine.Equal(const A, B: TLine): Boolean;
+begin
+  Result := ComparePoint(A.P1, B.P1) and ComparePoint(A.P2, B.P2);
+end;
 
 end.

trunk/UGame.pas

@@ -188 +188 @@
   private
     FSize: TPoint;
-    FUpdateCount: Integer;
     function GetSize: TPoint; virtual;
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
@@ -229 +228 @@
     procedure CreateLinks;
     procedure Clear;
-    procedure BeginUpdate;
-    procedure EndUpdate;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -1388 +1385 @@
   if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
     FSize := AValue;
-    if FUpdateCount = 0 then Generate;
   end;
 end;
@@ -1504 +1500 @@
 //  I: Integer;
 begin
-  FUpdateCount := Source.FUpdateCount;
   MaxPower := Source.MaxPower;
   Game := Source.Game;
@@ -1784 +1779 @@
   Cells.Clear;
   FNewCellId := 1;
-end;
-
-procedure TMap.BeginUpdate;
-begin
-  Inc(FUpdateCount);
-end;
-
-procedure TMap.EndUpdate;
-begin
-  if FUpdateCount > 0 then Dec(FUpdateCount);
-  if FUpdateCount = 0 then Generate;
 end;
 
@@ -3317 +3301 @@
 begin
   with Config do begin
-    try
-      Map.BeginUpdate;
-      MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
-      Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
-        GetValue(DOMString(Path + '/MapSizeY'), 10));
-    finally
-      Map.EndUpdate;
-    end;
+    MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
+    Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
+      GetValue(DOMString(Path + '/MapSizeY'), 10));
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
     SymetricMap := GetValue(DOMString(Path + '/SymetricMap'), False);

trunk/UMap.pas

@@ -296 +296 @@
   LeftCellCommon: TCell;
   RightCellCommon: TCell;
-  LeftText: string;
-  RightText: string;
+  //LeftText: string;
+  //RightText: string;
   NeighborCell: TCell;
 begin
   Clear;
-  RandSeed := 1234;
+  //RandSeed := 1234;
 
   // Allocate and init new cells